Merge: merging the current dev update (oct 11)

Author: XinMoZ

package-lock.json

@@ -97,4 +97,3 @@
     "run-script-os": "^1.1.6"
   }
 }
-

package.json

@@ -21,7 +21,7 @@ export default {
     };
   },
 
-  run(chunker, {edgeValueMatrix, coordsMatrix, startNode, endNodes, heuristicFn}) {
+  run(chunker, {edgeValueMatrix, coordsMatrix, startNode, endNodes, heuristicFn, moveNode}) {
     // String Variables used in displaying algo
     const algNameStr = 'aStar';
     const dashStr = '-';
@@ -130,6 +130,7 @@ export default {
       (vis, edgeArray, coordsArray) => {
         vis.graph.directed(false);
         vis.graph.weighted(true);
+        vis.graph.moveNodeFn(moveNode);
         vis.graph.set(edgeArray, Array.from({ length: numVertices }, (v, k) => (k + 1)),coordsArray);
       },
       [E, coords]

src/algorithms/controllers/AStar.js

@@ -18,7 +18,7 @@ export default {
     };
   },
 
-  run(chunker, { edgeValueMatrix, coordsMatrix, endNodes, startNode}) {
+  run(chunker, { edgeValueMatrix, coordsMatrix, endNodes, startNode, moveNode}) {
 
     //Defining queue
     function Queue() {
@@ -70,6 +70,7 @@ export default {
       (vis, edgeArray, coordsArray) => {
         vis.graph.directed(false);
         vis.graph.weighted(false);
+        vis.graph.moveNodeFn(moveNode);
         vis.graph.set(edgeArray, Array.from({ length: edgeValueMatrix.length }, (v, k) => (k + 1)), coordsArray);
 
       },

src/algorithms/controllers/BFS.js

@@ -21,7 +21,7 @@ export default {
     };
   },
 
-  run(chunker, { edgeValueMatrix, coordsMatrix, endNodes, startNode}) {
+  run(chunker, { edgeValueMatrix, coordsMatrix, endNodes, startNode, moveNode}) {
 
     const E = [...edgeValueMatrix];
     const coords = [...coordsMatrix];
@@ -50,6 +50,7 @@ export default {
       (vis, edgeArray, coordsArray) => {
         vis.graph.directed(false);
         vis.graph.weighted(false);
+        vis.graph.moveNodeFn(moveNode);
         vis.graph.set(edgeArray, Array.from({ length: edgeValueMatrix.length }, (v, k) => (k + 1)), coordsArray);
 
       },

src/algorithms/controllers/DFS.js

@@ -25,7 +25,7 @@ export default {
     };
   },
 
-  run(chunker, { edgeValueMatrix, coordsMatrix, startNode, endNodes}) {
+  run(chunker, { edgeValueMatrix, coordsMatrix, startNode, endNodes, moveNode}) {
     // String Variables used in displaying algo
     const algNameStr = 'DFSrec';
     const nStr = 'n';
@@ -241,6 +241,7 @@ export default {
       (vis, edgeArray, coordsArray) => {
         vis.graph.directed(false);
         vis.graph.weighted(false);
+        vis.graph.moveNodeFn(moveNode);
         vis.graph.set(edgeArray, Array.from({ length: numVertices }, (v, k) => (k + 1)),coordsArray);
       },
       [E, coords], 0

src/algorithms/controllers/DFSrec.js

@@ -7,7 +7,7 @@
 // below, otherwise hooks into what happens when blocks are expanded or
 // contracted are not enabled.
 const importsThis = ['quickSort', 'quickSortM3', 'msort_arr_td',
-  'transitiveClosure', 'heapSort'];
+  'transitiveClosure', 'heapSort', 'msort_lista_td'];
 
 // eslint-disable-next-line import/no-cycle
 // See also accompanying mods/hooks in src/context/GlobalState.js and

src/algorithms/controllers/collapseChunkPlugin.js

@@ -17,7 +17,7 @@ export default {
     };
   },
 
-  run(chunker, { edgeValueMatrix, coordsMatrix, startNode, endNodes}) {
+  run(chunker, { edgeValueMatrix, coordsMatrix, startNode, endNodes, moveNode}) {
     // String Variables used in displaying algo
     const algNameStr = 'dijkstra';
     const dashStr = '-';
@@ -115,6 +115,7 @@ export default {
       (vis, edgeArray, coordsArray) => {
         vis.graph.directed(false);
         vis.graph.weighted(true);
+        vis.graph.moveNodeFn(moveNode);
         vis.graph.set(edgeArray, Array.from({ length: numVertices }, (v, k) => (k + 1)),coordsArray);
       },
       [E, coords]

src/algorithms/controllers/dijkstra.js

@@ -3,10 +3,10 @@
 //
 // OMG, colors for array and graph require different types and are
 // inconsistent!
-// Arrary: '0'=Blue, '1'=Green
+// Array: '0'=Blue, '1'=Green
 // Nodes: 1=Green, 4= Blue
 // Edges: 1=Green, 2=Orange, 3=Red, 4=Blue
-// XXX not sure how this interracts with color perception options -
+// XXX not sure how this interacts with color perception options -
 // doesn't seem to work like this - should figure out how it's done if
 // it's still supported
 export const colors = {

src/algorithms/controllers/graphSearchColours.js

@@ -4,6 +4,7 @@ export { default as heapSort } from './heapSort';
 export { default as quickSort } from './quickSort';
 export { default as quickSortM3 } from './quickSortM3';
 export { default as msort_arr_td } from './msort_arr_td';
+export { default as msort_lista_td } from './msort_lista_td';
 export { default as transitiveClosure } from './transitiveClosure';
 export { default as bruteForceStringSearch } from './bruteForceStringSearch';
 export { default as horspoolStringSearch } from './horspoolStringSearch';