Merge branch 'master' of https://github.com/TiTi/javascript-astar

Author: bgrins

astar.js

@@ -17,6 +17,16 @@
     }
 })(function() {
 
+function pathTo(node){
+    var curr = node,
+        path = [];
+    while(curr.parent) {
+        path.push(curr);
+        curr = curr.parent;
+    }
+    return path.reverse();
+}
+
 var astar = {
     init: function(graph) {
         for (var i = 0, len = graph.nodes.length; i < len; ++i) {
@@ -56,17 +66,6 @@ var astar = {
 
         start.h = heuristic(start, end);
 
-        function pathTo(node){
-            var curr = node;
-            var path = [];
-            while(curr.parent) {
-                path.push(curr);
-                curr = curr.parent;
-            }
-            return path.reverse();
-        }
-
-
         openHeap.push(start);
 
         while(openHeap.size() > 0) {
@@ -224,18 +223,18 @@ Graph.prototype.neighbors = function(node) {
 };
 
 Graph.prototype.toString = function() {
-    var graphString = "\n";
-    var nodes = this.nodes;
-    var rowDebug, row, y, l;
+    var graphString = [],
+        nodes = this.grid, // when using grid
+        rowDebug, row, y, l;
     for (var x = 0, len = nodes.length; x < len; x++) {
-        rowDebug = "";
+        rowDebug = [];
         row = nodes[x];
         for (y = 0, l = row.length; y < l; y++) {
-            rowDebug += row[y].weight + " ";
+            rowDebug.push(row[y].weight);
         }
-        graphString = graphString + rowDebug + "\n";
+        graphString.push(rowDebug.join(" "));
     }
-    return graphString;
+    return graphString.join("\n");
 };
 
 function GridNode(x, y, weight) {

benchmark/benchmark.js

@@ -13,19 +13,19 @@ $(function() {
         var times = 0;
 
         for (var i = 0; i < 1000; i++) {
-            var startTime = new Date().getTime();
+            var startTime = performance ? performance.now() : new Date().getTime();
             var result = astar.search(graph, start, end);
-            var endTime = new Date().getTime();
+            var endTime = performance ? performance.now() : new Date().getTime();
             times = times + (endTime - startTime);
 
             results.push(
                 '<li>Found path with ' + result.length + ' steps.  ' +
-                'Took ' + (endTime - startTime) + ' milliseconds.</li>'
+                'Took ' + (endTime - startTime).toFixed(2) + ' milliseconds.</li>'
             );
         }
 
         $("#graph").html(graph.toString());
-        $("#summary").html('Average time: ' + (times / 1000) + 'ms');
+        $("#summary").html('Average time: ' + (times / 1000).toFixed(2) + 'ms');
         $("#results").html(results.join(''));
 
         running = false;

demo/demo.js

@@ -179,18 +179,19 @@ GraphSearch.prototype.cellClicked = function($end) {
    	var $start = this.$cells.filter("." + css.start);
    	var start = this.nodeFromElement($start);
 
-	var sTime = new Date();
+	var sTime = performance ? performance.now() : new Date().getTime();
     var path = this.search(this.graph, start, end, {
         closest: this.opts.closest
     });
-	var fTime = new Date();
+	var fTime = performance ? performance.now() : new Date().getTime();
+	var duration = (fTime-sTime).toFixed(2);
 
 	if(!path || path.length == 0)	{
-	    $("#message").text("couldn't find a path ("+(fTime-sTime)+"ms)");
+	    $("#message").text("couldn't find a path (" + duration + "ms)");
 	    this.animateNoPath();
 	}
 	else {
-	    $("#message").text("search took " + (fTime-sTime) + "ms.");
+	    $("#message").text("search took " + duration + "ms.");
     	if(this.opts.debug) {
 	    	this.drawDebugInfo(this.opts.debug);
 	    }