Fix bugs in ch3 - animation interval and ucs restart

Cost detail initial node fixed

Author: Rishav159

3-Solving-Problems-By-Searching/c_breadthFirstSearch.js

@@ -2,8 +2,10 @@ $(document).ready(function() {
   var w = 600,
     h = 350;
   var DELAY = 2000;
+  var intervalFunction = null;
 
   function init() {
+    clearInterval(intervalFunction, DELAY);
     var graph = new DefaultGraph();
     var graphProblem = new GraphProblem(graph.nodes, graph.edges, 'A', 'A');
     var graphAgent = new GraphAgent(graphProblem);
@@ -29,7 +31,7 @@ $(document).ready(function() {
         clearInterval(intervalFunction, DELAY);
       }
     }
-    var intervalFunction = setInterval(updateFunction, DELAY);
+    intervalFunction = setInterval(updateFunction, DELAY);
   };
   $('#bfsRestartButton').click(init);
   $('#fifoWaiting').css('background-color', 'hsl(200,50%,70%)');

3-Solving-Problems-By-Searching/c_costDetails.js

@@ -39,7 +39,7 @@ $(document).ready(function() {
     two.clear();
     path.path = path.path.reverse();
     let runningCost = 0;
-    var i, x1, x2, y;
+    var i, x1, x2, y = 20;
     for (i = 0; i < path.path.length - 1; i++) {
       x1 = i * 65 + 20;
       x2 = (i + 1) * 65 + 20;
@@ -113,6 +113,5 @@ $(document).ready(function() {
     bfsGraphDrawAgent = new GraphDrawAgent(graphProblem, 'no-costGraphCanvas', options, h, w);
     ucsGraphDrawAgent = new GraphDrawAgent(graphProblem, 'costGraphCanvas', options, h, w);
   };
-  $('#ucsRestartButton').click(init);
   init();
 });

3-Solving-Problems-By-Searching/c_depthFirstSearch.js

@@ -2,8 +2,10 @@ $(document).ready(function() {
   var w = 600,
     h = 350;
   var DELAY = 2000;
+  var intervalFunction = null;
 
   function init() {
+    clearInterval(intervalFunction, DELAY);
     var graph = new DefaultGraph();
     var graphProblem = new GraphProblem(graph.nodes, graph.edges, 'A', 'A');
     var graphAgent = new GraphAgent(graphProblem);
@@ -26,7 +28,7 @@ $(document).ready(function() {
         clearInterval(intervalFunction, DELAY);
       }
     }
-    var intervalFunction = setInterval(updateFunction, DELAY);
+    intervalFunction = setInterval(updateFunction, DELAY);
   };
   $('#dfsRestartButton').click(init);
   $('#lifoWaiting').css('background-color', 'hsl(200,50%,70%)');

3-Solving-Problems-By-Searching/c_uniformCostSearch.js

@@ -2,9 +2,10 @@ $(document).ready(function() {
   var w = 600,
     h = 350;
   var DELAY = 2000;
+  var intervalFunction = null;
 
   function init() {
-
+    clearInterval(intervalFunction, DELAY);
     var priorityQueueCanvas = document.getElementById('priorityQueueCanvas');
     var exploredQueueCanvas = document.getElementById('exploredPriorityQueueCanvas');
     priorityQueueCanvas.innerHTML = '';
@@ -43,13 +44,16 @@ $(document).ready(function() {
         graphDrawAgent.iterate();
         drawList(priorityTwo, graphProblem.frontier, graphProblem, options, costMap);
         drawList(exploredTwo, graphProblem.explored, graphProblem, options, costMap);
-        let maxCost = graphProblem.nodes[graphProblem.nextToExpand].cost;
+        let maxCost = 0;
+        if (graphProblem.nextToExpand) {
+          maxCost = graphProblem.nodes[graphProblem.nextToExpand].cost;
+        }
         $('.ucsSeparation').html(maxCost);
       } else {
         clearInterval(intervalFunction, DELAY);
       }
     }
-    var intervalFunction = setInterval(updateFunction, DELAY);
+    intervalFunction = setInterval(updateFunction, DELAY);
   };
   $('#ucsRestartButton').click(init);
   $('#ucsWaiting').css('background-color', 'hsl(200,50%,70%)');

3-Solving-Problems-By-Searching/helpers.js

@@ -6,6 +6,7 @@ var GraphNode = function(x, y, id, text) {
   this.state = 'unexplored';
   this.cost = Number.POSITIVE_INFINITY;
   this.parent = null;
+  this.depth = Number.POSITIVE_INFINITY;
 };
 
 function getEdgeCostLocation(x1, y1, x2, y2) {
@@ -115,6 +116,7 @@ var GraphProblem = function(nodes, edges, initialKey, nextToExpand) {
   this.nodes[initialKey].state = 'frontier';
   this.nodes[initialKey].cost = 0;
   this.nodes[initialKey].parent = null;
+  this.nodes[initialKey].depth = 0;
   this.initialKey = initialKey;
   this.frontier = [initialKey];
   this.explored = [];
@@ -158,13 +160,12 @@ var GraphProblem = function(nodes, edges, initialKey, nextToExpand) {
   };
 };
 
-var GraphAgent = function(problem) {
+var GraphAgent = function(problem,algo) {
   this.problem = problem;
-
+  this.algo = algo;
   this.expand = function(nodeKey) {
     this.problem.removeFromFrontier(nodeKey);
     this.problem.addToExplored(nodeKey);
-
     let adjacent = this.problem.getAdjacent(nodeKey);
     for (var i = 0; i < adjacent.length; i++) {
       let nextNodeKey = adjacent[i].nodeKey;
@@ -173,10 +174,19 @@ var GraphAgent = function(problem) {
         this.problem.addToFrontier(nextNodeKey);
         nextNode.cost = adjacent[i].cost + this.problem.nodes[nodeKey].cost;
         nextNode.parent = nodeKey;
+        nextNode.depth = this.problem.nodes[nodeKey].depth + 1;
       }
-      if (nextNode.state == 'frontier' && nextNode.cost > adjacent[i].cost + this.problem.nodes[nodeKey].cost) {
-        nextNode.cost = adjacent[i].cost + this.problem.nodes[nodeKey].cost;
-        nextNode.parent = nodeKey;
+      if(this.algo == 'ucs') {
+        if (nextNode.state == 'frontier' && nextNode.cost > adjacent[i].cost + this.problem.nodes[nodeKey].cost) {
+          nextNode.cost = adjacent[i].cost + this.problem.nodes[nodeKey].cost;
+          nextNode.parent = nodeKey;
+        }
+      }
+      if(this.algo == 'dfs') {
+        if (nextNode.state == 'frontier' && nextNode.depth < (this.problem.nodes[nodeKey].depth + 1)) {
+          nextNode.depth = this.problem.nodes[nodeKey].depth + 1;
+          nextNode.parent = nodeKey;
+        }
       }
     }
   };