Minor code cleanup, changed applicable CityGraph methods "inherit" their Graph equivalent, updated benchmark to run the 500x500 test

dested · dested · commit db1578d87ef4 · 2014-12-22T14:12:58.000-07:00
diff --git a/astar.js b/astar.js
@@ -158,7 +158,6 @@ var astar = {
 function Graph(gridIn, options) {
     options = options || {};
     this.nodes = [];
-    this.dirtyNodes=[];
     this.diagonal = !!options.diagonal;
     this.grid = [];
     for (var x = 0; x < gridIn.length; x++) {
@@ -170,23 +169,24 @@ function Graph(gridIn, options) {
             this.nodes.push(node);
         }
     }
-    this.init(this);
+    this.init();
 }
 
-Graph.prototype.init= function() {
-    for (var i = 0, len = this.nodes.length; i < len; ++i) {
+Graph.prototype.init = function() {
+    this.dirtyNodes = [];
+    for (var i = 0; i < this.nodes.length; i++) {
         astar.cleanNode(this.nodes[i]);
     }
 };
 
-Graph.prototype.cleanDirty=function(){
+Graph.prototype.cleanDirty = function() {
     for (var i = 0; i < this.dirtyNodes.length; i++) {
         astar.cleanNode(this.dirtyNodes[i]);
     }
-    this.dirtyNodes.length=0;
+    this.dirtyNodes = [];
 };
 
-Graph.prototype.markDirty=function(node){
+Graph.prototype.markDirty = function(node) {
     this.dirtyNodes.push(node);
 };
 
diff --git a/benchmark/index.html b/benchmark/index.html
@@ -7,7 +7,7 @@
         <link rel="stylesheet" type="text/css" href="../demo/demo.css" />
         <script type='text/javascript' src='../demo/jquery-1.7.1.min.js'></script>
         <script type='text/javascript' src='../astar.js'></script>
-        <script type='text/javascript' src='grid_150x150.js'></script>
+        <script type='text/javascript' src='grid_500x500.js'></script>
         <script type='text/javascript' src='benchmark.js'></script>
     </head>
 <body>
diff --git a/test/tests.js b/test/tests.js
@@ -135,7 +135,6 @@ test( "GPS Pathfinding", function() {
 
   function CityGraph(data, links) {
     this.nodes = [];
-    this.dirtyNodes = [];
     this.links = links;
     this.cities = {};
 
@@ -153,22 +152,11 @@ test( "GPS Pathfinding", function() {
     this.init();
   }
 
-  CityGraph.prototype.init= function() {
-      for (var i = 0, len = this.nodes.length; i < len; ++i) {
-        astar.cleanNode(this.nodes[i]);
-      }
-  };
-  CityGraph.prototype.cleanDirty=function(){
-      for (var i = 0; i < this.dirtyNodes.length; i++) {
-        astar.cleanNode(this.dirtyNodes[i]);
-      }
-      this.dirtyNodes.length=0;
-  };
+  CityGraph.prototype.init= Graph.prototype.init;
 
-  CityGraph.prototype.markDirty=function(node){
-      this.dirtyNodes.push(node);
-  };
+  CityGraph.prototype.cleanDirty = Graph.prototype.cleanDirty;
 
+  CityGraph.prototype.markDirty = Graph.prototype.markDirty;
 
   CityGraph.prototype.neighbors = function (node) {
     var neighbors = [],
