ruby-graphviz 1.0.7 → 1.0.8

data/lib/graphviz/family_tree/couple.rb

@@ -7,17 +7,17 @@ class GraphViz
         @kids = []
         @persons = persons
       end
-      
+
       def node #:nodoc:
         @node
       end
-      
+
       # Add kids to a couple
       def kids( *z )
         @kids = GraphViz::FamilyTree::Sibling.new( z, @persons )
-        
+
         return
-        
+
         if z.size == 1
           @graph.add_edges( @node, z[0].node, "dir" => "none" )
         else
@@ -27,7 +27,7 @@ class GraphViz
           last = nil
           count = 0
           add = (z.size-1)%2 * z.size/2 + (z.size-1)%2
-          link = (z.size/2)+1 
+          link = (z.size/2)+1
 
           z.each do |person|
             count = count + 1
@@ -36,25 +36,25 @@ class GraphViz
               @graph.add_edges( @node, middle, "dir" => "none" )
               unless last.nil?
                 cluster.add_edges( last, middle, "dir" => "none" )
-              end              
+              end
               last = middle
             end
-            
+
             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_edges( @node, kid, "dir" => "none" )
             end
-            
+
             unless last.nil?
               cluster.add_edges( last, kid, "dir" => "none" )
             end
             last = kid
           end
-        end        
+        end
       end
-      
+
       def getKids
         @kids
       end

data/lib/graphviz/family_tree/generation.rb

@@ -8,28 +8,28 @@ class GraphViz
         @tree = tree
         @gen_number = gen_number
       end
-      
+
       def all_persons #:nodoc:
         @all_persons
       end
-      
+
       def persons
         @persons
       end
-      
+
       def make( &block ) #:nodoc:
         instance_eval(&block) if block
       end
-      
+
       def method_missing(sym, *args, &block) #:nodoc:
         all_persons[sym.to_s] ||= (persons[sym.to_s] ||= GraphViz::FamilyTree::Person.new( @graph, @tree, self, sym.to_s ))
       end
-      
+
       # Generation number
       def number
         @gen_number
       end
-      
+
       # Generation size
       def size
         @persons.size

data/lib/graphviz/family_tree/person.rb

@@ -13,31 +13,31 @@ class GraphViz
         @x, @y = 0, 0
         @sibling = nil
       end
-      
+
       def id
         @node.id
       end
-      
+
       def name
         @node.label || @node.id
       end
-      
+
       def sibling
         @sibling
       end
-      
+
       def sibling=(x)
         @sibling=x
       end
-      
+
       def couples #:nodoc:
         @couples
       end
-      
+
       def node #:nodoc:
         @node
       end
-      
+
       # Define the current person as a man
       #
       #  greg.is_a_man( "Greg" )
@@ -45,14 +45,14 @@ class GraphViz
         @node["label"] = name
         @node["color"] = "blue"
       end
-      
+
       # Define the current person as a boy
       #
       #  greg.is_a_boy( "Greg" )
       def is_a_boy( name )
         is_a_man( name )
       end
-      
+
       # Define the current perdon as a woman
       #
       #  mu.is_a_woman( "Muriel" )
@@ -66,7 +66,7 @@ class GraphViz
       def is_a_girl( name )
         is_a_woman( name )
       end
-      
+
       # Define that's two persons are maried
       #
       #  mu.is_maried_with greg
@@ -77,7 +77,7 @@ class GraphViz
         @graph.add_edges( node, x.node, "dir" => "none" )
         @tree.add_couple( self, x, node )
       end
-      
+
       # Define that's two persons are divorced
       #
       #  sophie.is_divorced_with john
@@ -89,7 +89,7 @@ class GraphViz
         @graph.add_edges( node, x.node, "dir" => "none", "color" => "red" )
         @tree.add_couple( self, x, node )
       end
-      
+
       # Define that's a person is widower of another
       #
       #  simon.is_widower_of elisa
@@ -108,7 +108,7 @@ class GraphViz
       def is_dead
         @node["style"] = "filled"
       end
-      
+
       # Define the kids of a single person
       #
       #   alice.kids( john, jack, julie )

data/lib/graphviz/graphml.rb

@@ -1,16 +1,16 @@
 #!/usr/bin/env ruby
 # Copyright (C) 2010 Gregoire Lejeune <gregoire.lejeune@free.fr>
-# 
+#
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
-# 
+#
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
-# 
+#
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA
@@ -28,10 +28,10 @@ class GraphViz
        warn "`GraphViz::GraphML#attributs` is deprecated, please, use `GraphViz::GraphML#attributes`"
        return @attributes
     end
-    
+
     # The GraphViz object
     attr_accessor :graph
