shortest-path 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55f2e617f1bb69175440dd880744b84a5b0ed480
-  data.tar.gz: 575c55362f1987c38b1984457eab7c5314785f25
+  metadata.gz: 24e31f9a3e57ae30f4267b0ab9788a1966affe27
+  data.tar.gz: b360fe07466f51912ca373e945c846b0fa45ca23
 SHA512:
-  metadata.gz: 2a6870f838329f9890c6094e1bf26457bb42312f01a093b02c5ab450c64093dd7f5b20ee6c5824085ab30005624a053a6d143dd0a3257356e9dc41e97b8f8b41
-  data.tar.gz: e7933a68e0c285de39138690130658171fb9bf230a4261bbaa4f6e87c5836132fe18eb92b92756af07f2ce21b6d5e8d176e3392b44b5033608709a9a0f5e825c
+  metadata.gz: c325a13510629f21a1b448d49d5dec56eed2572c27551f6e9b9dd2781afd95b6310cf159d11d316d1ef25c99770854a15d878743858b7d4d6b723128ecd197eb
+  data.tar.gz: 657a108c7b5a1a34c497056fab0e53c44cefa34db8f7954b0f4806f4c33d5d800be95911529279fe3adae406fcf43a43aac3a85a5f24a156505b21231f87d663

data/lib/shortest/path.rb

@@ -1,4 +1,3 @@
 require "shortest/path/version"
 require "shortest/path/general"
-require "shortest/path/priority_queue"
 require "shortest/path/astar"

data/lib/shortest/path/astar.rb

@@ -1,48 +1,48 @@
 module Shortest
   module Path
+
+# @see http://branch14.org/snippets/a_star_in_ruby.html
+
+    class PriorityQueue
+      def initialize; @list = [] end
+
+      def add(priority, item)
+        @list << [priority, @list.length, item]
+        @list.sort!
+        self
+      end
+
+      def <<(pritem); add(*pritem) end
+      def next; @list.shift[2] end
+      def empty?; @list.empty? end
+    end
+
     class AStar
-      def initialize(dist,heur,graph,start,goal)
-        @dist=dist ; @heur=heur ; @graph=graph
-        @start=start ; @goal=goal
+      def initialize(dist, cost, graph, start, goal)
+        @graph = graph
+        @dist  = dist ; @cost = cost
+        @start = start ; @goal=goal
       end
 
       def search
-        closedset=[] ; openset=Shortest::Path::PriorityQueue.new ; came_from={}
-        start_g_score=0 ; start_f_score=start_g_score+@heur.call(@start,@goal)
-        g_score={@start => start_g_score} ; f_score={@start => start_f_score}
-        openset.add_with_priority(@start, start_f_score)
-        until openset.empty?
-          current=openset.pop
-          return reconstruct_path(came_from,@goal) if current==@goal
-          closedset<<current
-          @graph.neighbors(current).each do |neighbor|
-            next if closedset.include?(neighbor)
-            tentative_g_score=g_score[current]+@dist.call(current,neighbor)
-            if (not openset.include?(neighbor)) or (tentative_g_score < (g_score[neighbor]||Float::INFINITY))
-              came_from[neighbor]=current
-              g_score[neighbor]=tentative_g_score
-              f_score[neighbor]=tentative_g_score+@heur.call(neighbor,@goal)
-              if not openset.include?(neighbor)
-                openset.add_with_priority(neighbor, f_score[neighbor])
-              else
-                openset.change_priority(neighbor, f_score[neighbor])
-              end
-            end
+        been_there = {}
+        pqueue = Shortest::Path::PriorityQueue.new
+        pqueue << [1, [@start, [], 0]]
+        while !pqueue.empty?
+          spot, path_so_far, cost_so_far = pqueue.next
+          next if been_there[spot]
+          newpath = path_so_far + [spot]
+          return newpath if (spot == @goal)
+          been_there[spot] = 1
+          @graph.neighbors(spot).each do |newspot|
+            next if been_there[newspot]
+            tcost = @cost.call(spot, newspot)
+            next unless tcost
+            newcost = cost_so_far + tcost
+            pqueue << [newcost + @dist.call(@goal, newspot), [newspot, newpath, newcost]]
           end
         end
