ruby-graphviz 1.0.2 → 1.0.3

data/lib/graphviz/node.rb

@@ -96,7 +96,7 @@ class GraphViz
                self << no
             end
          else
-            return GraphViz::commonGraph( node, self ).add_edge( self, node )
+            return GraphViz::commonGraph( node, self ).add_edges( self, node )
          end
       end
       alias :> :<<
@@ -106,7 +106,7 @@ class GraphViz
       # Set node attributs
       #
       # Example :
-      #   n = graph.add_node( ... )
+      #   n = graph.add_nodes( ... )
       #   ...
       #   n.set { |_n|
       #     _n.color = "blue"

data/lib/graphviz/theory.rb

@@ -116,10 +116,10 @@ class GraphViz
          ch = []
          k = arv
          while k.index != dep.index
-            ch.unshift(k.id)
+            ch.unshift(k)
             k = pred[k.index]
          end
-         ch.unshift(dep.id)
+         ch.unshift(dep)
 
          if d[arv.index].to_f.infinite?
             return nil
@@ -205,7 +205,42 @@ class GraphViz
          end
       end
 
+      # Breadth First Search
+      def bfs(node, &b)
+         queue = []
+         visited_nodes = []
+         node = @graph.get_node(node) if node.kind_of? String
+         queue << node
+         visited_nodes << node
+
+         while not queue.empty?
+            node = queue.shift
+            b.call(node)
+            neighbors(node).each do |n|
+               unless visited_nodes.include?(n)
+                  visited_nodes << n
+                  queue << n
+               end
+            end
+         end
+      end
+
+      # Depth First Search
+      def dfs(node, &b)
+         visited_nodes = []
+         recursive_dfs(node, visited_nodes, &b)
+      end
+
       private 
+      def recursive_dfs(node, visited_nodes, &b)
+         node = @graph.get_node(node) if node.kind_of? String 
+         b.call(node)
+         visited_nodes << node
+         neighbors(node).each do |n|
+            recursive_dfs(n, visited_nodes, &b) unless visited_nodes.include?(n)
+         end
+      end
+
       def distance_matrix
          type = @graph.type
          matrix = GraphViz::Math::Matrix.new( @graph.node_count, @graph.node_count, (1.0/0.0) )

data/lib/graphviz/xml.rb

@@ -81,7 +81,7 @@ class GraphViz
 		
 		    label << "}"
 	    end
-      @graph.add_node( local_node_name, "label" => label, "color" => "blue", "shape" => "record" )
+      @graph.add_nodes( local_node_name, "label" => label, "color" => "blue", "shape" => "record" )
 
       ## Act: Search and add Text nodes
       if xml_node.has_text? == true and @show_text == true
@@ -99,8 +99,8 @@ class GraphViz
         end
 
         if xText.length > 0
-          @graph.add_node( text_node_name, "label" => xText, "color" => "black", "shape" => "ellipse" )
-          @graph.add_edge( local_node_name, text_node_name )
+          @graph.add_nodes( text_node_name, "label" => xText, "color" => "black", "shape" => "ellipse" )
+          @graph.add_edges( local_node_name, text_node_name )
         end
       end
 
@@ -109,7 +109,7 @@ class GraphViz
 
       xml_node.each_element( ) do |xml_child_node|
         child_node_name = parse_xml_node( xml_child_node )
-        @graph.add_edge( local_node_name, child_node_name )
+        @graph.add_edges( local_node_name, child_node_name )
       end
 
       return( local_node_name )

data/ruby-graphviz.gemspec

@@ -34,19 +34,8 @@ For more information about Ruby-Graphviz :
 * Sources : http://github.com/glejeune/Ruby-Graphviz
 * NEW - Mailing List : http://groups.google.com/group/ruby-graphviz
 
