gastar 1.0.0 → 1.0.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTgxNmZlMjM1OWRiNjI3NTU4MDViNDJhYWE0MzQ3YWZmODRiNzcwOA==
+    MDJkOTcxNGZiMDYxZmJjYTI3MmYyZWZjZmEwMTNmZmFjZGZlNGE3OA==
   data.tar.gz: !binary |-
-    NWZhMWUxMmYxYTYzMDE5NDBkM2YzNjU3MThjYjljNGZlN2ZjNGFmZA==
+    MzA4Mjc5MGQyM2I3ZDUxOWE5NTBmNjliNzBkNGRiZDA4NDhiNjZiNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NTNmNGU5OGFiODBmODA4MDUxYTFlNGYxZmVlN2Y0NDRjNDc3NWNlMGNmY2Vh
-    MmQ0NTFhODExNzJhNjNlNzk1ZDVhNWUzMzVhZDVkNTJiNWNhYjk4ODI4ZGJm
-    OWRiMjJmMGI4NThkNzdhODVmZTNlYmFkYzc4YWY4ZjIxNjU3MDk=
+    ZTkyMzQ5NTdlYjQwZTNjYzhlMTQwMjQ4MjBkZGNhNDVlODJkZWZkZDFhMjYy
+    YjVmY2Y3YWJhNjQ0MDFlNWQ4OWY1ODBmNmQ1MDM1N2EwMDI1OTg5NTI2ZTBl
+    YTIyODI3ZTNlZDBmODZhMzczYjJlNzQ0MzMzNTk4NTIxMjE3NWY=
   data.tar.gz: !binary |-
-    ZmYwMzViMjAzMjllNWRmNGY1ZmIyZGVjOTU1ODAyNzk4YmI5Yjc2NDExZTBm
-    NzYzNWQzOTk1ZDdlZTg1YmQyMWQ1OTIwNTYwMTFkOTE4NTJmMjQ0NGU0NmQ3
-    MmZiYzc1Y2RiZDVjNTQ0M2Q0N2EzMjVmMDY3ZTczMDJjNzkzZWM=
+    Y2NkNDMzMjc4OTJkYTkzNzU1YjAyNjJjYmNjNDdlNGJjMzcwMjUzOTc4ZTE2
+    ZDc5YWUxYjBmM2MxNGFmNzM2YTRlYzRhYzhkNDdkYWYxNWE0MGZjNjI1ZDI0
+    ZWJiZjY0ZmNjNjEzMzdmZWE3YWQyODJiOGQ1NDk3MmZlZGQ3NWQ=

data/README.md

@@ -27,50 +27,52 @@ Or install it yourself as:
 
 ## Usage
 
-Example use:
-
-    require 'gastar'
-    
-    # Implement the abstract node class.
-    # Note: All attributes below are custom for this implementation and none are
-    # needed nor used by the actual AStar seach algorithm. They're my domain atts.
-    class Node < AStarNode
-      attr_reader :name, :x, :y
-      def initialize(name, x, y)
-        super()
-        @name, @x, @y = name, x, y
-      end
-      def move_cost(other) 1 end
-      def to_s() name end
-    end
-    
-    # Also implement an algorithm for estimating cost of reaching the destination
-    class Space < AStar
-      def heuristic(node, start, goal)
-        Math.sqrt( (goal.x - node.x)**2 + (goal.y - node.y)**2 )
-      end
-    end
-    
-    # Create a graph as an ordinary hashmap, with the key being a node and the
-    # value a list of other nodes that can be reached from the key-node.
-    
-    sun = Node.new "Sundsvall",  9, 10
-    upp = Node.new "Uppsala",    9,  6
-    sth = Node.new "Stockholm", 10,  5
-    jon = Node.new "Jonkoping",  4,  3
-    got = Node.new "Goteborg",   1,  3
-    mal = Node.new "Malmo",      2,  1
-  
-    cities = {
-      sun => [upp],
-      sth => [sun,jon,upp],
-      jon => [sth,got,mal],
-      upp => [sth,sun],
-      mal => [jon],
-      got => [jon]
-    }
-  
-    puts Space.new(cities).search(sun, mal)
+Example use for finding the shortest route between cities.
+
+```ruby
+require 'gastar'
+
+# Implement the abstract node class.
+# Note: All attributes below are custom for this implementation and none are
+# needed nor used by the actual AStar seach algorithm. They're my domain atts.
+class Node < AStarNode
+  attr_reader :name, :x, :y
+  def initialize(name, x, y)
+    super()
+    @name, @x, @y = name, x, y
+  end
+  def move_cost(other) 1 end
+  def to_s() name end
+end
+
+# Also implement an algorithm for estimating cost of reaching the destination
+class Space < AStar
+  def heuristic(node, start, goal)
+    Math.sqrt( (goal.x - node.x)**2 + (goal.y - node.y)**2 )
+  end
+end
+
+# Create a graph as an ordinary hashmap, with the key being a node and the
+# value a list of other nodes that can be reached from the key-node.
+
+sun = Node.new "Sundsvall",  9, 10
+upp = Node.new "Uppsala",    9,  6
+sth = Node.new "Stockholm", 10,  5
+jon = Node.new "Jonkoping",  4,  3
+got = Node.new "Goteborg",   1,  3
+mal = Node.new "Malmo",      2,  1
+
+cities = {
+  sun => [upp],
+  sth => [sun,jon,upp],
+  jon => [sth,got,mal],
+  upp => [sth,sun],
+  mal => [jon],
+  got => [jon]
+}
+
+puts Space.new(cities).search(sun, mal)
+```
 
 ## Contributing
 

data/lib/gastar/version.rb

@@ -1,3 +1,3 @@
-module Gastar
-  VERSION = "1.0.0"
-end
+module Gastar
+  VERSION = "1.0.1"
+end

data/lib/gastar.rb

@@ -68,7 +68,14 @@ class AStar
     openset = Set.new
     closedset = Set.new
     current = start
-    openset_min_max = @maximize_cost ? openset.method(:max_by) : openset.method(:min_by)
+
+    if @maximize_cost  # serves to invert the comparison
+      openset_min_max = openset.method(:max_by)
+      flip = -1
+    else
+      openset_min_max = openset.method(:min_by)
+      flip = 1
+    end
 
     openset.add(current)
     while not openset.empty?
@@ -89,7 +96,7 @@ class AStar
 
         if openset.include? node
           new_g = current.g + current.move_cost(node)
-          if node.g > new_g
+          if (node.g - new_g) * flip > 0
             node.g = new_g
             node.parent = current
           end

data/spec/gastar_spec.rb

@@ -42,5 +42,26 @@ describe "AStar implementation" do
     actual.should eql(expected)
 
   end
+
+  it "finds the longest path between cities" do
+
+    a = Node.new "C1",  1, 1
+    b = Node.new "C2",  2, 2
+    c = Node.new "C3",  1, 3
+    d = Node.new "C4",  1, 4
+
+
+    cities = {
+      a => [b,c],
+      b => [c],
+      c => [d],
+      d => [c],
+    }
+
+    Space.new(cities, false).search(a, d).should eql([a,c,d])
+    Space.new(cities, true).search(a, d).should eql([a,b,c,d])
+
+  end
+
 end
   

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: gastar
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Jonas Tingeborn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler