@oino-ts/common 0.9.0 → 0.9.1

package/dist/cjs/OINOBenchmark.js

@@ -91,7 +91,7 @@ exports.OINOBenchmark = OINOBenchmark;
 /**
  * OINOMemoryBenchmark is a memory-based benchmark implementation.
  * It stores the benchmark data in memory and allows to reset, start, end and get benchmark data.
- *
+ * In case of recursively/iteratively starting a benchmark, it will honor the first start and ignore the rest. *
  */
 class OINOMemoryBenchmark extends OINOBenchmark {
     _benchmarkCount = {};
@@ -113,7 +113,7 @@ class OINOMemoryBenchmark extends OINOBenchmark {
      */
     _start(module, method) {
         const name = module + "." + method;
-        if (OINOBenchmark._enabled[module]) {
+        if (OINOBenchmark._enabled[module] && ((this._benchmarkStart[name] === undefined) || (this._benchmarkStart[name] === 0))) { // if benchmark is already started (e.g. loop/recursion), do not start it again
             if (this._benchmarkCount[name] == undefined) {
                 this._benchmarkCount[name] = 0;
                 this._benchmarkData[name] = 0;
@@ -145,6 +145,7 @@ class OINOMemoryBenchmark extends OINOBenchmark {
                 this._benchmarkData[category_name] += duration;
             }
             result = this._benchmarkData[name] / this._benchmarkCount[name];
+            this._benchmarkStart[name] = 0;
         }
         return result;
     }

package/dist/esm/OINOBenchmark.js

@@ -87,7 +87,7 @@ export class OINOBenchmark {
 /**
  * OINOMemoryBenchmark is a memory-based benchmark implementation.
  * It stores the benchmark data in memory and allows to reset, start, end and get benchmark data.
- *
+ * In case of recursively/iteratively starting a benchmark, it will honor the first start and ignore the rest. *
  */
 export class OINOMemoryBenchmark extends OINOBenchmark {
     _benchmarkCount = {};
@@ -109,7 +109,7 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
      */
     _start(module, method) {
         const name = module + "." + method;
-        if (OINOBenchmark._enabled[module]) {
+        if (OINOBenchmark._enabled[module] && ((this._benchmarkStart[name] === undefined) || (this._benchmarkStart[name] === 0))) { // if benchmark is already started (e.g. loop/recursion), do not start it again
             if (this._benchmarkCount[name] == undefined) {
                 this._benchmarkCount[name] = 0;
                 this._benchmarkData[name] = 0;
@@ -141,6 +141,7 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
                 this._benchmarkData[category_name] += duration;
             }
             result = this._benchmarkData[name] / this._benchmarkCount[name];
+            this._benchmarkStart[name] = 0;
         }
         return result;
     }

package/dist/types/OINOBenchmark.d.ts

@@ -66,12 +66,12 @@ export declare abstract class OINOBenchmark {
 /**
  * OINOMemoryBenchmark is a memory-based benchmark implementation.
  * It stores the benchmark data in memory and allows to reset, start, end and get benchmark data.
- *
+ * In case of recursively/iteratively starting a benchmark, it will honor the first start and ignore the rest. *
  */
 export declare class OINOMemoryBenchmark extends OINOBenchmark {
-    private _benchmarkCount;
-    private _benchmarkData;
-    private _benchmarkStart;
+    protected _benchmarkCount: Record<string, number>;
+    protected _benchmarkData: Record<string, number>;
+    protected _benchmarkStart: Record<string, number>;
     /**
      * Reset benchmark data (but not what is enabled).
      *

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oino-ts/common",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "OINO TS package for common classes.",
   "author": "Matias Kiviniemi (pragmatta)",
   "license": "MPL-2.0",
@@ -19,7 +19,7 @@
   "dependencies": {
   },
   "devDependencies": {
-    "@oino-ts/types": "0.9.0"
+    "@oino-ts/types": "0.9.1"
   },
   "files": [
     "src/*.ts",

package/src/OINOBenchmark.ts

@@ -104,13 +104,13 @@ export abstract class OINOBenchmark {
 /**
  * OINOMemoryBenchmark is a memory-based benchmark implementation.
  * It stores the benchmark data in memory and allows to reset, start, end and get benchmark data.
- * 
+ * In case of recursively/iteratively starting a benchmark, it will honor the first start and ignore the rest. * 
  */
 export class OINOMemoryBenchmark extends OINOBenchmark {
 
-    private _benchmarkCount:Record<string, number> = {}
-    private _benchmarkData:Record<string, number> = {}
-    private _benchmarkStart:Record<string, number> = {}
+    protected _benchmarkCount:Record<string, number> = {}
+    protected _benchmarkData:Record<string, number> = {}
+    protected _benchmarkStart:Record<string, number> = {}
 
     /**
      * Reset benchmark data (but not what is enabled).
@@ -129,7 +129,7 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
      */
     protected _start(module:string, method:string):void {
         const name:string = module + "." + method
-        if (OINOBenchmark._enabled[module]) {
+        if (OINOBenchmark._enabled[module] && ((this._benchmarkStart[name] === undefined) || (this._benchmarkStart[name] === 0))) { // if benchmark is already started (e.g. loop/recursion), do not start it again
             if (this._benchmarkCount[name] == undefined) {
                 this._benchmarkCount[name] = 0
                 this._benchmarkData[name] = 0
@@ -162,6 +162,7 @@ export class OINOMemoryBenchmark extends OINOBenchmark {
                 this._benchmarkData[category_name] += duration
             }
             result = this._benchmarkData[name] / this._benchmarkCount[name]
+            this._benchmarkStart[name] = 0 
         }
         return result
     }