-  
+
     DEST = {
       'node'      => [:nodes],
       'edge'      => [:edges],
@@ -42,15 +42,15 @@ class GraphViz
       'endpoint'  => [:endpoint],
       'all'       => [:nodes, :edges, :graphs, :graphml, :hyperedge, :port, :endpoint]
     }
-    
+
     GTYPE = {
       'directed' => :digraph,
       'undirected' => :graph
     }
-    
+
     # Create a new GraphViz object from a GraphML file of string
     def initialize( file_or_str )
-      data = ((File.file?( file_or_str )) ? File::new(file_or_str) : file_or_str) 
+      data = ((File.file?( file_or_str )) ? File::new(file_or_str) : file_or_str)
       @xmlDoc = REXML::Document::new( data )
       @attributes = {
         :nodes => {},
@@ -67,14 +67,14 @@ class GraphViz
       @current_node = nil
       @current_edge = nil
       @current_graph = nil
-      
+
       parse( @xmlDoc.root )
     end
-    
+
     def parse( node ) #:nodoc:
       send( node.name.to_sym, node )
     end
-    
+
     def graphml( node ) #:nodoc:
       node.each_element( ) do |child|
         begin
@@ -85,23 +85,23 @@ class GraphViz
       end
     end
 
-    def graphml_data(node) 
+    def graphml_data(node)
        warn "graphml/data not supported!"
     end
-    
+
     def graphml_key( node ) #:nodoc:
       id = node.attributes['id']
       @current_attr = {
         :name => node.attributes['attr.name'],
         :type => node.attributes['attr.type']
-      }    
+      }
       if @current_attr[:name].nil?
         @ignored_keys << id
       else
         DEST[node.attributes['for']].each do |d|
           @attributes[d][id] = @current_attr
         end
-        
+
         node.each_element( ) do |child|
           begin
             send( "graphml_key_#{child.name}".to_sym, child )
@@ -110,26 +110,26 @@ class GraphViz
           end
         end
       end
-      
+
       @current_attr = nil
     end
-    
+
     def graphml_key_default( node ) #:nodoc:
       @current_attr[:default] = node.texts().join('\n')
     end
-    
+
     def graphml_graph( node ) #:nodoc:
       @current_node = nil
-      
+
       if @current_graph.nil?
         @graph = GraphViz.new( node.attributes['id'], :type => GTYPE[node.attributes['edgedefault']] )
         @current_graph = @graph
         previous_graph = @graph
       else
-        previous_graph = @current_graph      
+        previous_graph = @current_graph
         @current_graph = previous_graph.add_graph( node.attributes['id'] )
       end
-      
+
       @attributes[:graphs].each do |id, data|
         begin
           @current_graph.graph[data[:name]] = data[:default] if data.has_key?(:default)
@@ -151,14 +151,14 @@ class GraphViz
           warn e
         end
       end
-          
+
       node.each_element( ) do |child|
         send( "graphml_graph_#{child.name}".to_sym, child )
       end
-      
+
       @current_graph = previous_graph
     end
-    
+
     def graphml_graph_data( node ) #:nodoc:
       begin
         @current_graph[@attributes[:graphs][node.attributes['key']][:name]] = node.texts().join('\n')
@@ -166,10 +166,10 @@ class GraphViz
         warn e
       end
     end
-    
+
     def graphml_graph_node( node ) #:nodoc:
       @current_node = {}
-  
+
       node.each_element( ) do |child|
         case child.name
         when "graph"
@@ -182,7 +182,7 @@ class GraphViz
           end
         end
       end
-      
+
       unless @current_node.nil?
         node = @current_graph.add_nodes( node.attributes['id'] )
         @current_node.each do |k, v|
@@ -193,10 +193,10 @@ class GraphViz
           end
         end
       end
-      
+
       @current_node = nil
     end
-    
+
     def graphml_graph_node_data( node ) #:nodoc:
       return if @ignored_keys.include?(node.attributes['key'])
       begin
@@ -205,7 +205,7 @@ class GraphViz
         warn e
       end
     end
-    
+
     def graphml_graph_node_port( node ) #:nodoc:
       @current_node[:shape] = :record
       port = node.attributes['name']
@@ -216,15 +216,15 @@ class GraphViz
         @current_node[:label] = "<#{port}> #{port}"
       end
     end
-    
+
     def graphml_graph_edge( node ) #:nodoc:
       source = node.attributes['source']
       source = {source => node.attributes['sourceport']} if node.attributes['sourceport']
       target = node.attributes['target']
       target = {target => node.attributes['targetport']} if node.attributes['targetport']
-      
+
       @current_edge = @current_graph.add_edges( source, target )
-  
+
       node.each_element( ) do |child|
         begin
           send( "graphml_graph_edge_#{child.name}".to_sym, child )
