Merge branch '2024_sem2' into Colours

Author: KittenPrincess1

.idea/.name

@@ -66,13 +66,13 @@
     "denque": "^2.0.1",
     "framer-motion": "^4.0.0",
     "lodash": "^4.17.21",
-    "prop-types": "^15.7.2",
+    "prop-types": "^15.8.1",
     "react": "^17.0.2",
     "react-dom": "^17.0.2",
     "react-markdown": "^5.0.0",
     "react-resize-detector": "^6.6.0",
     "react-router-dom": "^5.2.0",
-    "react-scripts": "^4.0",
+    "react-scripts": "^5.0.1",
     "react-table": "^7.5.0",
     "reactjs-popup": "^2.0.5",
     "remark-gfm": "^1.0.0",
@@ -83,7 +83,7 @@
   },
   "devDependencies": {
     "@babel/plugin-proposal-private-property-in-object": "^7.21.11",
-    "electron": "^15.0.0",
+    "electron": "^31.4.0",
     "enzyme": "^3.11.0",
     "eslint": "^7.11.0",
     "eslint-plugin-import": "^2.28.1",
@@ -96,4 +96,3 @@
     "run-script-os": "^1.1.6"
   }
 }
-

.idea/workspace.xml

@@ -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]

docs/URL-Code-Implementation-Guideline-20241004.pdf

@@ -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);
 
       },

package-lock.json

@@ -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);
 
       },

package.json

@@ -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/AStar.js

@@ -347,6 +347,7 @@ export default {
   },
 
   run(chunker, { nodes }) {
+
     if (nodes === null || nodes.length === 0) return;
     let { node: tree, id: newID } = this.createNodeAndIncrement(null);