ruby-graphviz 1.0.2 → 1.0.3

data/README.rdoc

@@ -16,6 +16,15 @@ Interface to the GraphViz graphing tool
 
 == CHANGELOG
 
+=== 1.0.3 :
+* The GraphViz::Theory#moore_dijkstra return a path which contains GraphViz::Node instead of GraphViz::Node#id
+* Add Breadth First Search algorithm (GraphViz::Theory#bfs)
+* Add Depth First Search algorithm (GraphViz::Theory#dfs)
+* Add GraphViz#add_edges (GraphViz#add_edge is deprecated)
+* Add GraphViz#add_nodes (GraphViz#add_node is deprecated)
+* Add GraphViz::generate 
+* Remove definition of Array#all?
+
 === 1.0.2 :
 * Add PageRank algorithm
 * Major bug corrections

data/examples/sample01.rb

@@ -10,23 +10,23 @@ else
   g = GraphViz::new( "G" )
 end
 
-main        = g.add_node( "main" )
-parse       = g.add_node( "parse" )
-execute     = g.add_node( "execute" )
-init        = g.add_node( "init" )
-cleanup     = g.add_node( "cleanup" )
-make_string = g.add_node( "make_string" )
-printf      = g.add_node( "printf" )
-compare     = g.add_node( "compare" )
+main        = g.add_nodes( "main" )
+parse       = g.add_nodes( "parse" )
+execute     = g.add_nodes( "execute" )
+init        = g.add_nodes( "init" )
+cleanup     = g.add_nodes( "cleanup" )
+make_string = g.add_nodes( "make_string" )
+printf      = g.add_nodes( "printf" )
+compare     = g.add_nodes( "compare" )
 
-g.add_edge( main, parse )
-g.add_edge( parse, execute )
-g.add_edge( main, init )
-g.add_edge( main, cleanup )
-g.add_edge( execute, make_string )
-g.add_edge( execute, printf )
-g.add_edge( init, make_string )
-g.add_edge( main, printf )
-g.add_edge( execute, compare )
+g.add_edges( main, parse )
+g.add_edges( parse, execute )
+g.add_edges( main, init )
+g.add_edges( main, cleanup )
+g.add_edges( execute, make_string )
+g.add_edges( execute, printf )
+g.add_edges( init, make_string )
+g.add_edges( main, printf )
+g.add_edges( execute, compare )
 
 g.output( :png => "#{$0}.png" )

data/examples/sample02.rb

@@ -20,23 +20,23 @@ g.edge[:label] = ""
 
 g[:size] = "4,4"
 
-main        = g.add_node( "main", :shape => "box" )
-parse       = g.add_node( "parse" )
-execute     = g.add_node( "execute" )
-init        = g.add_node( "init" )
-cleanup     = g.add_node( "cleanup" )
-make_string = g.add_node( "make_string", :label => 'make a\nstring' )
-printf      = g.add_node( "printf" )
-compare     = g.add_node( "compare", :shape => "box", :style => "filled", :color => ".7 .3 1.0" )
-
-g.add_edge( main, parse, :weight => "8" )
-g.add_edge( parse, execute )
-g.add_edge( main, init, :style => "dotted" )
-g.add_edge( main, cleanup )
-g.add_edge( execute, make_string )
-g.add_edge( execute, printf )
-g.add_edge( init, make_string )
-g.add_edge( main, printf, :color => "red", :style => "bold", :label => "100 times" )
-g.add_edge( execute, compare, :color => "red" )
+main        = g.add_nodes( "main", :shape => "box" )
+parse       = g.add_nodes( "parse" )
+execute     = g.add_nodes( "execute" )
+init        = g.add_nodes( "init" )
+cleanup     = g.add_nodes( "cleanup" )
+make_string = g.add_nodes( "make_string", :label => 'make a\nstring' )
+printf      = g.add_nodes( "printf" )
+compare     = g.add_nodes( "compare", :shape => "box", :style => "filled", :color => ".7 .3 1.0" )
+
+g.add_edges( main, parse, :weight => "8" )
+g.add_edges( parse, execute )
+g.add_edges( main, init, :style => "dotted" )
+g.add_edges( main, cleanup )
+g.add_edges( execute, make_string )
+g.add_edges( execute, printf )
+g.add_edges( init, make_string )
+g.add_edges( main, printf, :color => "red", :style => "bold", :label => "100 times" )
+g.add_edges( execute, compare, :color => "red" )
 
 g.output( :png => "#{$0}.png" )

data/examples/sample03.rb

@@ -18,14 +18,14 @@ g.node["style"] = ""
 g.node["skew"] = "0.0"
 g.node["distortion"] = "0.0"
 
-a = g.add_node( "a", "shape" => "polygon", "sides" => "5", "peripheries" => "3", "color" => "lightblue", "style" => "filled"  )
-b = g.add_node( "b" )
-c = g.add_node( "c", "shape" => "polygon", "sides" => "4", "skew" => ".4", "label" => "hello world" )
-d = g.add_node( "d", "shape" => "invtriangle" )
-e = g.add_node( "e", "shape" => "polygon", "sides" => "4", "distortion" => ".7" )
+a = g.add_nodes( "a", "shape" => "polygon", "sides" => "5", "peripheries" => "3", "color" => "lightblue", "style" => "filled"  )
+b = g.add_nodes( "b" )
+c = g.add_nodes( "c", "shape" => "polygon", "sides" => "4", "skew" => ".4", "label" => "hello world" )
+d = g.add_nodes( "d", "shape" => "invtriangle" )
+e = g.add_nodes( "e", "shape" => "polygon", "sides" => "4", "distortion" => ".7" )
 
-g.add_edge( a, b )
-g.add_edge( b, c )
-g.add_edge( b, d )
+g.add_edges( a, b )
+g.add_edges( b, c )
+g.add_edges( b, d )
 
 g.output( :png => "#{$0}.png" )

data/examples/sample04.rb

@@ -12,11 +12,11 @@ end
 
 g.node["shape"] = "record"
 
-struct1 = g.add_node( "struct1", "shape" => "record", "label" => "<f0> left|<f1> mid\ dle|<f2> right" )
-struct2 = g.add_node( "struct2", "shape" => "record", "label" => "<f0> one|<f1> two" )
-struct3 = g.add_node( "struct3", "shape" => "record", "label" => 'hello\nworld |{ b |{c|<here> d|e}| f}| g | h' )
+struct1 = g.add_nodes( "struct1", "shape" => "record", "label" => "<f0> left|<f1> mid\ dle|<f2> right" )
+struct2 = g.add_nodes( "struct2", "shape" => "record", "label" => "<f0> one|<f1> two" )
+struct3 = g.add_nodes( "struct3", "shape" => "record", "label" => 'hello\nworld |{ b |{c|<here> d|e}| f}| g | h' )
 
-g.add_edge( struct1, struct2 )
-g.add_edge( struct1, struct3 )
+g.add_edges( struct1, struct2 )
+g.add_edges( struct1, struct3 )
 
 g.output( :png => "#{$0}.png" )

data/examples/sample05.rb

@@ -10,23 +10,23 @@ else
   g = GraphViz::new( "structs", "type" => "graph" )
 end
 
-main        = g.add_node( "main" )
-parse       = g.add_node( "parse" )
-execute     = g.add_node( "execute" )
-init        = g.add_node( "init" )
-cleanup     = g.add_node( "cleanup" )
-make_string = g.add_node( "make_string" )
-printf      = g.add_node( "printf" )
-compare     = g.add_node( "compare" )
+main        = g.add_nodes( "main" )
+parse       = g.add_nodes( "parse" )
+execute     = g.add_nodes( "execute" )
+init        = g.add_nodes( "init" )
+cleanup     = g.add_nodes( "cleanup" )
+make_string = g.add_nodes( "make_string" )
+printf      = g.add_nodes( "printf" )
+compare     = g.add_nodes( "compare" )
 
-g.add_edge( main, parse )
-g.add_edge( parse, execute )
-g.add_edge( main, init )
-g.add_edge( main, cleanup )
-g.add_edge( execute, make_string )
-g.add_edge( execute, printf )
-g.add_edge( init, make_string )
-g.add_edge( main, printf )
-g.add_edge( execute, compare )
+g.add_edges( main, parse )
+g.add_edges( parse, execute )
+g.add_edges( main, init )
+g.add_edges( main, cleanup )
+g.add_edges( execute, make_string )
+g.add_edges( execute, printf )
+g.add_edges( init, make_string )
+g.add_edges( main, printf )
+g.add_edges( execute, compare )
 
 g.output( :png => "#{$0}.png" )

data/examples/sample07.rb

@@ -13,11 +13,11 @@ g = GraphViz::new( "structs" )
 
 g.node["shape"] = "record"
 
-g.add_node( "struct1", "shape" => "record", "label" => "<f0> left|<f1> middle|<f2> right" )
-g.add_node( "struct2", "shape" => "record", "label" => "<f0> one|<f1> two" )
-g.add_node( "struct3", "shape" => "record", "label" => 'hello\nworld |{ b |{c|<here> d|e}| f}| g | h' )
+g.add_nodes( "struct1", "shape" => "record", "label" => "<f0> left|<f1> middle|<f2> right" )
+g.add_nodes( "struct2", "shape" => "record", "label" => "<f0> one|<f1> two" )
+g.add_nodes( "struct3", "shape" => "record", "label" => 'hello\nworld |{ b |{c|<here> d|e}| f}| g | h' )
 
-g.add_edge( { "struct1" => :f1}, {"struct2" => :f0} )
-g.add_edge( {"struct1" => :f2}, {"struct3" => :here} )
+g.add_edges( { "struct1" => :f1}, {"struct2" => :f0} )
+g.add_edges( {"struct1" => :f2}, {"struct3" => :here} )
 
 g.output( :png => "#{$0}.png", :canon => nil )

data/examples/sample08.rb

@@ -14,21 +14,21 @@ g.node["shape"] = "record"
 g.node["width"] = ".1"
 g.node["height"] = ".1"
 
-g.add_node( "node0", "label" => "<f0> |<f1> |<f2> |<f3> |<f4> |<f5> |<f6> |<f7> | ", "height" => "2.5" )
-g.add_node( "node1", "label" => "{<n> n14 | 719 |<p> }", "width" => "1.5" )
-g.add_node( "node2", "label" => "{<n> a1 | 805 |<p> }", "width" => "1.5" )
-g.add_node( "node3", "label" => "{<n> i9 | 718 |<p> }", "width" => "1.5" )
-g.add_node( "node4", "label" => "{<n> e5 | 989 |<p> }", "width" => "1.5" )
-g.add_node( "node5", "label" => "{<n> t20 | 959 |<p> }", "width" => "1.5" )
-g.add_node( "node6", "label" => "{<n> o15 | 794 |<p> }", "width" => "1.5" )
-g.add_node( "node7", "label" => "{<n> s19 | 659 |<p> }", "width" => "1.5" )
+g.add_nodes( "node0", "label" => "<f0> |<f1> |<f2> |<f3> |<f4> |<f5> |<f6> |<f7> | ", "height" => "2.5" )
+g.add_nodes( "node1", "label" => "{<n> n14 | 719 |<p> }", "width" => "1.5" )
+g.add_nodes( "node2", "label" => "{<n> a1 | 805 |<p> }", "width" => "1.5" )
+g.add_nodes( "node3", "label" => "{<n> i9 | 718 |<p> }", "width" => "1.5" )
+g.add_nodes( "node4", "label" => "{<n> e5 | 989 |<p> }", "width" => "1.5" )
+g.add_nodes( "node5", "label" => "{<n> t20 | 959 |<p> }", "width" => "1.5" )
+g.add_nodes( "node6", "label" => "{<n> o15 | 794 |<p> }", "width" => "1.5" )
+g.add_nodes( "node7", "label" => "{<n> s19 | 659 |<p> }", "width" => "1.5" )
 
-g.add_edge( {"node0" => :f0}, {"node1" => :n} )
-g.add_edge( {"node0" => :f1}, {"node2" => :n} )
-g.add_edge( {"node0" => :f2}, {"node3" => :n} )
-g.add_edge( {"node0" => :f5}, {"node4" => :n} )
-g.add_edge( {"node0" => :f6}, {"node5" => :n} )
-g.add_edge( {"node2" => :p}, {"node6" => :n} )
-g.add_edge( {"node4" => :p}, {"node7" => :n} )
+g.add_edges( {"node0" => :f0}, {"node1" => :n} )
+g.add_edges( {"node0" => :f1}, {"node2" => :n} )
+g.add_edges( {"node0" => :f2}, {"node3" => :n} )
+g.add_edges( {"node0" => :f5}, {"node4" => :n} )
+g.add_edges( {"node0" => :f6}, {"node5" => :n} )
+g.add_edges( {"node2" => :p}, {"node6" => :n} )
+g.add_edges( {"node4" => :p}, {"node7" => :n} )
 
 g.output( :png => "#{$0}.png" )

data/examples/sample09.rb

@@ -19,32 +19,32 @@ c0 = g.add_graph( "cluster0" )
 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 )
-g.add_edge( b3, 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 )
+g.add_edges( b3, endn )
 
 g.output( :png => "#{$0}.png" )

data/examples/sample10.rb

@@ -19,32 +19,32 @@ c0 = g.add_graph( "cluster0" )
 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 )