@@ -232,10 +232,10 @@ class GraphViz
           raise GraphMLError, "node #{child.name} can be child of edge"
         end
       end
-      
+
       @current_edge = nil
     end
-  
+
     def graphml_graph_edge_data( node ) #:nodoc:
       return if @ignored_keys.include?(node.attributes['key'])
       begin
@@ -244,10 +244,10 @@ class GraphViz
         warn e
       end
     end
-    
+
     def graphml_graph_hyperedge( node ) #:nodoc:
       list = []
-      
+
       node.each_element( ) do |child|
         if child.name == "endpoint"
           if child.attributes['port']
@@ -257,12 +257,12 @@ class GraphViz
           end
         end
       end
-      
+
       list.each { |s|
         list.each { |t|
           @current_graph.add_edges( s, t ) unless s == t
         }
-      } 
+      }
     end
   end
 end

data/lib/graphviz/math/matrix.rb

@@ -3,12 +3,12 @@ class GraphViz
     def self.Matrix( line, column = 0, val = 0 )
       GraphViz::Math::Matrix.new(line, column, val)
     end
-    
+
     class CoordinateError < RuntimeError
     end
     class ValueError < RuntimeError
     end
-    
+
     class Matrix
       def initialize( line_or_array, column = 0, val = 0 )
         if line_or_array.kind_of?(Array)
@@ -27,7 +27,7 @@ class GraphViz
                 raise ValueError, "Element at [#{l+1}, #{c+1}] is not a number"
               end
             end
-          end 
+          end
 
           @matrix = line_or_array
           @line = line
@@ -45,8 +45,8 @@ class GraphViz
         else
           raise ArgumentError, "Wrong matrix definition"
         end
-      end      
-            
+      end
+
       def [](line, column)
         unless (0...@line).to_a.include?(line-1)
           raise CoordinateError, "Line out of range (#{line} for 1..#{@line})!"
@@ -56,7 +56,7 @@ class GraphViz
         end
         @matrix[line-1][column-1]
       end
-      
+
       def []=( line, column, val )
         unless (0...@line).to_a.include?(line-1)
           raise CoordinateError, "Line out of range (#{line} for 1..#{@line})!"
@@ -66,20 +66,20 @@ class GraphViz
         end
         @matrix[line-1][column-1] = val
       end
-      
+
       def matrix
         @matrix
       end
       alias :to_a :matrix
-      
+
       def columns
         @column
       end
-      
+
       def lines
         @line
       end
-      
+
       def to_s
         size = bigger
         out = ""
@@ -92,7 +92,7 @@ class GraphViz
         end
         return out
       end
-      
+
       def -(m)
         matrix = GraphViz::Math::Matrix.new( @line, @column )
         @line.times do |line|
@@ -102,10 +102,10 @@ class GraphViz
         end
         return matrix
       end
-      
+
       def *(m)
         matrix = GraphViz::Math::Matrix.new( @line, @line )
-        
+
         @line.times do |line|
           @line.times do |column|
             l = self.line(line+1)
@@ -117,17 +117,17 @@ class GraphViz
             matrix[line+1,column+1] = v
           end
         end
-        
+
         return matrix
       end
-      
+
       def line( line )
         unless (0...@line).to_a.include?(line-1)
           raise CoordinateError, "Line out of range (#{line} for 1..#{@line})!"
         end
         @matrix[line-1]
       end
-      
+
       def column( column )
         col = []
         unless (0...@column).to_a.include?(column-1)
@@ -136,10 +136,10 @@ class GraphViz
         @line.times do |line|
           col << self[line+1, column]
         end
-        
+
         return col
       end
-      
+
       def transpose
         matrix = GraphViz::Math::Matrix.new( @column, @line )
         @line.times do |line|
@@ -149,7 +149,7 @@ class GraphViz
         end
         return matrix
       end
-      
+
       def ==(m)
         equal = true
         @line.times do |line|
@@ -159,7 +159,7 @@ class GraphViz
         end
         return equal
       end
-      
+
       def remove_line(n)
         unless (0...@line).to_a.include?(n-1)
           raise CoordinateError, "Line out of range (#{n} for 1..#{@line})!"
@@ -176,7 +176,7 @@ class GraphViz
         end
         return matrix
       end
-      
+
       def remove_column(n)
         unless (0...@column).to_a.include?(n-1)
           raise CoordinateError, "Column out of range (#{n} for 1..#{@column})!"
@@ -193,11 +193,11 @@ class GraphViz
         end
         return matrix
       end
-      
+
       def sum_of_column(n)
         column(n).inject(0){|sum,item| sum + item}
       end
-      
+
       def sum_of_line(n)
         line(n).inject(0){|sum,item| sum + item}
       end