-        return [] # failure!
-      end
-
-      private
-
-      def reconstruct_path(came_from, current_node)
-        if came_from.include?(current_node)
-          p = reconstruct_path(came_from, came_from[current_node])
-          p << current_node
-          p
-        else
-          [current_node]
-        end
+        return []
       end
     end
 
@@ -51,9 +51,7 @@ module Shortest
     # `graph` graph structure
     # `start` start node
     # `goal` goal node
-    def astar(dist,heur,graph,start,goal)
-      Shortest::Path::AStar.new(dist,heur,graph,start,goal).search
-    end
+    def astar(dist, heur, graph, start, goal); Shortest::Path::AStar.new(dist, heur, graph, start, goal).search end
 
     module_function :astar
   end

data/lib/shortest/path/general.rb

@@ -28,6 +28,13 @@ module Shortest
         self.connect(vertex2, vertex1, length)
       end
 
+      def remove_edge(vertex1, vertex2)
+        for_remove = @edges.select{ |e| (e.src == vertex1 && e.dst == vertex2) || (e.src == vertex2 && e.dst == vertex1) }
+        for_remove.each do |edge|
+          @edges.delete_at(@edges.index(edge))
+        end
+      end
+
       def neighbors(vertex)
         neighbors = []
         @edges.each{|edge| neighbors.push edge.dst if edge.src==vertex }

data/lib/shortest/path/version.rb

@@ -1,5 +1,5 @@
 module Shortest
   module Path
-    VERSION = "0.0.2"
+    VERSION = "0.0.3"
   end
 end

data/shortest-path.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.6"
-  spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "debugger"
 end

data/spec/astar_spec.rb

@@ -3,9 +3,9 @@ require 'spec_helper'
 class Point
   attr_reader :x, :y
 
-  def initialize(x,y)
-    @x=x ; @y=y
-  end
+  def initialize(x,y); @x=x ; @y=y end
+
+  def <=> (obj); 0 end
 end
 
 def build_graph(n)
@@ -22,10 +22,22 @@ def build_graph(n)
   graph
 end
 
+describe 'AStar priority queue' do
+  before(:all) do
+    @queue = Shortest::Path::PriorityQueue.new
+    @queue << [1, "A"]
+    @queue << [3, "C"]
+    @queue << [2, "B"]
+  end
+  specify{ expect(@queue.next).to eq("A") }
+  specify{ expect(@queue.next).to eq("B") }
+  specify{ expect(@queue.next).to eq("C") }
+end
+
 describe 'AStar' do
   before(:all) do
     @graph=build_graph(3)
-    @p1=@graph[0] ; @p2=@graph[8]
+    @p1=@graph.first ; @p2=@graph.last
     dist = heur = ->(p1,p2){ dx=p1.x-p2.x ; dy=p1.y-p2.y ; Math.sqrt(dx*dx + dy*dy) }
     @shortest=Shortest::Path.astar(dist, heur, @graph, @p1, @p2)
   end
@@ -34,8 +46,30 @@ describe 'AStar' do
   specify{ expect(@graph.edges.size).to eq(24) }
   specify{ expect(@shortest.size).to eq(5) }
   specify{ expect(@shortest[0]).to eq(@graph[0]) }
-  specify{ expect(@shortest[1]).to eq(@graph[1]) }
-  specify{ expect(@shortest[2]).to eq(@graph[4]) }
-  specify{ expect(@shortest[3]).to eq(@graph[5]) }
+  specify{ expect(@shortest[1]).to eq(@graph[3]) }
+  specify{ expect(@shortest[2]).to eq(@graph[6]) }
+  specify{ expect(@shortest[3]).to eq(@graph[7]) }
   specify{ expect(@shortest[4]).to eq(@graph[8]) }
 end
+
+def astar_performance(n)
+  graph = build_graph(n)
+  p1 = graph.first ; p2 = graph.last
+  dist = heur = ->(p1,p2){ dx=p1.x-p2.x ; dy=p1.y-p2.y ; Math.sqrt(dx*dx + dy*dy) }
+  t1 = Time.now
+  shortest=Shortest::Path.astar(dist, heur, graph, p1, p2)
+  Time.now - t1
+end
+
+describe 'AStar performance' do
+  before(:all) do
+    puts ""
+    k = 10
+    (1..3).each do |n|
+      t = astar_performance(k)
+      puts "#{k}: #{t} sec"
+      k = k * 2
+    end
+  end
+  specify{ expect(true).to eq(true) }
+end

