X-Git-Url: https://git.piment-noir.org/?a=blobdiff_plain;f=src%2Futils%2FStatistics.ts;h=a7dfaaa7e4e2e0cd612bd643a3d7101345564a2e;hb=a410f7c20845e369236b9a10d29df8d5680cd8b6;hp=a2e0d030f009221fe5bf69cef6a8aee51353c75e;hpb=6af9012e5b9ef2ed6f4fe8a9696b40ac0e8da4d0;p=e-mobility-charging-stations-simulator.git

diff --git a/src/utils/Statistics.ts b/src/utils/Statistics.ts
index a2e0d030..a7dfaaa7 100644
--- a/src/utils/Statistics.ts
+++ b/src/utils/Statistics.ts
@@ -1,14 +1,19 @@
+import CommandStatistics, { CommandStatisticsData, PerfEntry } from '../types/CommandStatistics';
+
+import CircularArray from './CircularArray';
 import Configuration from './Configuration';
+import Constants from './Constants';
+import { PerformanceEntry } from 'perf_hooks';
 import Utils from './Utils';
 import logger from './Logger';
 
 export default class Statistics {
   private static instance: Statistics;
-  private _statistics;
   private _objName: string;
+  private _commandsStatistics: CommandStatistics;
 
   private constructor() {
-    this._statistics = {};
+    this._commandsStatistics = {} as CommandStatistics;
   }
 
   set objName(objName: string) {
@@ -22,74 +27,108 @@ export default class Statistics {
     return Statistics.instance;
   }
 
-  addMessage(command, response = false) {
-    if (response) {
-      if (this._statistics[command]) {
-        if (this._statistics[command].countResponse) {
-          this._statistics[command].countResponse++;
+  addMessage(command: string, messageType: number): void {
+    switch (messageType) {
+      case Constants.OCPP_JSON_CALL_MESSAGE:
+        if (this._commandsStatistics[command] && this._commandsStatistics[command].countRequest) {
+          this._commandsStatistics[command].countRequest++;
+        } else {
+          this._commandsStatistics[command] = {} as CommandStatisticsData;
+          this._commandsStatistics[command].countRequest = 1;
+        }
+        break;
+      case Constants.OCPP_JSON_CALL_RESULT_MESSAGE:
+        if (this._commandsStatistics[command]) {
+          if (this._commandsStatistics[command].countResponse) {
+            this._commandsStatistics[command].countResponse++;
+          } else {
+            this._commandsStatistics[command].countResponse = 1;
+          }
+        } else {
+          this._commandsStatistics[command] = {} as CommandStatisticsData;
+          this._commandsStatistics[command].countResponse = 1;
+        }
+        break;
+      case Constants.OCPP_JSON_CALL_ERROR_MESSAGE:
+        if (this._commandsStatistics[command]) {
+          if (this._commandsStatistics[command].countError) {
+            this._commandsStatistics[command].countError++;
+          } else {
+            this._commandsStatistics[command].countError = 1;
+          }
         } else {
-          this._statistics[command].countResponse = 1;
+          this._commandsStatistics[command] = {} as CommandStatisticsData;
+          this._commandsStatistics[command].countError = 1;
         }
-      } else {
-        this._statistics[command] = {};
-        this._statistics[command].countResponse = 1;
-      }
-    } else if (this._statistics[command] && this._statistics[command].count) {
-      this._statistics[command].count++;
-    } else {
-      this._statistics[command] = {};
-      this._statistics[command].count = 1;
+        break;
+      default:
+        logger.error(`${this._logPrefix()} Wrong message type ${messageType}`);
+        break;
     }
   }
 
-  addPerformanceTimer(command, duration) {
-    let currentStatistics;
-    // Map to proper command name
-    const MAPCOMMAND = {
-      sendMeterValues: 'MeterValues',
-      startTransaction: 'StartTransaction',
-      stopTransaction: 'StopTransaction',
-    };
-    // Get current command statistics
-    if (MAPCOMMAND[command]) {
-      currentStatistics = this._statistics[MAPCOMMAND[command]];
-    } else if (this._statistics[command]) {
-      currentStatistics = this._statistics[command];
-    } else {
-      this._statistics[command] = {};
-      currentStatistics = this._statistics[command];
-    }
-
-    if (currentStatistics) {
-      // Update current statistics timers
-      currentStatistics.countTime = currentStatistics.countTime ? currentStatistics.countTime + 1 : 1;
-      currentStatistics.minTime = currentStatistics.minTime ? (currentStatistics.minTime > duration ? duration : currentStatistics.minTime) : duration;
-      currentStatistics.maxTime = currentStatistics.maxTime ? (currentStatistics.maxTime < duration ? duration : currentStatistics.maxTime) : duration;
-      currentStatistics.totalTime = currentStatistics.totalTime ? currentStatistics.totalTime + duration : duration;
-      currentStatistics.avgTime = currentStatistics.totalTime / currentStatistics.countTime;
-    }
+  logPerformance(entry: PerformanceEntry, className: string): void {
+    this.addPerformanceTimer(entry.name, entry.duration);
+    const perfEntry: PerfEntry = {} as PerfEntry;
+    perfEntry.name = entry.name;
+    perfEntry.entryType = entry.entryType;
+    perfEntry.startTime = entry.startTime;
+    perfEntry.duration = entry.duration;
+    logger.info(`${this._logPrefix()} object ${className} method(s) performance entry: %j`, perfEntry);
   }
 
-  logPerformance(entry, className: string): void {
-    this.addPerformanceTimer(entry.name, entry.duration);
-    logger.info(`${this._logPrefix()} class->${className}, method->${entry.name}, duration->${entry.duration}`);
+  start(): void {
+    this._displayInterval();
   }
 
-  _display(): void {
-    logger.info(this._logPrefix() + ' %j', this._statistics);
+  private _display(): void {
+    logger.info(this._logPrefix() + ' %j', this._commandsStatistics);
   }
 
-  _displayInterval(): void {
+  private _displayInterval(): void {
     if (Configuration.getStatisticsDisplayInterval() > 0) {
       setInterval(() => {
         this._display();
       }, Configuration.getStatisticsDisplayInterval() * 1000);
-      logger.info(this._logPrefix() + ' displayed every ' + Configuration.getStatisticsDisplayInterval() + 's');
+      logger.info(this._logPrefix() + ' displayed every ' + Utils.secondsToHHMMSS(Configuration.getStatisticsDisplayInterval()));
     }
   }
 
-  start(): void {
-    this._displayInterval();
+  private median(dataSet: number[]): number {
+    if (Array.isArray(dataSet) && dataSet.length === 1) {
+      return dataSet[0];
+    }
+    const sortedDataSet = dataSet.slice().sort();
+    const middleIndex = Math.floor(sortedDataSet.length / 2);
+    if (sortedDataSet.length % 2) {
+      return sortedDataSet[middleIndex / 2];
+    }
+    return (sortedDataSet[(middleIndex - 1)] + sortedDataSet[middleIndex]) / 2;
+  }
+
+  private addPerformanceTimer(command: string, duration: number): void {
+    // Map to proper command name
+    const MAPCOMMAND = {
+      sendMeterValues: 'MeterValues',
+      startTransaction: 'StartTransaction',
+      stopTransaction: 'StopTransaction',
+    };
+    if (MAPCOMMAND[command]) {
+      command = MAPCOMMAND[command] as string;
+    }
+    // Initialize command statistics
+    if (!this._commandsStatistics[command]) {
+      this._commandsStatistics[command] = {} as CommandStatisticsData;
+    }
+    // Update current statistics timers
+    this._commandsStatistics[command].countTimeMeasurement = this._commandsStatistics[command].countTimeMeasurement ? this._commandsStatistics[command].countTimeMeasurement + 1 : 1;
+    this._commandsStatistics[command].currentTimeMeasurement = duration;
+    this._commandsStatistics[command].minTimeMeasurement = this._commandsStatistics[command].minTimeMeasurement ? (this._commandsStatistics[command].minTimeMeasurement > duration ? duration : this._commandsStatistics[command].minTimeMeasurement) : duration;
+    this._commandsStatistics[command].maxTimeMeasurement = this._commandsStatistics[command].maxTimeMeasurement ? (this._commandsStatistics[command].maxTimeMeasurement < duration ? duration : this._commandsStatistics[command].maxTimeMeasurement) : duration;
+    this._commandsStatistics[command].totalTimeMeasurement = this._commandsStatistics[command].totalTimeMeasurement ? this._commandsStatistics[command].totalTimeMeasurement + duration : duration;
+    this._commandsStatistics[command].avgTimeMeasurement = this._commandsStatistics[command].totalTimeMeasurement / this._commandsStatistics[command].countTimeMeasurement;
+    Array.isArray(this._commandsStatistics[command].timeMeasurementSeries) ? this._commandsStatistics[command].timeMeasurementSeries.push(duration) : this._commandsStatistics[command].timeMeasurementSeries = [duration] as CircularArray<number>;
+    this._commandsStatistics[command].medTimeMeasurement = this.median(this._commandsStatistics[command].timeMeasurementSeries);
   }
 
   private _logPrefix(): string {