Merge pull request #83 from path2finding/bug/various-fixes

Size change and endpoint movement bugs

Author: Shawn Toubeau

src/components/Maze/Maze.scss

@@ -1,4 +1,4 @@
 .Maze {
-  height: 90vh !important;
+  height: calc(100vh - 119px) !important;
   // Tempt style for debugging
 }

src/components/Maze/Maze.tsx

@@ -312,12 +312,11 @@ const Maze: React.FC<Props> = (props) => {
     dfsStack,
   } = props.maze;
 
-  // console.log(selectedAlgo);
   if (selectedAlgo === "BFS") {
     let queue = bfsQueue;
     // This gets run once at the start
     if (isPlaying && queue.length === 0) {
-      console.log("Init BFS");
+      // console.log("Init BFS");
       const start = getStart(mazeInfo);
 
       if (start) {
@@ -327,7 +326,7 @@ const Maze: React.FC<Props> = (props) => {
 
     setTimeout(function () {
       if (queue.length > 0 && isPlaying) {
-        console.log("Going through BFS", queue);
+        // console.log("Going through BFS", queue);
 
         // Removes any queued spaces that were previously visited
         while (mazeInfo[queue[0].y][queue[0].x].visited) {
@@ -362,7 +361,7 @@ const Maze: React.FC<Props> = (props) => {
     let stack = dfsStack;
     // This gets run once at the start
     if (isPlaying && stack.length === 0) {
-      console.log("Init DFS");
+      // console.log("Init DFS");
       const start = getStart(mazeInfo);
 
       if (start) {
@@ -405,7 +404,7 @@ const Maze: React.FC<Props> = (props) => {
 
     // Run at the beginning
     if (isPlaying && openSet.length === 0) {
-      console.log("Init Astar");
+      // console.log("Init Astar");
       const start = getStart(mazeInfo);
 
       if (start) {
@@ -415,15 +414,14 @@ const Maze: React.FC<Props> = (props) => {
 
     setTimeout(function () {
       if (isPlaying && openSet.length > 0) {
-        console.log("Running Astar");
+        // console.log("Running Astar");
         let newMazeInfo = mazeInfo;
         let current = getLowestFScore(openSet, mazeInfo);
         const end = getEnd(mazeInfo) as Coord;
 
         // Check if finished
         if (includesCoord(closedSet, end)) {
           // Find the Path
-          console.log("DONE");
           handlePauseVisualization();
           // openSet = [];
           return;
@@ -466,15 +464,13 @@ const Maze: React.FC<Props> = (props) => {
                 neighborSpace.h = heuristic(neighbor, end);
               }
               neighborSpace.f = neighborSpace.g + neighborSpace.h;
-              console.log("Setting parent of ", neighbor, current);
               neighborSpace.parent = current;
             }
           });
 
           progressAstar(openSet, closedSet, newMazeInfo, end);
         }
       } else {
-        console.log("NO SOLUTION");
         if (isPlaying) handlePauseVisualization();
         return;
       }
@@ -485,7 +481,7 @@ const Maze: React.FC<Props> = (props) => {
 
     // Run at the beginning
     if (isPlaying && openSet.length === 0) {
-      console.log("Init Djikstras");
+      // console.log("Init Djikstras");
       const start = getStart(mazeInfo);
 
       if (start) {
@@ -495,15 +491,14 @@ const Maze: React.FC<Props> = (props) => {
 
     setTimeout(function () {
       if (isPlaying && openSet.length > 0) {
-        console.log("Running Djikstras");
+        // console.log("Running Djikstras");
         let newMazeInfo = mazeInfo;
         let current = getLowestFScore(openSet, mazeInfo);
         const end = getEnd(mazeInfo) as Coord;
 
         // Check if finished
         if (includesCoord(closedSet, end)) {
           // Find the Path
-          console.log("DONE");
           handlePauseVisualization();
           // openSet = [];
           return;
@@ -547,15 +542,13 @@ const Maze: React.FC<Props> = (props) => {
                 neighborSpace.h = heuristic_djikstras(neighbor, end);
               }
               neighborSpace.f = neighborSpace.g + neighborSpace.h;
-              console.log("Setting parent of ", neighbor, current);
               neighborSpace.parent = current;
             }
           });
 
           progressAstar(openSet, closedSet, newMazeInfo, end);
         }
       } else {
-        console.log("NO SOLUTION");
         if (isPlaying) handlePauseVisualization();
         return;
       }

src/components/Menu/index.tsx

@@ -257,7 +257,7 @@ class MenuBar extends React.Component<MenuProps, _MenuState> {
               disabled={isPlaying}
             >
               <Icon
-                name={canMoveStart ? "circle" : "circle outline"}
+                name={canMoveEnd ? "circle" : "circle outline"}
                 style={{ marginRight: "0.5rem" }}
               />
               <span>Move End Point</span>

src/models/maze/initialState.ts

@@ -8,8 +8,6 @@ export const generateMaze = (
   clear?: boolean
 ): MazeInfo => {
   let maze: MazeInfo = {};
-  if(x > 20) x = 20;
-  if(y > 20) y = 20;
 
   for (let i = 0; i < x; i++) {
     maze[i] = [];
@@ -55,5 +53,5 @@ export const initialState: Maze = {
   bfsQueue: [],
   astarOpenSet: [],
   astarClosedSet: [],
-  dfsStack: []
+  dfsStack: [],
 };