astar 0.0.1 → 0.0.2

data/README.md

@@ -1,6 +1,7 @@
 # Astar
 
-Pathfinding library using the astar algorithm
+Pathfinding library using the astar algorithm, supports manhhaten and euclidean
+distance heuristics.
 
 ## Installation
 
@@ -33,6 +34,8 @@ Pass in your start and destination tiles
     Astar::FindPath.from(tile1).to(tile3)
     => [tile1, tile2, tile3]
 
+    Astar::FindPath.from(tile1).to(tile).use_euclidean_distance
+
 The specs also have an example of how to use the lib.
 
 ## Contributing

data/lib/astar.rb

@@ -1,3 +1,6 @@
+require "astar/heuristic"
+require "astar/heuristic/manhatten_distance"
+require "astar/heuristic/euclidean_distance"
 require "astar/node"
 require "astar/version"
 
@@ -13,6 +16,10 @@ module Astar
       calculate_route
     end
 
+    def use_euclidean_distance
+      @strategy = EuclideanDistance
+    end
+
     def calculate_route
       until destination_reached? || @open_list.empty?
         current_node = @open_list.pop
@@ -31,7 +38,7 @@ module Astar
     end
 
     def calculate_fastest
-      @open_list.sort_by! {|node| node.score }.reverse
+      @open_list.sort_by! {|node| @strategy.score(node) }.reverse
     end
 
     def destination_reached?
@@ -43,6 +50,7 @@ module Astar
       @from_node = Node.new(node, nil)
       @open_list = []
       @closed_list = []
+      @strategy = ManhattenDistance
     end
   end
 end

data/lib/astar/heuristic.rb

@@ -0,0 +1,20 @@
+module Astar
+  class Heuristic
+    def self.score(node)
+      new(node).score
+    end
+
+    def relative_to_parent
+      return 10 if (@node.x > @node.parent.x && @node.y == @node.parent.y)
+      return 10 if (@node.x < @node.parent.x && @node.y == @node.parent.y)
+      return 10 if (@node.y > @node.parent.y && @node.x == @node.parent.x)
+      return 10 if (@node.y < @node.parent.y && @node.x == @node.parent.x)
+      14
+    end
+
+    private
+    def initialize(node)
+      @node = node
+    end
+  end
+end

data/lib/astar/heuristic/euclidean_distance.rb

@@ -0,0 +1,9 @@
+module Astar
+  class EuclideanDistance < Heuristic
+    def score
+      f = relative_to_parent
+      g = Math.sqrt((@node.destination.x - @node.x)^2 + (@node.destination.y - @node.y)^2)
+      f + g
+    end
+  end
+end

data/lib/astar/heuristic/manhatten_distance.rb

@@ -0,0 +1,9 @@
+module Astar
+  class ManhattenDistance < Heuristic
+    def score
+      f = relative_to_parent
+      g = (@node.destination.x - @node.x).abs + (@node.destination.y - @node.y).abs
+      f + g
+    end
+  end
+end

data/lib/astar/node.rb

@@ -1,6 +1,6 @@
 module Astar
   class Node
-    attr_reader :tile, :parent
+    attr_reader :tile, :parent, :destination
     def initialize(tile, destination, parent=nil)
       @tile = tile
       @parent = parent
@@ -18,21 +18,5 @@ module Astar
     def y
       @tile.y
     end
-
-    def score
-      relative_to_parent + manhatten_distance
-    end
-
-    def manhatten_distance
-      (@destination.x - @tile.x) + (@destination.y - @tile.y)
-    end
-
-    def relative_to_parent
-      return 10 if (@tile.x > @parent.x && @tile.y == @parent.y)
-      return 10 if (@tile.x < @parent.x && @tile.y == @parent.y)
-      return 10 if (@tile.y > @parent.y && @tile.x == @parent.x)
-      return 10 if (@tile.y < @parent.y && @tile.x == @parent.x)
-      14
-    end
   end
 end

data/lib/astar/version.rb

@@ -1,3 +1,3 @@
 module Astar
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: astar
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-09 00:00:00.000000000 Z
+date: 2012-11-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -57,6 +57,9 @@ files:
 - Rakefile
 - astar.gemspec
 - lib/astar.rb
+- lib/astar/heuristic.rb
+- lib/astar/heuristic/euclidean_distance.rb
+- lib/astar/heuristic/manhatten_distance.rb
 - lib/astar/node.rb
 - lib/astar/version.rb
 - spec/lib/astar_spec.rb