-g.add_edge( b3, 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 )
+g.add_edges( b3, endn )
 
 g.output( :png => "#{$0}.png" )

data/examples/sample11.rb

@@ -15,28 +15,28 @@ graph.edge["lhead"] = ""
 graph.edge["ltail"] = ""
 
 c0 = graph.add_graph( "cluster0" )
-a = c0.add_node( "a" )
-b = c0.add_node( "b" )
-c = c0.add_node( "c" )
-d = c0.add_node( "d" )
-c0.add_edge( a, b )
-c0.add_edge( a, c )
-c0.add_edge( b, d )
-c0.add_edge( c, d )
+a = c0.add_nodes( "a" )
+b = c0.add_nodes( "b" )
+c = c0.add_nodes( "c" )
+d = c0.add_nodes( "d" )
+c0.add_edges( a, b )
+c0.add_edges( a, c )
+c0.add_edges( b, d )
+c0.add_edges( c, d )
 
 c1 = graph.add_graph( "cluster1" )
-e = c1.add_node( "e" )
-f = c1.add_node( "f" )
-g = c1.add_node( "g" )
-c1.add_edge( e, g )
-c1.add_edge( e, f )
-
-h = graph.add_node( "h" )
-
-graph.add_edge( b, f, "lhead" => "cluster1" )
-graph.add_edge( d, e )
-graph.add_edge( c, g, "ltail" => "cluster0", "lhead" => "cluster1" )
-graph.add_edge( c, e, "ltail" => "cluster0" )
-graph.add_edge( d, h )
+e = c1.add_nodes( "e" )
+f = c1.add_nodes( "f" )
+g = c1.add_nodes( "g" )
+c1.add_edges( e, g )
+c1.add_edges( e, f )
+
+h = graph.add_nodes( "h" )
+
+graph.add_edges( b, f, "lhead" => "cluster1" )
+graph.add_edges( d, e )
+graph.add_edges( c, g, "ltail" => "cluster0", "lhead" => "cluster1" )
+graph.add_edges( c, e, "ltail" => "cluster0" )
+graph.add_edges( d, h )
 
 graph.output( :png => "#{$0}.png" )