data/spec/general_spec.rb

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe 'Graph' do
+describe 'Normal path for graph creation' do
   before(:all) do
     @graph=Shortest::Path::Graph.new
     (1..4).each{|x| @graph.push x}
@@ -21,3 +21,21 @@ describe 'Graph' do
   specify{ expect(@first_edge.src).to eq(1) }
   specify{ expect(@first_edge.dst).to eq(2) }
 end
+
+describe 'Remove graph edge' do
+  before(:all) do
+    @graph=Shortest::Path::Graph.new
+    (1..4).each{|x| @graph.push x}
+    @graph.connect_mutually 1, 2, 10
+    @graph.connect_mutually 1, 3, 10
+    @graph.connect_mutually 1, 4, 10
+    @graph.connect_mutually 2, 4, 10
+    @graph.connect_mutually 2, 3, 10
+    @graph.connect_mutually 3, 4, 10
+
+    @graph.remove_edge(1, 2)
+    @graph.remove_edge(1, 3)
+  end
+
+  specify{ expect(@graph.edges.size).to eq(4 * 2) }
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shortest-path
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Dimitri Kurashvili
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-07 00:00:00.000000000 Z
+date: 2014-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,20 +24,34 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: debugger
   requirement: !ruby/object:Gem::Requirement
@@ -68,12 +82,10 @@ files:
 - lib/shortest/path.rb
 - lib/shortest/path/astar.rb
 - lib/shortest/path/general.rb
-- lib/shortest/path/priority_queue.rb
 - lib/shortest/path/version.rb
 - shortest-path.gemspec
 - spec/astar_spec.rb
 - spec/general_spec.rb
-- spec/priority_queue_spec.rb
 - spec/spec_helper.rb
 homepage: http://github.com/georgian-se/shortest-path
 licenses:
@@ -102,5 +114,4 @@ summary: finding shortest path
 test_files:
 - spec/astar_spec.rb
 - spec/general_spec.rb
-- spec/priority_queue_spec.rb
 - spec/spec_helper.rb

data/lib/shortest/path/priority_queue.rb

@@ -1,33 +0,0 @@
-module Shortest
-  module Path
-    class PriorityQueueItem
-      attr_reader :item, :priority
-
-      def initialize(item,priority)
-        @item = item ; @priority = priority
-      end
-    end
-
-    class PriorityQueue
-      def initialize; @heap = [] end
-
-      def add_with_priority(object, priority)
-        item = PriorityQueueItem.new(object,priority)
-        @heap << item
-        sort_by_priority
-      end
-
-      def change_priority(object, priority)
-        @heap.select{|x| x.item==object}.first.priority=priority
-        sort_by_priority
-      end
-
-      def pop; @heap.delete_at(0).item end
-      def empty?; @heap.empty? end
-      def include?(object); @heap.select{|x| x.item==object}.any? end
-
-      private
-      def sort_by_priority; @heap.sort!{ |x,y| x.priority <=> y.priority } end
-    end
-  end
-end

data/spec/priority_queue_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe 'PriorityQueue' do
-  before(:all) do
-    @queue=Shortest::Path::PriorityQueue.new
-    @queue.add_with_priority("A",1)
-    @queue.add_with_priority("D",4)
-    @queue.add_with_priority("C",3)
-    @queue.add_with_priority("B",2)
-  end
-
-  specify{ expect(@queue).not_to be_empty }
-  specify{ expect(@queue.include?("A")).to eq(true) }
-  specify{ expect(@queue.pop).to eq("A") }
-  specify{ expect(@queue.pop).to eq("B") }
-  specify{ expect(@queue.pop).to eq("C") }
-  specify{ expect(@queue.pop).to eq("D") }
-  specify{ expect(@queue).to be_empty }
-  specify{ expect(@queue.include?("A")).to eq(false) }
-end