Merge pull request #3923 from pfoytik/pfoytik/incomingTxMA

added moving average to Transactions vBytes per second (vB/s)

frontend/src/app/components/incoming-transactions-graph/incoming-transactions-graph.component.ts

@@ -37,6 +37,7 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges, On
   };
   windowPreference: string;
   chartInstance: any = undefined;
+  MA: number[][] = [];
   weightMode: boolean = false;
   rateUnitSub: Subscription;
 
@@ -62,6 +63,7 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges, On
       return;
     }
     this.windowPreference = this.windowPreferenceOverride ? this.windowPreferenceOverride : this.storageService.getValue('graphWindowPreference');
+    this.MA = this.calculateMA(this.data.series[0]);
     this.mountChart();
   }
 
@@ -72,7 +74,101 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges, On
     this.isLoading = false;
   }
 
+  /// calculate the moving average of maData
+  calculateMA(maData): number[][] {
+    //update const variables that are not changed
+    const ma: number[][] = [];
+    let sum = 0;
+    let i = 0;
+    const len = maData.length;
+
+    //Adjust window length based on the length of the data
+    //5% appeared as a good amount from tests
+    //TODO: make this a text box in the UI
+    const maWindowLen = Math.ceil(len * 0.05);
+
+    //calculate the center of the moving average window
+    const center = Math.floor(maWindowLen / 2);
+
+    //calculate the centered moving average
+    for (i = center; i < len - center; i++) {
+      sum = 0;
+      //build out ma as we loop through the data
+      ma[i] = [];
+      ma[i].push(maData[i][0]);
+      for (let j = i - center; j <= i + center; j++) {
+        sum += maData[j][1];
+      }
+
+      ma[i].push(sum / maWindowLen);
+    }
+
+    //return the moving average array
+    return ma;
+  }
+
   mountChart(): void {
+    //create an array for the echart series
+    //similar to how it is done in mempool-graph.component.ts
+    const seriesGraph = [];
+    seriesGraph.push({
+      zlevel: 0,
+      name: 'data',
+      data: this.data.series[0],
+      type: 'line',
+      smooth: false,
+      showSymbol: false,
+      symbol: 'none',
+      lineStyle: {
+        width: 3,
+      },
+      markLine: {
+        silent: true,
+        symbol: 'none',
+        lineStyle: {
+          color: '#fff',
+          opacity: 1,
+          width: 2,
+        },
+        data: [{
+          yAxis: 1667,
+          label: {
+            show: false,
+            color: '#ffffff',
+          }
+        }],
+      }
+    },
+    {
+      zlevel: 0,
+      name: 'MA',
+      data: this.MA,
+      type: 'line',
+      smooth: false,
+      showSymbol: false,
+      symbol: 'none',
+      lineStyle: {
+        width: 1,
+        color: "white",
+      },
+      markLine: {
+        silent: true,
+        symbol: 'none',
+        lineStyle: {
+          color: '#fff',
+          opacity: 1,
+          width: 2,
+        },
+        data: [{
+          yAxis: 1667,
+          label: {
+            show: false,
+            color: '#ffffff',
+          }
+        }],
+      }
+    });
+
     this.mempoolStatsChartOption = {
       grid: {
         height: this.height,
@@ -126,12 +222,16 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges, On
           const colorSpan = (color: string) => `<span class="indicator" style="background-color: ` + color + `"></span>`;
           let itemFormatted = '<div class="title">' + axisValueLabel + '</div>';
           params.map((item: any, index: number) => {
-            if (index < 26) {
+
-              itemFormatted += `<div class="item">
+            //Do no include MA in tooltip legend!
-                <div class="indicator-container">${colorSpan(item.color)}</div>
+            if (item.seriesName !== 'MA') {
-                <div class="grow"></div>
+              if (index < 26) {
-                <div class="value">${formatNumber(this.weightMode ? item.value[1] * 4 : item.value[1], this.locale, '1.0-0')} <span class="symbol">${this.weightMode ? 'WU' : 'vB'}/s</span></div>
+                itemFormatted += `<div class="item">
-              </div>`;
+                  <div class="indicator-container">${colorSpan(item.color)}</div>
+                  <div class="grow"></div>
+                  <div class="value">${formatNumber(item.value[1], this.locale, '1.0-0')}<span class="symbol">vB/s</span></div>
+                </div>`;
+              }
             }
           });
           return `<div class="tx-wrapper-tooltip-chart ${(this.template === 'advanced') ? 'tx-wrapper-tooltip-chart-advanced' : ''}">${itemFormatted}</div>`;
@@ -171,35 +271,7 @@ export class IncomingTransactionsGraphComponent implements OnInit, OnChanges, On
           }
         }
       },
-      series: [
+      series: seriesGraph,
-        {
-          zlevel: 0,
-          data: this.data.series[0],
-          type: 'line',
-          smooth: false,
-          showSymbol: false,
-          symbol: 'none',
-          lineStyle: {
-            width: 3,
-          },
-          markLine: {
-            silent: true,
-            symbol: 'none',
-            lineStyle: {
-              color: '#fff',
-              opacity: 1,
-              width: 2,
-            },
-            data: [{
-              yAxis: 1667,
-              label: {
-                show: false,
-                color: '#ffffff',
-              }
-            }],
-          }
-        },
-      ],
       visualMap: {
         show: false,
         top: 50,