data-structure-typed 1.45.1 → 1.45.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "data-structure-typed",
-  "version": "1.45.1",
+  "version": "1.45.2",
   "description": "Data Structures of Javascript & TypeScript. Binary Tree, BST, Graph, Heap, Priority Queue, Linked List, Queue, Deque, Stack, AVL Tree, Tree Multiset, Trie, Directed Graph, Undirected Graph, Singly Linked List, Doubly Linked List, Max Heap, Max Priority Queue, Min Heap, Min Priority Queue.",
   "main": "dist/cjs/index.js",
   "module": "dist/mjs/index.js",

package/src/data-structures/heap/heap.ts

@@ -305,18 +305,28 @@ export class Heap<E = any> {
    * @param index - The index of the newly added element.
    */
   protected bubbleUp(index: number): void {
-    const element = this.nodes[index];
+    // const element = this.nodes[index];
+    // while (index > 0) {
+    //   const parentIndex = (index - 1) >> 1;
+    //   const parent = this.nodes[parentIndex];
+    //   if (this.comparator(element, parent) < 0) {
+    //     this.nodes[index] = parent;
+    //     this.nodes[parentIndex] = element;
+    //     index = parentIndex;
+    //   } else {
+    //     break;
+    //   }
+    // }
+
+    const item = this.nodes[index];
     while (index > 0) {
-      const parentIndex = Math.floor((index - 1) / 2);
-      const parent = this.nodes[parentIndex];
-      if (this.comparator(element, parent) < 0) {
-        this.nodes[index] = parent;
-        this.nodes[parentIndex] = element;
-        index = parentIndex;
-      } else {
-        break;
-      }
+      const parent = (index - 1) >> 1;
+      const parentItem = this.nodes[parent];
+      if (this.comparator(parentItem, item) <= 0) break;
+      this.nodes[index] = parentItem;
+      index = parent;
     }
+    this.nodes[index] = item;
   }
 
   /**
@@ -332,8 +342,8 @@ export class Heap<E = any> {
    * @param index - The index from which to start sinking.
    */
   protected sinkDown(index: number): void {
-    const leftChildIndex = 2 * index + 1;
-    const rightChildIndex = 2 * index + 2;
+    const leftChildIndex = index << 1 | 1;
+    const rightChildIndex = leftChildIndex + 1;
     const length = this.nodes.length;
     let targetIndex = index;
 

package/test/performance/data-structures/binary-tree/rb-tree.test.ts

@@ -8,7 +8,7 @@ const suite = new Benchmark.Suite();
 const rbTree = new RedBlackTree();
 const { HUNDRED_THOUSAND } = magnitude;
 const arr = getRandomIntArray(HUNDRED_THOUSAND, 0, HUNDRED_THOUSAND, true);
-const competitor = new OrderedMap<number, number>();
+const cOrderedMap = new OrderedMap<number, number>();
 
 suite.add(`${HUNDRED_THOUSAND.toLocaleString()} add`, () => {
   rbTree.clear();
@@ -18,9 +18,9 @@ suite.add(`${HUNDRED_THOUSAND.toLocaleString()} add`, () => {
 });
 
 if (isCompetitor) {
-  suite.add(`${HUNDRED_THOUSAND.toLocaleString()} competitor add`, () => {
+  suite.add(`${HUNDRED_THOUSAND.toLocaleString()} CPT add`, () => {
     for (let i = 0; i < arr.length; i++) {
-      competitor.setElement(arr[i], arr[i]);
+      cOrderedMap.setElement(arr[i], arr[i]);
     }
   });
 }

package/test/performance/data-structures/comparation.test.ts

@@ -0,0 +1,142 @@
+import { PriorityQueue as MJSPriorityQueue } from '../../../dist/cjs';
+import { PriorityQueue as SRCPriorityQueue } from '../../../src';
+import { PriorityQueue as CJSPriorityQueue } from '../../../dist/mjs';
+import {
+  Deque as CDeque,
+  HashMap as CHashMap,
+  LinkList as CLinkedList,
+  OrderedMap,
+  PriorityQueue as CPriorityQueue,
+  Queue as CQueue,
+  Stack as CStack
+} from 'js-sdsl';
+
+import * as Benchmark from 'benchmark';
+import { getRandomIntArray, magnitude } from '../../utils';
+import { isCompetitor } from '../../config';
+
+const suite = new Benchmark.Suite();
+const { TEN_THOUSAND, HUNDRED_THOUSAND, LINEAR } = magnitude;
+const cOrderedMap = new OrderedMap<number, number>();
+const arrHundredThousand = getRandomIntArray(HUNDRED_THOUSAND, 0, HUNDRED_THOUSAND, true);
+
+suite.add(`SRC ${TEN_THOUSAND.toLocaleString()} add`, () => {
+
+  const pq = new SRCPriorityQueue<number>({ comparator: (a, b) => b - a });
+  for (let i = 0; i < TEN_THOUSAND; i++) pq.add(i);
+}).add(`CJS ${TEN_THOUSAND.toLocaleString()} add`, () => {
+
+  const pq = new CJSPriorityQueue<number>({ comparator: (a, b) => b - a });
+  for (let i = 0; i < TEN_THOUSAND; i++) pq.add(i);
+}).add(`MJS ${TEN_THOUSAND.toLocaleString()} add`, () => {
+
+  const pq = new MJSPriorityQueue<number>({ comparator: (a, b) => b - a });
+  for (let i = 0; i < TEN_THOUSAND; i++) pq.add(i);
+});
+
+if (isCompetitor) {
+  suite.add(`CPT PQ ${TEN_THOUSAND.toLocaleString()} add`, () => {
+
+    const pq = new CPriorityQueue<number>();
+    for (let i = 0; i < TEN_THOUSAND; i++) pq.push(i);
+  });
+}
+
+suite.add(`SRC PQ ${TEN_THOUSAND.toLocaleString()} add & pop`, () => {
+  const pq = new SRCPriorityQueue<number>({ comparator: (a, b) => b - a });
+
+  for (let i = 0; i < TEN_THOUSAND; i++) pq.add(i);
+  for (let i = 0; i < TEN_THOUSAND; i++) pq.pop();
+}).add(`CJS PQ ${TEN_THOUSAND.toLocaleString()} add & pop`, () => {
+  const pq = new CJSPriorityQueue<number>({ comparator: (a, b) => b - a });
+
+  for (let i = 0; i < TEN_THOUSAND; i++) pq.add(i);
+  for (let i = 0; i < TEN_THOUSAND; i++) pq.pop();
+}).add(`MJS PQ ${TEN_THOUSAND.toLocaleString()} add & pop`, () => {
+  const pq = new MJSPriorityQueue<number>({ comparator: (a, b) => b - a });
+
+  for (let i = 0; i < TEN_THOUSAND; i++) pq.add(i);
+  for (let i = 0; i < TEN_THOUSAND; i++) pq.pop();
+});
+
+
+if (isCompetitor) {
+  suite.add(`CPT PQ ${TEN_THOUSAND.toLocaleString()} add & pop`, () => {
+    const pq = new CPriorityQueue<number>();
+
+    for (let i = 0; i < TEN_THOUSAND; i++) pq.push(i);
+    for (let i = 0; i < TEN_THOUSAND; i++) pq.pop();
+  })
+    .add(`CPT OM ${HUNDRED_THOUSAND.toLocaleString()} add`, () => {
+      for (let i = 0; i < arrHundredThousand.length; i++) {
+        cOrderedMap.setElement(arrHundredThousand[i], arrHundredThousand[i]);
+      }
+    })
+    .add(`CPT HM ${TEN_THOUSAND.toLocaleString()} set`, () => {
+      const hm = new CHashMap<number, number>();
+
+      for (let i = 0; i < TEN_THOUSAND; i++) {
+        hm.setElement(i, i);
+      }
+    })
+    .add(`CPT HM ${TEN_THOUSAND.toLocaleString()} set & get`, () => {
+      const hm = new CHashMap<number, number>();
+
+      for (let i = 0; i < TEN_THOUSAND; i++) {
+        hm.setElement(i, i);
+      }
+      for (let i = 0; i < TEN_THOUSAND; i++) {
+        hm.getElementByKey(i);
+      }
+    })
+    .add(`CPT LL ${LINEAR.toLocaleString()} unshift`, () => {
+      const list = new CLinkedList<number>();
+
+      for (let i = 0; i < LINEAR; i++) {
+        list.pushFront(i);
+      }
+    })
+    .add(`CPT PQ ${TEN_THOUSAND.toLocaleString()} add & pop`, () => {
+      const pq = new CPriorityQueue<number>();
+
+      for (let i = 0; i < TEN_THOUSAND; i++) {
+        pq.push(i);
+      }
+
+      for (let i = 0; i < TEN_THOUSAND; i++) {
+        pq.pop();
+      }
+    })
+    .add(`CPT DQ ${LINEAR.toLocaleString()} push`, () => {
+      const deque = new CDeque<number>();
+      for (let i = 0; i < LINEAR; i++) {
+        deque.pushBack(i);
+      }
+    })
+    .add(`CPT Q ${LINEAR.toLocaleString()} push`, () => {
+      const queue = new CQueue<number>();
+
+      for (let i = 0; i < LINEAR; i++) {
+        queue.push(i);
+      }
+    })
+    .add(`CPT ST ${LINEAR.toLocaleString()} push`, () => {
+      const queue = new CStack<number>();
+
+      for (let i = 0; i < LINEAR; i++) {
+        queue.push(i);
+      }
+    })
+    .add(`CPT ST ${LINEAR.toLocaleString()} push & pop`, () => {
+      const queue = new CStack<number>();
+
+      for (let i = 0; i < LINEAR; i++) {
+        queue.push(i);
+      }
+      for (let i = 0; i < LINEAR; i++) {
+        queue.pop();
+      }
+    });
+}
+
+export { suite };

package/test/performance/data-structures/hash/hash-map.test.ts

@@ -15,7 +15,7 @@ suite.add(`${TEN_THOUSAND.toLocaleString()} set`, () => {
   }
 });
 if (isCompetitor) {
-  suite.add(`${TEN_THOUSAND.toLocaleString()} competitor set`, () => {
+  suite.add(`${TEN_THOUSAND.toLocaleString()} CPT set`, () => {
     const hm = new CHashMap<number, number>();
 
     for (let i = 0; i < TEN_THOUSAND; i++) {
@@ -34,7 +34,7 @@ suite.add(`${TEN_THOUSAND.toLocaleString()} set & get`, () => {
   }
 });
 if (isCompetitor) {
-  suite.add(`${TEN_THOUSAND.toLocaleString()} competitor set & get`, () => {
+  suite.add(`${TEN_THOUSAND.toLocaleString()} CPT set & get`, () => {
     const hm = new CHashMap<number, number>();
 
     for (let i = 0; i < TEN_THOUSAND; i++) {

package/test/performance/data-structures/linked-list/doubly-linked-list.test.ts

@@ -15,7 +15,7 @@ suite.add(`${LINEAR.toLocaleString()} unshift`, () => {
   }
 });
 if (isCompetitor) {
-  suite.add(`${LINEAR.toLocaleString()} competitor unshift`, () => {
+  suite.add(`${LINEAR.toLocaleString()} CPT unshift`, () => {
     const list = new CLinkedList<number>();
 
     for (let i = 0; i < LINEAR; i++) {

package/test/performance/data-structures/priority-queue/priority-queue.test.ts

@@ -19,7 +19,7 @@ suite.add(`${TEN_THOUSAND.toLocaleString()} add & pop`, () => {
   }
 });
 if (isCompetitor) {
-  suite.add(`${TEN_THOUSAND.toLocaleString()} competitor add & pop`, () => {
+  suite.add(`${TEN_THOUSAND.toLocaleString()} CPT add & pop`, () => {
     const pq = new CPriorityQueue<number>();
 
     for (let i = 0; i < TEN_THOUSAND; i++) {

package/test/performance/data-structures/queue/deque.test.ts

@@ -14,7 +14,7 @@ suite.add(`${LINEAR.toLocaleString()} push`, () => {
   }
 });
 if (isCompetitor) {
-  suite.add(`${LINEAR.toLocaleString()} competitor push`, () => {
+  suite.add(`${LINEAR.toLocaleString()} CPT push`, () => {
     const deque = new CDeque<number>();
     for (let i = 0; i < LINEAR; i++) {
       deque.pushBack(i);

package/test/performance/data-structures/queue/queue.test.ts

@@ -15,7 +15,7 @@ suite.add(`${LINEAR.toLocaleString()} push`, () => {
   }
 });
 if (isCompetitor) {
-  suite.add(`${LINEAR.toLocaleString()} competitor push`, () => {
+  suite.add(`${LINEAR.toLocaleString()} CPT push`, () => {
     const queue = new CQueue<number>();
 
     for (let i = 0; i < LINEAR; i++) {

package/test/performance/data-structures/stack/stack.test.ts

@@ -15,7 +15,7 @@ suite.add(`${LINEAR.toLocaleString()} push`, () => {
   }
 });
 if (isCompetitor) {
-  suite.add(`${LINEAR.toLocaleString()} competitor push`, () => {
+  suite.add(`${LINEAR.toLocaleString()} CPT push`, () => {
     const queue = new CStack<number>();
 
     for (let i = 0; i < LINEAR; i++) {
@@ -34,7 +34,7 @@ suite.add(`${LINEAR.toLocaleString()} push & pop`, () => {
   }
 });
 if (isCompetitor) {
-  suite.add(`${LINEAR.toLocaleString()} competitor push & pop`, () => {
+  suite.add(`${LINEAR.toLocaleString()} CPT push & pop`, () => {
     const queue = new CStack<number>();
 
     for (let i = 0; i < LINEAR; i++) {

package/test/performance/reportor.ts

@@ -5,18 +5,46 @@ import * as fastGlob from 'fast-glob';
 import { Color, numberFix, render } from '../utils';
 import { PerformanceTest } from './types';
 
+
+const args = process.argv.slice(2);
+
+const { GREEN, BOLD, END, YELLOW, GRAY, CYAN, BG_YELLOW } = Color;
+
+const getRelativePath = (file: string) => {
+  return path.relative(__dirname, file);
+}
+const coloredLabeled = (label: string, file: string) => {
+  const relativeFilePath = getRelativePath(file);
+  const directory = path.dirname(relativeFilePath);
+  const fileName = path.basename(relativeFilePath);
+  return `${BG_YELLOW} ${label} ${END} ${GRAY}${directory}/${END}${CYAN}${fileName}${END}`;
+}
+
 const parentDirectory = path.resolve(__dirname, '../..');
 const reportDistPath = path.join(parentDirectory, 'benchmark');
 
 const testDir = path.join(__dirname, 'data-structures');
-const testFiles = fastGlob.sync(path.join(testDir, '**', '*.test.ts'));
+const allFiles = fastGlob.sync(path.join(testDir, '**', '*.test.ts'));
+let testFiles: string[] = [];
+if (args.length > 0) {
+  console.log(`arguments: ${args.join(' ')}`)
+
+  testFiles = allFiles.filter(file =>
+    args.every(word => file.includes(word))
+  );
+
+  console.log(`${testFiles.map(file => coloredLabeled('Matched', file)).join(`
+`)}`);
+} else {
+  testFiles = allFiles;
+}
+
 
 const report: { [key: string]: any } = {};
 
 let completedCount = 0;
 
 const performanceTests: PerformanceTest[] = [];
-const { GREEN, BOLD, END, YELLOW, GRAY, CYAN, BG_YELLOW } = Color;
 
 testFiles.forEach((file: string) => {
   const testName = path.basename(file, '.test.ts');
@@ -107,7 +135,7 @@ const composeReport = () => {
     htmlTables // New content to be inserted
   );
   fs.writeFileSync(htmlFilePath, html);
-  console.log(`Performance ${BOLD}${GREEN}report${END} file generated in ${BOLD}${GREEN}${reportDistPath}${END}`);
+  console.log(`Performance ${BOLD}${GREEN}report${END} file generated in file://${BOLD}${GREEN}${htmlFilePath}${END}`);
 };
 
 function replaceMarkdownContent(startMarker: string, endMarker: string, newText: string) {
@@ -135,7 +163,7 @@ function replaceMarkdownContent(startMarker: string, endMarker: string, newText:
       if (err) {
         console.error(`Unable to write to ${filePath}:`, err);
       } else {
-        console.log(`The content has been successfully replaced in ${BOLD}${GREEN}${filePath}!${END}`);
+        console.log(`The content has been successfully replaced in file://${BOLD}${GREEN}${filePath}${END}`);
       }
     });
   });
@@ -143,10 +171,8 @@ function replaceMarkdownContent(startMarker: string, endMarker: string, newText:
 
 performanceTests.forEach(item => {
   const { suite, testName, file } = item;
-  const relativeFilePath = path.relative(__dirname, file);
-  const directory = path.dirname(relativeFilePath);
-  const fileName = path.basename(relativeFilePath);
-  console.log(`${BG_YELLOW} Running ${END} ${GRAY}${directory}/${END}${CYAN}${fileName}${END}`);
+
+  console.log(coloredLabeled('Running', file));
 
   if (suite) {
     let runTime = 0;

package/test/unit/data-structures/heap/heap.test.ts

@@ -257,3 +257,41 @@ describe('FibonacciHeap Stress Test', () => {
     );
   });
 });
+
+// describe('Competitor performance compare', () => {
+//   const minHeap = new MinHeap<number>();
+//   const cHeap = new CHeap<number>();
+//   const cPQ = new PriorityQueue<number>(undefined, (a, b) => a - b);
+//   const n = 10000;
+//
+//   it('should add performance well', () => {
+//     const heapCost = calcRunTime(() => {
+//       for (let i = 0; i < n; i++) {
+//         minHeap.add(i);
+//       }
+//     })
+//
+//     console.log(`heapCost: ${heapCost}`)
+//   });
+//
+//   it('should add performance well', () => {
+//
+//     const cHeapCost = calcRunTime(() => {
+//       for (let i = 0; i < n; i++) {
+//         cHeap.push(i);
+//       }
+//     })
+//
+//     console.log(`cHeapCost: ${cHeapCost}`)
+//   });
+//
+//   it('should add performance well', () => {
+//
+//     const cPQCost = calcRunTime(() => {
+//       for (let i = 0; i < n; i++) {
+//         cPQ.push(i);
+//       }
+//     })
+//     console.log(`cPQCost: ${cPQCost}`)
+//   });
+// });

package/test/utils/index.ts

@@ -5,3 +5,4 @@ export * from './json2html';
 export * from './is';
 export * from './console';
 export * from './string';
+export * from './performanc';

package/test/utils/performanc.ts

@@ -0,0 +1,7 @@
+import { performance } from 'perf_hooks';
+
+export const calcRunTime = (callback: (...args: any[]) => any) => {
+  const startTime = performance.now();
+  callback();
+  return performance.now() - startTime;
+}