-/!\\ Version 0.9.12 introduce a new solution to connect edges to node ports
-For more information, see http://github.com/glejeune/Ruby-Graphviz/issues/#issue/13
-So if you use node ports, maybe you need to change your code.
-
-/!\\ GraphViz::Node#name has been removed!
-
-/!\\ :output and :file options have been removed!
-
-/!\\ The html attribut has been removed!
-You can use the label attribut, as dot do it : :label => '<<html/>>'
-
-/!\\ Version 0.9.17 introduce GraphML (http://graphml.graphdrawing.org/) support and
-graph theory !
+/!\\ GraphViz#add_edge is deprecated, use GraphViz#add_edges
+/!\\ GraphViz#add_node is deprecated, use GraphViz#add_nodes
   }
   
   # s.add_runtime_dependency("middleman", "~>2.0.0.3")

data/test/test_graph.rb

@@ -23,7 +23,7 @@ class GraphVizTest < Test::Unit::TestCase
     n, m = nil, nil
     
     assert_block 'Create node failed.' do
-      n = @graph.add_node( "n1" )
+      n = @graph.add_nodes( "n1" )
     end
 
     assert_block 'Get node failed.' do    
@@ -52,32 +52,32 @@ class GraphVizTest < Test::Unit::TestCase
      c0["label"] = "process #1"
      c0["style"] = "filled"
      c0["color"] = "lightgrey"
-     a0 = c0.add_node( "a0", "style" => "filled", "color" => "white" )
-     a1 = c0.add_node( "a1", "style" => "filled", "color" => "white" )
-     a2 = c0.add_node( "a2", "style" => "filled", "color" => "white" )
-     a3 = c0.add_node( "a3", "style" => "filled", "color" => "white" )
-     c0.add_edge( a0, a1 )
-     c0.add_edge( a1, a2 )
-     c0.add_edge( a2, a3 )
+     a0 = c0.add_nodes( "a0", "style" => "filled", "color" => "white" )
+     a1 = c0.add_nodes( "a1", "style" => "filled", "color" => "white" )
+     a2 = c0.add_nodes( "a2", "style" => "filled", "color" => "white" )
+     a3 = c0.add_nodes( "a3", "style" => "filled", "color" => "white" )
+     c0.add_edges( a0, a1 )
+     c0.add_edges( a1, a2 )
+     c0.add_edges( a2, a3 )
 
      c1 = g.add_graph( "cluster1", "label" => "process #2" )
-     b0 = c1.add_node( "b0", "style" => "filled", "color" => "blue" )
-     b1 = c1.add_node( "b1", "style" => "filled", "color" => "blue" )
-     b2 = c1.add_node( "b2", "style" => "filled", "color" => "blue" )
-     b3 = c1.add_node( "b3", "style" => "filled", "color" => "blue" )
-     c1.add_edge( b0, b1 )
-     c1.add_edge( b1, b2 )
-     c1.add_edge( b2, b3 )
-
-     start = g.add_node( "start", "shape" => "Mdiamond" )
-     endn  = g.add_node( "end",   "shape" => "Msquare" )
-
-     g.add_edge( start, a0 )
-     g.add_edge( start, b0 )
-     g.add_edge( a1, b3 )
-     g.add_edge( b2, a3 )
-     g.add_edge( a3, a0 )
-     g.add_edge( a3, endn )
+     b0 = c1.add_nodes( "b0", "style" => "filled", "color" => "blue" )
+     b1 = c1.add_nodes( "b1", "style" => "filled", "color" => "blue" )
+     b2 = c1.add_nodes( "b2", "style" => "filled", "color" => "blue" )
+     b3 = c1.add_nodes( "b3", "style" => "filled", "color" => "blue" )
+     c1.add_edges( b0, b1 )
+     c1.add_edges( b1, b2 )
+     c1.add_edges( b2, b3 )
+
+     start = g.add_nodes( "start", "shape" => "Mdiamond" )
+     endn  = g.add_nodes( "end",   "shape" => "Msquare" )
+
+     g.add_edges( start, a0 )
+     g.add_edges( start, b0 )
+     g.add_edges( a1, b3 )
+     g.add_edges( b2, a3 )
+     g.add_edges( a3, a0 )
+     g.add_edges( a3, endn )
 
      assert g
 

