shortest_path 0.0.3 → 0.0.4

data/.travis.yml

@@ -1,3 +1,4 @@
 language: ruby
 rvm:
   - 1.9.3
+  - 2.0.0

data/Gemfile

@@ -3,9 +3,11 @@ source "http://rubygems.org"
 # Specify your gem's dependencies in shortest_path.gemspec
 gemspec
 
+gem 'coveralls', require: false
+
 group :development do
   group :linux do
     gem 'rb-inotify', :require => RUBY_PLATFORM.include?('linux') && 'rb-inotify'
     gem 'rb-fsevent', :require => RUBY_PLATFORM.include?('darwin') && 'rb-fsevent'        
   end
-end
+end

data/README.md

@@ -1,4 +1,5 @@
-# Shortest Path  [![Build Status](https://travis-ci.org/dryade/shortest_path.png)](http://travis-ci.org/dryade/shortest_path?branch=master) [![Dependency Status](https://gemnasium.com/dryade/shortest_path.png)](https://gemnasium.com/dryade/shortest_path) [![Code Climate](https://codeclimate.com/github/dryade/shortest_path.png)](https://codeclimate.com/github/dryade/shortest_path)
+# Shortest Path
+[![Build Status](https://travis-ci.org/dryade/shortest_path.png)](http://travis-ci.org/dryade/shortest_path?branch=master) [![Dependency Status](https://gemnasium.com/dryade/shortest_path.png)](https://gemnasium.com/dryade/shortest_path) [![Code Climate](https://codeclimate.com/github/dryade/shortest_path.png)](https://codeclimate.com/github/dryade/shortest_path) [![Coverage Status](https://img.shields.io/coveralls/dryade/shortest_path.svg)](https://coveralls.io/r/dryade/shortest_path)
 
 A* ruby implementation to find shortest path and map in a graph with :
  - a timeout to stop research when duration > timeout
@@ -9,7 +10,7 @@ A* ruby implementation to find shortest path and map in a graph with :
 Requirements
 ------------
  
-This code has been run and tested on Ruby 1.9
+This code has been run and tested on Ruby 1.9 or later
 
 External Deps
 -------------
@@ -18,6 +19,8 @@ On Debian/Ubuntu/Kubuntu OS :
 sudo apt-get install git
 ```
 
+gcc is for priority queue. 
+
 Installation
 ------------
  
@@ -66,14 +69,7 @@ finder.path
 
 ```
 
-Overwrite shortest path finder : 
-```ruby
-
-# TODO : Class that overwrites shortest path finder
-...
-
-
-```
+Overwrite shortest path finder :  Find an example in [activeroad project](https://github.com/dryade/activeroad/blob/master/lib/active_road/shortest_path/finder.rb)
 
 
 License

data/lib/shortest_path/finder.rb

@@ -1,4 +1,4 @@
-require 'pqueue'
+require 'fc'
 
 module ShortestPath
   class Finder
@@ -15,7 +15,7 @@ module ShortestPath
     attr_accessor :ways_finder
 
     def refresh_context( node, context)
-        {}
+      {}
     end
 
     def ways(node, context={})
@@ -73,45 +73,85 @@ module ShortestPath
 
     def path_without_cache
       @begin_at = Time.now
-
-      visited = {}
-      pq = PQueue.new do |x,y|
-        search_heuristic(x) < search_heuristic(y)
-      end
-
-      pq.push( source)
+      
+      pq = ::FastContainers::PriorityQueue.new(:min)
+      # PQueue.new do |x,y| 
+      #   search_heuristic(x) < search_heuristic(y)
+      # end
+      pq.push(source, 0)
       visit source
       shortest_distances[source] = 0
-      context[source] = {}
 
       not_found = !found?(source)
 
-      while pq.size != 0 && not_found
+      while !pq.empty? && not_found
         raise TimeoutError if timeout?
 
         v = pq.pop
         not_found = !found?(v)
-        visit v
 
-        weights = ways(v, context[v])
+        weights = ways(v)
         if weights
           weights.keys.each do |w|
+            w_distance = shortest_distances[v] + weights[w]
+            
             if !visited?(w) and
                 weights[w] and
-                ( shortest_distances[w].nil? || shortest_distances[w] > shortest_distances[v] + weights[w]) and
-                follow_way?(v, w, weights[w], context[v])
-              shortest_distances[w] = shortest_distances[v] + weights[w]
+                ( shortest_distances[w].nil? || shortest_distances[w] > w_distance) and 
+                follow_way?(v, w, weights[w])
+              shortest_distances[w] = w_distance
               previous[w] = v
-              context[w] = refresh_context( w, context[v])
-              pq.push( w)
+              pq.push(w, search_heuristic(w) )
             end
           end
         end
       end
 
       @end_at = Time.now
+      #puts previous.inspect
       not_found ? [] : sorted_array
     end
+    
+    # def path_without_cache
+    #   @begin_at = Time.now
+
+    #   pq = PQueue.new do |x,y|
+    #     search_heuristic(x) < search_heuristic(y)
+    #   end
+
+    #   pq.push( source)
+    #   visit source
+    #   shortest_distances[source] = 0
+    #   context[source] = {}
+
+    #   not_found = !found?(source)
+
+    #   while pq.size != 0 && not_found
+    #     raise TimeoutError if timeout?
+
+    #     v = pq.pop
+    #     not_found = !found?(v)
+    #     visit v
+
+    #     weights = ways(v, context[v])
+    #     if weights
+    #       weights.keys.each do |w|
+    #         if !visited?(w) and
+    #             weights[w] and
+    #             ( shortest_distances[w].nil? || shortest_distances[w] > shortest_distances[v] + weights[w]) and
+    #             follow_way?(v, w, weights[w], context[v])
+    #           shortest_distances[w] = shortest_distances[v] + weights[w]
+    #           previous[w] = v
+    #           context[w] = refresh_context( w, context[v])
+    #           pq.push( w)
+    #         end
+    #       end
+    #     end
+    #   end
+
+    #   @end_at = Time.now
+    #   not_found ? [] : sorted_array
+    # end
 
     def path_with_cache
       @path ||= path_without_cache

data/lib/shortest_path/map.rb

@@ -1,3 +1,5 @@
+require 'fc'
+
 module ShortestPath
   class Map
 
@@ -6,6 +8,7 @@ module ShortestPath
 
     def initialize(source)
       @source = source
+      @visited = {}
     end
 
     # Should return a map with accessible nodes and associated weight
@@ -28,33 +31,40 @@ module ShortestPath
       shortest_distances[node]
     end
 
+    def visited?(node)
+      @visited[node]
+    end
+
+    def visit(node)
+      @visited[node] = true
+    end
+
     def map
       @shortest_distances = {}
       @previous = {}
 
-      visited = {}
-      pq = PQueue.new { |x,y| search_heuristic(x) < search_heuristic(y) }
+      pq = ::FastContainers::PriorityQueue.new(:min)
 
-      pq.push(source)
-      visited[source] = true
+      pq.push(source, 0)
+      visit source
       shortest_distances[source] = 0
 
-      while pq.size != 0
+      while !pq.empty?
         v = pq.pop
-        visited[v] = true
+        visit v
 
         weights = ways(v)
         if weights
           weights.keys.each do |w|
             w_distance = shortest_distances[v] + weights[w]
-
-            if !visited[w] and
+            
+            if !visited?(w) and
                 weights[w] and
                 ( shortest_distances[w].nil? || shortest_distances[w] > w_distance) and
                 follow_way?(v, w, weights[w])
               shortest_distances[w] = w_distance
               previous[w] = v
-              pq.push(w)
+              pq.push(w, search_heuristic(w) )
             end
           end
         end

data/lib/shortest_path/version.rb

@@ -1,3 +1,3 @@
 module ShortestPath
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/shortest_path.gemspec

@@ -22,6 +22,6 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
   s.add_development_dependency "rspec"
 
-  s.add_dependency "pqueue"
+  s.add_dependency "priority_queue_cxx"
 
 end

data/spec/shortest_path/finder_spec.rb

@@ -2,8 +2,8 @@ require 'spec_helper'
 
 class TestContextualFinder < ShortestPath::Finder
     def refresh_context( node, context)
-        count = context[:edges_count] ? context[:edges_count] : 0
-        return { :edges_count => (count + 1)}
+      count = context[:edges_count] ? context[:edges_count] : 0
+      return { :edges_count => (count + 1)}
     end
 
     def follow_way?(node, destination, weight, context={})
@@ -14,23 +14,56 @@ end
 
 describe ShortestPath::Finder do
   let(:graph) {
-    {   :a => { :e => 3, :b => 1, :c => 3},
-                :b => {:e => 1, :a => 1, :c => 3, :d => 5},
-                :c => {:a => 3, :b => 3, :d => 1, :s => 3},
-                :d => {:b => 5, :c => 1, :s => 1},
-                :e => {:a => 3, :b => 1},
-                :s => {:c => 3, :d => 1} }
+    {   :a => { :e => 3, :b => 1, :c => 3 },
+        :b => { :e => 1, :a => 1, :c => 3, :d => 5 },
+        :c => { :a => 3, :b => 3, :d => 1, :s => 3 },
+        :d => { :b => 5, :c => 1, :s => 1 },
+        :e => { :a => 3, :b => 1 },
+        :s => { :c => 3, :d => 1 } }
   }
 
+  def graph_sample( size)
+      hash = {}
+      0.upto( size ) do |i|
+        0.upto( size ) do |j|
+            hash[ "#{i}-#{j}" ] = {} if hash[ "#{i}-#{j}" ].nil?
+            node_neighbors = hash[ "#{i}-#{j}" ]
+            if i<size
+                node_neighbors[ "#{i+1}-#{j}" ] = 1
+
+                # reverse link
+                hash[ "#{i+1}-#{j}" ] = {} if hash[ "#{i+1}-#{j}" ].nil?
+                hash[ "#{i+1}-#{j}" ][ "#{i}-#{j}" ] = 1
+            end
+            if j<size
+                node_neighbors[ "#{i}-#{j+1}" ] = 1
+
+                # reverse link
+                hash[ "#{i}-#{j+1}" ] = {} if hash[ "#{i}-#{j+1}" ].nil?
+                hash[ "#{i}-#{j+1}" ][ "#{i}-#{j}" ] = 1
+            end
+        end
+      end
+      hash
+  end
+
   def contextual_shortest_path(source, destination, given_graph = graph)
     TestContextualFinder.new(source, destination).tap do |shortest_path|
       shortest_path.ways_finder = Proc.new { |node| given_graph[node] }
     end.path
   end
 
+  it "should produce test graph" do
+      my_graph = graph_sample(600)
+      start = Time.now
+      result = expect(shortest_path( "150-150", "300-300", my_graph))
+      puts "cost= #{Time.now-start}"
+      puts result.inspect
+  end
+
   context "when using an edge_count filter in context " do
       it "should find shortest path in an exemple" do
-        contextual_shortest_path(:e, :s).should == [:e, :b, :c, :s]
+        contextual_shortest_path(:e, :s).should == [:e, :b, :c, :d, :s]
       end
   end
 

data/spec/spec_helper.rb

@@ -5,8 +5,11 @@ require 'rspec'
 
 require 'shortest_path' # and any other gems you need
 
+require 'coveralls'
+Coveralls.wear!
+
 Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
 
 RSpec.configure do |config|
-  # some (optional) config here
+  
 end

metadata

@@ -1,120 +1,123 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shortest_path
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Alban Peignier
 - Marc Florisson
 - Luc Donnet
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2013-08-12 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-  prerelease: false
+date: 2014-05-14 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: guard
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: guard-bundler
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  type: :development
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  type: :runtime
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  name: pqueue
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: priority_queue_cxx
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A* ruby implementation to find shortest path and map
-email: 
+email:
 - alban@tryphon.eu
 - mflorisson@cityway.fr
 - luc.donnet@free.fr
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .rvmrc
 - .travis.yml
@@ -133,36 +136,32 @@ files:
 - spec/spec_helper.rb
 homepage: http://github.com/dryade/shortest_path
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: 1341351258851856295
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: 1341351258851856295
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Ruby library to find shortest path(s) in a graph
 test_files: []
-