maneuver 0.0.2pre → 0.0.3pre

data/lib/maneuver/first_search.rb

@@ -27,21 +27,28 @@ module Maneuver
       nil
     end
 
-    def self.path(from, to, edge_algorithm = nil)
+    def self.path(graph, from, to, edge_algorithm = nil)
       return from if from == to
       self.prep_node
       nodes_to_check = []
       visited = [from]
-      from.outgoing_edges.each { |edge| edge.to._fs_parent = from; nodes_to_check << edge.to }
+      from.outgoing_edges.each do |edge|
+        if graph.edges.include? edge 
+          edge.to._fs_parent = from;
+          nodes_to_check << edge.to
+        end
+      end
       while !nodes_to_check.empty?
         node = self.get_node nodes_to_check
         return self.reconstruct_path(to) if node == to
         node.outgoing_edges.each do |e|
-          test = e.to
-          unless visited.include? test
-            test._fs_parent = node
-            visited << test
-            nodes_to_check.unshift test
+          if graph.edges.include? e
+            test = e.to
+            unless visited.include? test
+              test._fs_parent = node
+              visited << test
+              nodes_to_check.unshift test
+            end
           end
         end
       end

data/lib/maneuver/graph.rb

@@ -11,11 +11,11 @@ module Maneuver
     end
 
     def insert_nodes(*nodes)
-      nodes.each { |n| @nodes << n unless @nodes.include? n }
+      nodes.flatten.each { |n| @nodes << n unless @nodes.include? n }
     end
 
     def insert_edges(*edges)
-      edges.each do |e|
+      edges.flatten.each do |e|
         unless has_edge e
           @edges << e
           @nodes << e.to unless @nodes.include? e.to
@@ -34,7 +34,18 @@ module Maneuver
     def path(from, to, search_algorithm, cost_algorithm = nil)
       search = Maneuver.search_algorithms[search_algorithm]
       raise "Unknown Search Algorithm: #{search_algorithm}" unless search
-      search.path(from, to, cost_algorithm)
+      search.path(self, from, to, cost_algorithm)
+    end
+
+    def edge_between(from, to)
+      from.outgoing_edges.select {|e| e.to == to && @edges.include?(e) }.first
+    end
+
+    def clone
+      g = self.class.new
+      g.insert_edges @edges
+      g.insert_nodes @nodes
+      return g
     end
   end
 end

data/lib/maneuver/node.rb

@@ -1,7 +1,8 @@
 module Maneuver
   class Node
-    attr_reader :edges
-    def initialize(*args)
+    attr_reader :edges, :id
+    def initialize(id)
+      @id = id
       @edges = []
     end
 

data/lib/maneuver/search_algorithm.rb

@@ -1,6 +1,6 @@
 module Maneuver
   class SearchAlgorithm
-    def self.path(from, to, cost_algorithm = nil)
+    def self.path(graph, from, to, cost_algorithm = nil)
       nil
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: maneuver
 version: !ruby/object:Gem::Version
-  version: 0.0.2pre
+  version: 0.0.3pre
   prerelease: 5
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2013-04-05 00:00:00.000000000 Z
 dependencies: []
 description: A simple graph library with path planning.
 email: kayle@moremagic.io
@@ -46,8 +46,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Graph and Path Planning
 test_files: []
+has_rdoc: