ruby-graphviz 1.0.2 → 1.0.3

data/examples/sample66.rb

@@ -0,0 +1,4 @@
+$:.unshift("../lib")
+
+require 'graphviz'
+GraphViz.generate(30, 44, true, (1..8)).output(:png => "#{$0}.png")

data/examples/sample67.rb

@@ -0,0 +1,10 @@
+$:.unshift("../lib")
+
+require 'graphviz'
+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")
+graph.output(:png => "#{$0}.png")

data/examples/sample68.rb

@@ -0,0 +1,27 @@
+$:.unshift("../lib")
+
+require 'graphviz'
+require 'graphviz/theory'
+g = GraphViz.graph(:G)
+g.add_nodes(["A", "B", "C", "D", "E", "F", "G"])
+g.add_edges("A", ["B", "C", "E"])
+g.add_edges("B", ["D", "F"])
+g.add_edges("C", "G")
+g.add_edges("F", "E")
+g.output(:png => "#{$0}000.png")
+
+t = GraphViz::Theory.new(g)
+i = 1
+t.dfs("A") { |node|
+   name = sprintf("%s%03d.png", $0, i)
+   node[:color => :lightblue, :style => :filled]
+   g.output(:png => name)
+   i = i + 1
+}
+
+t.bfs("A") { |node|
+   name = sprintf("%s%03d.png", $0, i)
+   node[:color => :red, :style => :filled]
+   g.output(:png => name)
+   i = i + 1
+}

data/lib/ext/gvpr/dot2ruby.g

@@ -107,7 +107,7 @@ N {
     subgraph = nxtsubg( subgraph );
   }
   
-  printf( "  node_%s = graph_%s.add_node( \"%s\"", rubyfy($.name), rubyfy(ofgraph.name), $.name );
+  printf( "  node_%s = graph_%s.add_nodes( \"%s\"", rubyfy($.name), rubyfy(ofgraph.name), $.name );
 
   // Attributs of N
   attr = fstAttr($G, "N");
@@ -136,7 +136,7 @@ E {
     subgraph = nxtsubg( subgraph );
   }
 
-  printf( "  graph_%s.add_edge( \"%s\", \"%s\"", rubyfy(ofgraph.name), $.tail.name, $.head.name );
+  printf( "  graph_%s.add_edges( \"%s\", \"%s\"", rubyfy(ofgraph.name), $.tail.name, $.head.name );
   
   // Attributs of E
   attr = fstAttr($G, "E");

data/lib/graphviz.rb

@@ -93,6 +93,9 @@ class GraphViz
   # Return the GraphViz::Node object created
   #
   def add_node( xNodeName, hOpts = {} )
+     warn "GraphViz#add_node is deprecated, please use GraphViz#add_nodes"
+     return add_nodes(xNodeName, hOpts)
+=begin
     node = @hoNodes[xNodeName]
 
     if node.nil?
@@ -117,6 +120,38 @@ class GraphViz
     end
 
     return node
+=end
+  end
+
+  def add_nodes(node_name, options = {})
+     if node_name.kind_of? Array
+        node_name.each { |n| add_nodes(n, options.clone) }
+     else
+        node = @hoNodes[node_name]
+
+        if node.nil?
+           @hoNodes[node_name] = GraphViz::Node::new( node_name, self )
+           @hoNodes[node_name].index = @elements_order.size_of( "node" )
+
+           unless options.keys.include?(:label) or options.keys.include?("label")
+              options[:label] = node_name
+           end
+
+           @elements_order.push( { 
+              "type" => "node", 
+              "name" => node_name,
+              "value" => @hoNodes[node_name] 
+           } )
+
+           node = @hoNodes[node_name]
+        end
+
+        options.each do |xKey, xValue|
+           @hoNodes[node_name][xKey.to_s] = xValue
+        end
+
+        return node
+     end
   end
 
   # Return the node object for the given name (or nil) in the current graph
@@ -166,47 +201,49 @@ class GraphViz
     end
   end
   
-  #
   # Get the number of nodes
-  #
   def node_count
     @hoNodes.size
   end
   
-  ##
+  #<b>DEPRECATED</b>
+  def add_edge( oNodeOne, oNodeTwo, hOpts = {} )
+     warn "GraphViz#add_edge is deprecated, please use GraphViz#add_edges"
+     add_edges(oNodeOne, oNodeTwo, hOpts)
+  end
+
   # Create a new edge
   # 
   # In:
-  # * oNodeOne : First node (or node list)
-  # * oNodeTwo : Second Node (or node list)
-  # * hOpts : Edge attributs
-  #
-  def add_edge( oNodeOne, oNodeTwo, hOpts = {} )
+  # * node_one : First node (or node list)
+  # * node_two : Second Node (or node list)
+  # * options : Edge attributs
+  def add_edges( node_one, node_two, options = {} )
     
-    if( oNodeOne.class == Array ) 
-      oNodeOne.each do |no|
-        add_edge( no, oNodeTwo, hOpts )
+    if( node_one.class == Array ) 
+      node_one.each do |no|
+        add_edges( no, node_two, options )
       end
     else
-      if( oNodeTwo.class == Array )
-        oNodeTwo.each do |nt|
-          add_edge( oNodeOne, nt, hOpts )
+      if( node_two.class == Array )
+        node_two.each do |nt|
+          add_edges( node_one, nt, options )
         end
       else
-        oEdge = GraphViz::Edge::new( oNodeOne, oNodeTwo, self )
-        oEdge.index = @elements_order.size_of( "edge" )
+        edge = GraphViz::Edge::new( node_one, node_two, self )
+        edge.index = @elements_order.size_of( "edge" )
         
-        hOpts.each do |xKey, xValue|
-          oEdge[xKey.to_s] = xValue
+        options.each do |xKey, xValue|
+          edge[xKey.to_s] = xValue
         end
         
         @elements_order.push( { 
           "type" => "edge", 
-          "value" => oEdge
+          "value" => edge
         } )
-        @loEdges.push( oEdge )
+        @loEdges.push( edge )
         
-        return( oEdge )
+        return( edge )
       end
     end
   end
@@ -349,7 +386,7 @@ class GraphViz
       end
       return( @hoGraphs[xName] ) if @hoGraphs.keys.include?( xName )
             
-      rCod = add_node( xName, args[0]||{} )
+      rCod = add_nodes( xName, args[0]||{} )
     end
 
     return rCod
@@ -678,7 +715,7 @@ class GraphViz
         self << no
       end
     else
-      return GraphViz::commonGraph( oNode, self ).add_edge( self, oNode )
+      return GraphViz::commonGraph( oNode, self ).add_edges( self, oNode )
     end
   end
   alias :> :<<
@@ -888,11 +925,11 @@ class GraphViz
   def add_hash_edge(node, hash)
     if hash.kind_of? Hash
       hash.each do |nt, data|
-        add_edge(node, nt)
+        add_edges(node, nt)
         add_hash_edge(nt, data)
       end
     else
-      add_edge(node, hash)
+      add_edges(node, hash)
     end
   end
   
@@ -914,15 +951,42 @@ class GraphViz
     new( xGraphName, hOpts.symbolize_keys.merge( {:type => "digraph"} ), &block )
   end
   
-  #
   # Create a new strict directed graph
   #
   # See also GraphViz::new
-  #
   def self.strict_digraph( xGraphName, hOpts = {}, &block )
     new( xGraphName, hOpts.symbolize_keys.merge( {:type => "digraph", :strict => true} ), &block )
   end
   
+  # Create a random graph.
+  def self.generate(num_nodes, num_edges, directed = false, weight_range = (1..1))
+     g = nil
+     if directed
+        g = GraphViz.digraph(:G)
+     else
+        g = GraphViz.graph(:G)
+     end
+
+     nodes = (1..num_nodes).map{ |e| e.to_s }
+     x = g.add_nodes(nodes)
+
+     edges = []
+     nodes.each do |head|
+        nodes.each do |tail|
+           if (directed and head != tail) or (head < tail)
+              edges << {:head => head, :tail => tail, :weight => weight_range.to_a.shuffle[0]}
+           end
+        end
+     end
+     edges.shuffle!
+
+     (num_edges - 1).times do |i|
+        g.add_edges(edges[i][:head], edges[i][:tail], :label => edges[i][:weight].to_s, :weight => edges[i][:weight])
+     end
+
+     return g
+  end
+
   #
   # Escape a string to be acceptable as a node name in a graphviz input file
   #

data/lib/graphviz/constants.rb

@@ -40,7 +40,7 @@
 #   C => cluster
 #
 module Constants
-  RGV_VERSION = "1.0.2"
+  RGV_VERSION = "1.0.3"
   
   ## Const: Output formats
   FORMATS = [

data/lib/graphviz/core_ext.rb

@@ -23,15 +23,6 @@ class Object
    end
 end
 
-class Array
-   def all?(&b)
-      r = self.delete_if { |x|
-         yield x
-      }
-      r.size == 0
-   end
-end
-
 # From : http://www.geekmade.co.uk/2008/09/ruby-tip-normalizing-hash-keys-as-symbols/
 class Hash
    def symbolize_keys

data/lib/graphviz/dsl.rb

@@ -17,14 +17,14 @@ class GraphViz::DSL
       elsif(block)
          @graph.add_graph(GraphViz::DSL.new(sym, { :parent => @graph, :type => @graph.type }, &block).graph)
       else
-         @graph.add_node(sym.to_s, *args)
+         @graph.add_nodes(sym.to_s, *args)
       end
    end
 
    # Add a new node
    def n(name)
       return @graph.get_node(name) unless @graph.get_node(name.to_s).nil?
-      @graph.add_node(name)
+      @graph.add_nodes(name)
    end
 
    # Create edges
@@ -32,7 +32,7 @@ class GraphViz::DSL
       e = nil
       last = args.shift
       while current = args.shift
-         e = @graph.add_edge(last, current)
+         e = @graph.add_edges(last, current)
          last = current
       end
       return e

data/lib/graphviz/edge.rb

@@ -36,11 +36,11 @@ class GraphViz
          @index = nil
 
          unless @parent_graph.directed? 
-            (@parent_graph.find_node(@node_one_id) || @parent_graph.add_node(@node_one_id)).incidents << (@parent_graph.find_node(@node_two_id) || @parent_graph.add_node(@node_two_id))
-            (@parent_graph.find_node(@node_two_id) || @parent_graph.add_node(@node_two_id)).neighbors << (@parent_graph.find_node(@node_one_id) || @parent_graph.add_node(@node_one_id))
+            (@parent_graph.find_node(@node_one_id) || @parent_graph.add_nodes(@node_one_id)).incidents << (@parent_graph.find_node(@node_two_id) || @parent_graph.add_nodes(@node_two_id))
+            (@parent_graph.find_node(@node_two_id) || @parent_graph.add_nodes(@node_two_id)).neighbors << (@parent_graph.find_node(@node_one_id) || @parent_graph.add_nodes(@node_one_id))
          end
-         (@parent_graph.find_node(@node_one_id) || @parent_graph.add_node(@node_one_id)).neighbors << (@parent_graph.find_node(@node_two_id) || @parent_graph.add_node(@node_two_id))
-         (@parent_graph.find_node(@node_two_id) || @parent_graph.add_node(@node_two_id)).incidents << (@parent_graph.find_node(@node_one_id) || @parent_graph.add_node(@node_one_id))
+         (@parent_graph.find_node(@node_one_id) || @parent_graph.add_nodes(@node_one_id)).neighbors << (@parent_graph.find_node(@node_two_id) || @parent_graph.add_nodes(@node_two_id))
+         (@parent_graph.find_node(@node_two_id) || @parent_graph.add_nodes(@node_two_id)).incidents << (@parent_graph.find_node(@node_one_id) || @parent_graph.add_nodes(@node_one_id))
       end
 
       # Return the node one as string (so with port if any)
@@ -113,7 +113,7 @@ class GraphViz
       def <<( node ) #:nodoc:
          n = @parent_graph.get_node(@node_two_id)
 
-         GraphViz::commonGraph( node, n ).add_edge( n, node )
+         GraphViz::commonGraph( node, n ).add_edges( n, node )
       end
       alias :> :<< #:nodoc:
       alias :- :<< #:nodoc:
@@ -133,7 +133,7 @@ class GraphViz
       # Set edge attributs
       #
       # Example :
-      #   e = graph.add_edge( ... )
+      #   e = graph.add_edges( ... )
       #   ...
       #   e.set { |_e|
       #     _e.color = "blue"

data/lib/graphviz/family_tree/couple.rb

@@ -19,7 +19,7 @@ class GraphViz
         return
         
         if z.size == 1
-          @graph.add_edge( @node, z[0].node, "dir" => "none" )
+          @graph.add_edges( @node, z[0].node, "dir" => "none" )
         else
           cluster = @graph.add_graph( "#{@node.id}Kids" )
           cluster["rank"] = "same"
@@ -32,23 +32,23 @@ class GraphViz
           z.each do |person|
             count = count + 1
             if count == add
-              middle = cluster.add_node( "#{@node.id}Kids", "shape" => "point" )
-              @graph.add_edge( @node, middle, "dir" => "none" )
+              middle = cluster.add_nodes( "#{@node.id}Kids", "shape" => "point" )
+              @graph.add_edges( @node, middle, "dir" => "none" )
               unless last.nil?
-                cluster.add_edge( last, middle, "dir" => "none" )
+                cluster.add_edges( last, middle, "dir" => "none" )
               end              
               last = middle
             end
             
-            kid = cluster.add_node( "#{person.node.id}Kid", "shape" => "point" )
-            @graph.add_edge( kid, person.node, "dir" => "none" )
+            kid = cluster.add_nodes( "#{person.node.id}Kid", "shape" => "point" )
+            @graph.add_edges( kid, person.node, "dir" => "none" )
             
             if add == 0 and count == link
-              @graph.add_edge( @node, kid, "dir" => "none" )
+              @graph.add_edges( @node, kid, "dir" => "none" )
             end
             
             unless last.nil?
-              cluster.add_edge( last, kid, "dir" => "none" )
+              cluster.add_edges( last, kid, "dir" => "none" )
             end
             last = kid
           end

data/lib/graphviz/family_tree/person.rb

@@ -6,7 +6,7 @@ class GraphViz
     class Person
       def initialize( graph, tree, generation, id ) #:nodoc:
         @graph = graph
-        @node = @graph.add_node( id )
+        @node = @graph.add_nodes( id )
         @node["shape"] = "box"
         @tree = tree
         @generation = generation
@@ -71,10 +71,10 @@ class GraphViz
       #
       #  mu.is_maried_with greg
       def is_maried_with( x )
-        node = @graph.add_node( "#{@node.id}And#{x.node.id}" )
+        node = @graph.add_nodes( "#{@node.id}And#{x.node.id}" )
         node["shape"] = "point"
-        @graph.add_edge( @node, node, "dir" => "none" )
-        @graph.add_edge( node, x.node, "dir" => "none" )
+        @graph.add_edges( @node, node, "dir" => "none" )
+        @graph.add_edges( node, x.node, "dir" => "none" )
         @tree.add_couple( self, x, node )
       end
       
@@ -82,11 +82,11 @@ class GraphViz
       #
       #  sophie.is_divorced_with john
       def is_divorced_with( x )
-        node = @graph.add_node( "#{@node.id}And#{x.node.id}" )
+        node = @graph.add_nodes( "#{@node.id}And#{x.node.id}" )
         node["shape"] = "point"
         node["color"] = "red"
-        @graph.add_edge( @node, node, "dir" => "none", "color" => "red" )
-        @graph.add_edge( node, x.node, "dir" => "none", "color" => "red" )
+        @graph.add_edges( @node, node, "dir" => "none", "color" => "red" )
+        @graph.add_edges( node, x.node, "dir" => "none", "color" => "red" )
         @tree.add_couple( self, x, node )
       end
       
@@ -94,11 +94,11 @@ class GraphViz
       #
       #  simon.is_widower_of elisa
       def is_widower_of( x ) #veuf
-        node = @graph.add_node( "#{@node.id}And#{x.node.id}" )
+        node = @graph.add_nodes( "#{@node.id}And#{x.node.id}" )
         node["shape"] = "point"
         node["color"] = "green"
-        @graph.add_edge( @node, node, "dir" => "none", "color" => "green" )
-        @graph.add_edge( node, x.node, "dir" => "none", "color" => "green" )
+        @graph.add_edges( @node, node, "dir" => "none", "color" => "green" )
+        @graph.add_edges( node, x.node, "dir" => "none", "color" => "green" )
         @tree.add_couple( self, x, node )
       end
 

data/lib/graphviz/graphml.rb

@@ -152,7 +152,7 @@ class GraphViz
       end
       
       unless @current_node.nil?
-        node = @current_graph.add_node( node.attributes['id'] )
+        node = @current_graph.add_nodes( node.attributes['id'] )
         @current_node.each do |k, v|
           node[k] = v
         end
@@ -182,7 +182,7 @@ class GraphViz
       target = node.attributes['target']
       target = {target => node.attributes['targetport']} if node.attributes['targetport']
       
-      @current_edge = @current_graph.add_edge( source, target )
+      @current_edge = @current_graph.add_edges( source, target )
   
       node.each_element( ) do |child|
         #begin
@@ -214,7 +214,7 @@ class GraphViz
       
       list.each { |s|
         list.each { |t|
-          @current_graph.add_edge( s, t ) unless s == t
+          @current_graph.add_edges( s, t ) unless s == t
         }
       } 
     end