data/test/test_search.rb

@@ -0,0 +1,32 @@
+require 'test/unit'
+$:.unshift(File.expand_path('../../lib',__FILE__))
+require 'graphviz'
+require 'graphviz/theory'
+
+class GraphVizSearch < Test::Unit::TestCase
+   def setup
+      @graph = GraphViz.graph(:G)
+      @graph.add_nodes(["A", "B", "C", "D", "E", "F", "G"])
+      @graph.add_edges("A", ["B", "C", "E"])
+      @graph.add_edges("B", ["D", "F"])
+      @graph.add_edges("C", "G")
+      @graph.add_edges("F", "E")
+      @theory = GraphViz::Theory.new(@graph)
+   end
+
+   def test_dfs
+      order = []
+      @theory.dfs("A") { |node|
+         order << node.id
+      }
+      assert_equal order, ["A", "B", "D", "F", "E", "C", "G"]
+   end
+
+   def test_bfs
+      order = []
+      @theory.bfs("A") { |node|
+         order << node.id
+      }
+      assert_equal order, ["A", "B", "C", "E", "D", "F", "G"]
+   end
+end

data/test/test_theory.rb

@@ -85,7 +85,7 @@ class GraphVizTheoryTest < Test::Unit::TestCase
    def test_dijkstra_a_f
       r = @t.moore_dijkstra(@g.a, @g.f)
       assert r
-      assert_equal ["a", "b", "c", "f"], r[:path]
+      assert_equal ["a", "b", "c", "f"], r[:path].map{|n| n.id}
       assert_equal 4.0, r[:distance]
    end
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ruby-graphviz
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 17
   prerelease: 
   segments: 
   - 1
   - 0
-  - 2
-  version: 1.0.2
+  - 3
+  version: 1.0.3
 platform: ruby
 authors: 
 - Gregoire Lejeune
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-11 00:00:00 Z
+date: 2011-12-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rake
@@ -181,6 +181,9 @@ files:
 - examples/sample63.rb
 - examples/sample64.rb
 - examples/sample65.rb
+- examples/sample66.rb
+- examples/sample67.rb
+- examples/sample68.rb
 - examples/sample99.rb
 - examples/sdlshapes/README
 - examples/sdlshapes/sdl.ps
@@ -228,6 +231,7 @@ files:
 - test/support.rb
 - test/test_examples.rb
 - test/test_graph.rb
+- test/test_search.rb
 - test/test_theory.rb
 - test/test_types.rb
 - test/test_utils_colors.rb
@@ -242,15 +246,8 @@ post_install_message: "\n\
   * Doc : http://rdoc.info/projects/glejeune/Ruby-Graphviz\n\
   * Sources : http://github.com/glejeune/Ruby-Graphviz\n\
   * NEW - Mailing List : http://groups.google.com/group/ruby-graphviz\n\n\
-  /!\\ Version 0.9.12 introduce a new solution to connect edges to node ports\n\
-  For more information, see http://github.com/glejeune/Ruby-Graphviz/issues/#issue/13\n\
-  So if you use node ports, maybe you need to change your code.\n\n\
-  /!\\ GraphViz::Node#name has been removed!\n\n\
-  /!\\ :output and :file options have been removed!\n\n\
-  /!\\ The html attribut has been removed!\n\
-  You can use the label attribut, as dot do it : :label => '<<html/>>'\n\n\
-  /!\\ Version 0.9.17 introduce GraphML (http://graphml.graphdrawing.org/) support and\n\
-  graph theory !\n  "
+  /!\\ GraphViz#add_edge is deprecated, use GraphViz#add_edges\n\
+  /!\\ GraphViz#add_node is deprecated, use GraphViz#add_nodes\n  "
 rdoc_options: 
 - --title
 - Ruby/GraphViz
@@ -287,6 +284,7 @@ test_files:
 - test/support.rb
 - test/test_examples.rb
 - test/test_graph.rb
+- test/test_search.rb
 - test/test_theory.rb
 - test/test_types.rb
 - test/test_utils_colors.rb