Make octile heuristic the default for diagonal movement

imor · imor · commit 422ff11cc6c5 · 2014-12-28T17:34:05.000+05:30
The same change as the last commit for BiAStar and IDAStart finders
diff --git a/src/finders/BiAStarFinder.js b/src/finders/BiAStarFinder.js
@@ -35,6 +35,14 @@ function BiAStarFinder(opt) {
             }
         }
     }
+
+    //When diagonal movement is allowed the manhattan heuristic is not admissible
+    //It should be octile instead
+    if (this.diagonalMovement === DiagonalMovement.Never) {
+        this.heuristic = opt.heuristic || Heuristic.manhattan;
+    } else {
+        this.heuristic = opt.heuristic || Heuristic.octile;
+    }
 }
 
 /**
diff --git a/src/finders/IDAStarFinder.js b/src/finders/IDAStarFinder.js
@@ -50,6 +50,14 @@ function IDAStarFinder(opt) {
             }
         }
     }
+
+    //When diagonal movement is allowed the manhattan heuristic is not admissible
+    //It should be octile instead
+    if (this.diagonalMovement === DiagonalMovement.Never) {
+        this.heuristic = opt.heuristic || Heuristic.manhattan;
+    } else {
+        this.heuristic = opt.heuristic || Heuristic.octile;
+    }
 }
 
 /**

Original file line number	Diff line number	Diff line change
`@@ -35,6 +35,14 @@ function BiAStarFinder(opt) {`
`35`	`35`	`}`
`36`	`36`	`}`
`37`	`37`	`}`
	`38`	`+`
	`39`	`+ //When diagonal movement is allowed the manhattan heuristic is not admissible`
	`40`	`+ //It should be octile instead`
	`41`	`+ if (this.diagonalMovement === DiagonalMovement.Never) {`
	`42`	`+ this.heuristic = opt.heuristic \|\| Heuristic.manhattan;`
	`43`	`+ } else {`
	`44`	`+ this.heuristic = opt.heuristic \|\| Heuristic.octile;`
	`45`	`+ }`
`38`	`46`	`}`
`39`	`47`
`40`	`48`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,14 @@ function IDAStarFinder(opt) {`
`50`	`50`	`}`
`51`	`51`	`}`
`52`	`52`	`}`
	`53`	`+`
	`54`	`+ //When diagonal movement is allowed the manhattan heuristic is not admissible`
	`55`	`+ //It should be octile instead`
	`56`	`+ if (this.diagonalMovement === DiagonalMovement.Never) {`
	`57`	`+ this.heuristic = opt.heuristic \|\| Heuristic.manhattan;`
	`58`	`+ } else {`
	`59`	`+ this.heuristic = opt.heuristic \|\| Heuristic.octile;`
	`60`	`+ }`
`53`	`61`	`}`
`54`	`62`
`55`	`63`	`/**`