Harmonize spelling

[factor.git] / extra / path-finding / path-finding.factor

diff --git a/extra/path-finding/path-finding.factor b/extra/path-finding/path-finding.factor
index 4b11616c201c91633e48f66bf0b63e9feb9b17f0..e5048da6f762da854511532352c85be78ad775b8 100644 (file)
--- a/extra/path-finding/path-finding.factor
+++ b/extra/path-finding/path-finding.factor
@@ -1,6 +1,6 @@
 ! Copyright (C) 2010 Samuel Tardieu.
 ! See http://factorcode.org/license.txt for BSD license.
-USING: accessors assocs hash-sets heaps kernel math sequences sets shuffle ;
+USING: accessors assocs heaps kernel math sequences sets ;
 IN: path-finding
 
 ! This implements the A* algorithm. See http://en.wikipedia.org/wiki/A*
@@ -8,7 +8,7 @@ IN: path-finding
 TUPLE: astar g in-closed-set ;
 GENERIC: cost ( from to astar -- n )
 GENERIC: heuristic ( from to astar -- n )
-GENERIC: neighbours ( node astar -- seq )
+GENERIC: neighbors ( node astar -- seq )
 
 <PRIVATE
 
@@ -40,13 +40,13 @@ TUPLE: (astar) astar goal origin in-open-set open-set ;
 
 : ?set-g ( origin node astar -- )
     [ cost-through ] 3keep [ swap ] 2dip
-    3dup astar>> g>> at [ 1/0. ] unless* > [ 4drop ] [ set-g ] if ;
+    3dup astar>> g>> at [ 1/0. ] unless* >= [ 4drop ] [ set-g ] if ;
 
 : build-path ( target astar -- path )
     [ over ] [ over [ [ origin>> at ] keep ] dip ] produce 2nip reverse ;
 
 : handle ( node astar -- )
-    dupd [ astar>> neighbours ] keep [ ?set-g ] curry with each ;
+    dupd [ astar>> neighbors ] keep [ ?set-g ] curry with each ;
 
 : (find-path) ( astar -- path/f )
     dup open-set>> heap-empty? [
@@ -58,40 +58,40 @@ TUPLE: (astar) astar goal origin in-open-set open-set ;
 : (init) ( from to astar -- )
     swap >>goal
     H{ } clone over astar>> g<<
-    { } <hash-set> over astar>> in-closed-set<<
+    HS{ } clone over astar>> in-closed-set<<
     H{ } clone >>origin
     H{ } clone >>in-open-set
     <min-heap> >>open-set
     [ 0 ] 2dip [ (add-to-open-set) ] [ astar>> g>> set-at ] 3bi ;
 
-TUPLE: astar-simple < astar cost heuristic neighbours ;
+TUPLE: astar-simple < astar cost heuristic neighbors ;
 M: astar-simple cost cost>> call( n1 n2 -- c ) ;
 M: astar-simple heuristic heuristic>> call( n1 n2 -- c ) ;
-M: astar-simple neighbours neighbours>> call( n -- neighbours ) ;
+M: astar-simple neighbors neighbours>> call( n -- neighbours ) ;
 
-TUPLE: bfs < astar neighbours ;
+TUPLE: bfs < astar neighbors ;
 M: bfs cost 3drop 1 ;
 M: bfs heuristic 3drop 0 ;
-M: bfs neighbours neighbours>> at ;
+M: bfs neighbors neighbours>> at ;
 
 TUPLE: dijkstra < astar costs ;
 M: dijkstra cost costs>> swapd at at ;
 M: dijkstra heuristic 3drop 0 ;
-M: dijkstra neighbours costs>> at keys ;
+M: dijkstra neighbors costs>> at keys ;
 
 PRIVATE>
 
 : find-path ( start target astar -- path/f )
     (astar) new [ astar<< ] keep [ (init) ] [ (find-path) ] bi ;
 
-: <astar> ( neighbours cost heuristic -- astar )
-    astar-simple new swap >>heuristic swap >>cost swap >>neighbours ;
+: <astar> ( neighbors cost heuristic -- astar )
+    astar-simple new swap >>heuristic swap >>cost swap >>neighbors ;
 
 : considered ( astar -- considered )
     in-closed-set>> members ;
 
-: <bfs> ( neighbours -- astar )
-    [ bfs new ] dip >>neighbours ;
+: <bfs> ( neighbors -- astar )
+    [ bfs new ] dip >>neighbors ;
 
 : <dijkstra> ( costs -- astar )
     [ dijkstra new ] dip >>costs ;