data/examples/sample16.rb

@@ -4,5 +4,5 @@ $:.unshift( "../lib" );
 require "graphviz"
 
 GraphViz::new( "G", :type => "graph", :rankdir => "LR" ) { |graph|
-  graph.add_edge( [graph.a, graph.b, graph.c], [ graph.d, graph.e, graph.f ] )
-}.output( :path => '/usr/local/bin/', :png => "#{$0}.png" )
+  graph.add_edges( [graph.a, graph.b, graph.c], [ graph.d, graph.e, graph.f ] )
+}.output( :path => '/usr/local/bin/', :png => "#{$0}.png" )

data/examples/sample17.rb

@@ -13,18 +13,18 @@ GraphViz::new( "G", :type => "graph", :rankdir => "LR", :bgcolor => "#808080" )
   _ = {}
   
   ("1".."8").each do |v|
-    _[v] = graph.add_node( v, :shape => "circle", :style => "invis")
+    _[v] = graph.add_nodes( v, :shape => "circle", :style => "invis")
   end
   ["10","20","30","40","50","60","70","80"].each do |v|
-    _[v] = graph.add_node( v, :shape => "circle", :style => "invis")
+    _[v] = graph.add_nodes( v, :shape => "circle", :style => "invis")
   end
   
   ("a".."x").each do |v|
-    _[v] = graph.add_node( v, :shape => "circle")
+    _[v] = graph.add_nodes( v, :shape => "circle")
   end
 
   ("A".."X").each do |v|
-    _[v] = graph.add_node( v, :shape => "diamond")
+    _[v] = graph.add_nodes( v, :shape => "diamond")
   end
   
   (_["1"] << _["a"])[:color]="#0000ff"
@@ -89,4 +89,4 @@ GraphViz::new( "G", :type => "graph", :rankdir => "LR", :bgcolor => "#808080" )
 	_["V"] << _["60"]
 	_["W"] << _["70"]
 	_["X"] << _["80"]
-}.output( :path => '/usr/local/bin/', :png => "#{$0}.png" )
+}.output( :path => '/usr/local/bin/', :png => "#{$0}.png" )