data-structure-typed 1.41.8 → 1.42.0

package/test/unit/data-structures/binary-tree/binary-tree.test.ts

@@ -174,8 +174,11 @@ describe('BinaryTree', () => {
   });
 
   it('should subTreeTraverse', () => {
-    tree.addMany([4, 2, 6, 1, 3, 5, 7]);
-    expect(tree.subTreeTraverse(node => node.key, tree.getNode(6), IterationType.RECURSIVE)).toEqual([6, 5, 7]);
+    tree.addMany([4, 2, 6, null, 1, 3, null, 5, null, 7]);
+    expect(tree.subTreeTraverse(node => node.key, tree.getNode(6), IterationType.ITERATIVE)).toEqual([6,3, 7]);
+    expect(tree.subTreeTraverse(node => node.key, tree.getNode(6), IterationType.RECURSIVE)).toEqual([6,3, 7]);
+    expect(tree.subTreeTraverse(node => node === null? null : node.key, tree.getNode(6), IterationType.ITERATIVE, true)).toEqual([6, 3, 7, null]);
+    expect(tree.subTreeTraverse(node => node === null? null : node.key, tree.getNode(6), IterationType.RECURSIVE, true)).toEqual([6, 3, 7, null]);
   });
 
   it('should clear the tree', () => {
@@ -266,10 +269,18 @@ describe('BinaryTree traversals', () => {
 
   const arr = [35, 20, 40, 15, 29, null, 50, null, 16, 28, 30, 45, 55];
   tree.refill(arr);
+  expect(tree.bfs(node => node , tree.root, IterationType.ITERATIVE, true).map(node => node === null ? null : node.key)).toEqual([35, 20, 40, 15, 29, null, 50, null, 16, 28, 30, 45, 55]);
+  expect(tree.bfs(node => node , tree.root, IterationType.RECURSIVE, true).map(node => node === null ? null : node.key)).toEqual([35, 20, 40, 15, 29, null, 50, null, 16, 28, 30, 45, 55]);
+  expect(tree.bfs(node => node , tree.root, IterationType.ITERATIVE).map(node => node === null ? null : node.key)).toEqual([35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55]);
+  expect(tree.bfs(node => node , tree.root, IterationType.RECURSIVE).map(node => node === null ? null : node.key)).toEqual([35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55]);
+
   expect(tree.dfs(node => node.key, 'pre')).toEqual([35, 20, 15, 16, 29, 28, 30, 40, 50, 45, 55]);
   expect(tree.dfs(node => node.key, 'pre', tree.root, IterationType.RECURSIVE)).toEqual([
     35, 20, 15, 16, 29, 28, 30, 40, 50, 45, 55
   ]);
+  expect(tree.dfs(node => node, 'pre', tree.root, IterationType.ITERATIVE, true).map(node => node === null ? null : node.key)).toEqual([35, 20, 15, null, 16, 29, 28, 30, 40, null, 50, 45, 55]);
+  expect(tree.dfs(node => node, 'pre', tree.root, IterationType.RECURSIVE, true).map(node => node === null ? null : node.key)).toEqual([35, 20, 15, null, 16, 29, 28, 30, 40, null, 50, 45, 55]);
+
   expect(tree.dfs(node => node.key, 'in')).toEqual([15, 16, 20, 28, 29, 30, 35, 40, 45, 50, 55]);
   expect(tree.dfs(node => node.key, 'post')).toEqual([16, 15, 28, 30, 29, 20, 45, 55, 50, 40, 35]);
   expect(tree.dfs(node => node.key, 'post', tree.root, IterationType.RECURSIVE)).toEqual([
@@ -282,9 +293,7 @@ describe('BinaryTree traversals', () => {
     35, 20, 40, 15, 29, 50, 16, 28, 30, 45, 55
   ]);
 
-  const levels = tree.listLevels(node => node.key);
-  expect(levels).toEqual([[35], [20, 40], [15, 29, 50], [16, 28, 30, 45, 55]]);
-  isDebug && console.log(levels);
+  expect(tree.listLevels(node => node.key)).toEqual([[35], [20, 40], [15, 29, 50], [16, 28, 30, 45, 55]]);
 
   expect(tree.listLevels(node => node.key, tree.root, IterationType.RECURSIVE)).toEqual([
     [35],
@@ -292,9 +301,21 @@ describe('BinaryTree traversals', () => {
     [15, 29, 50],
     [16, 28, 30, 45, 55]
   ]);
-  isDebug && console.log(levels);
+  expect(tree.listLevels(node => node === null ? null :node.key, tree.root, IterationType.ITERATIVE, true)).toEqual([
+    [35],
+    [20, 40],
+    [15, 29, null,50],
+    [null, 16, 28, 30, 45, 55]
+  ]);
+  expect(tree.listLevels(node => node === null ? null :node.key, tree.root, IterationType.RECURSIVE, true)).toEqual([
+    [35],
+    [20, 40],
+    [15, 29, null,50],
+    [null, 16, 28, 30, 45, 55]
+  ]);
 });
 
+
 describe('BinaryTree', () => {
   let tree: BinaryTree<string>;
 

package/test/unit/data-structures/graph/undirected-graph.test.ts

@@ -149,8 +149,7 @@ describe('UndirectedGraph', () => {
     expect(degreeOfC).toBe(1);
   });
 
-  it('xxx', () => {
-    // const start = performance.now();
+  it('should getAllPathsBetween work well in 66 vertexes 97 edges graph', () => {
     const graph = new UndirectedGraph<{name: string}, number>();
     for (const v of saltyVertexes) {
       graph.addVertex(v.name, v);
@@ -159,9 +158,19 @@ describe('UndirectedGraph', () => {
       const [s, d] = e;
       graph.addEdge(s.name, d.name, d.weight);
     }
-    // const result = graph.getAllPathsBetween('Intersection_1','Intersection_5');
-    // console.log('---xxx', performance.now() - start, result)
-    // const result = graph.dijkstra('Intersection_1','Intersection_5', true, true);
-    // console.log('---xxx', performance.now() - start, result)
+    const allPaths = graph.getAllPathsBetween('Intersection_1','Intersection_5');
+    expect(allPaths.length).toBe(1000);
+    const minWeightedPathDFS = graph.getMinPathBetween('Intersection_1','Intersection_5', true, true);
+    expect(minWeightedPathDFS?.[0]?.key).toBe('Intersection_1');
+    expect(minWeightedPathDFS?.[5]?.key).toBe('Intersection_42');
+    expect(minWeightedPathDFS?.[8]?.key).toBe('Intersection_18');
+    expect(minWeightedPathDFS?.[27]?.key).toBe('Intersection_6');
+    const minWeightedPath = graph.dijkstra('Intersection_1','Intersection_5', true, true);
+
+    expect(minWeightedPath?.minPath?.[0]?.key).toBe('Intersection_1')
+    expect(minWeightedPath?.minPath?.[1]?.key).toBe('Intersection_2')
+    expect(minWeightedPath?.minPath?.[2]?.key).toBe('Intersection_3')
+    expect(minWeightedPath?.minPath?.[3]?.key).toBe('Intersection_4')
+    expect(minWeightedPath?.minPath?.[4]?.key).toBe('Intersection_5')
   });
 });