ruby-graphviz 1.0.1 → 1.0.2

data/lib/graphviz/utils/colors.rb

@@ -42,13 +42,12 @@ class GraphViz
                raise ColorException, "Bad alpha value"
             end
       
-      
             @r = r
             @g = g
             @b = b
             @a = a
             
-            @color = COLORS.index(rgba_string.downcase)
+            @color = COLORS.key(rgba_string.downcase)
             
             @h, @s, @v = rgb_to_hsv(@r, @g, @b)
          end
@@ -64,7 +63,7 @@ class GraphViz
       
             @r, @g, @b = hsv_to_rgb(@h, @s, @v)
       
-            @color = COLORS.index(rgba_string.downcase);
+            @color = COLORS.key(rgba_string.downcase);
          end
       
          def name(c = nil)
@@ -175,23 +174,23 @@ class GraphViz
                q = _v * ( 1.0 - _s * f )
                t = _v * ( 1.0 - _s * ( 1 - f ) )
                case i 
-               when 0:
+               when 0
                   r = _v
                   g = t
                   b = p
-               when 1:
+               when 1
                   r = q
                   g = _v
                   b = p
-               when 2:
+               when 2
                   r = p
                   g = _v
                   b = t
-               when 3:
+               when 3
                   r = p
                   g = q
                   b = _v
-               when 4:
+               when 4
                   r = t
                   g = p
                   b = _v

data/lib/graphviz/xml.rb

@@ -28,9 +28,9 @@ class GraphViz
     # 
     # THIS METHOD IS DEPRECATED, PLEASE USE GraphViz::XML.graph.output
     # 
-    def output( *hOpt )
+    def output( *options )
       warn "GraphViz::XML.output is deprecated, use GraphViz::XML.graph.output"
-      @graph.output( *hOpt )
+      @graph.output( *options )
     end
     
     private
@@ -39,58 +39,58 @@ class GraphViz
     # Create a graph from a XML file
     # 
     # In:
-    # * xFile : XML File
-    # * *hOpt : Graph options:
+    # * xml_file : XML File
+    # * *options : Graph options:
     #   * :text : show text nodes (default true)
     #   * :attrs : show XML attributs (default true)
     # 
-    def initialize( xFile, *hOpt )
-      @xNodeName = "00000"
-	    @bShowText = true
-	    @bShowAttrs = true
+    def initialize( xml_file, *options )
+      @node_name = "00000"
+	   @show_text = true
+	   @show_attributs = true
 
-      if hOpt.nil? == false and hOpt[0].nil? == false
-        hOpt[0].each do |xKey, xValue|
+      if options.nil? == false and options[0].nil? == false
+        options[0].each do |xKey, xValue|
           case xKey.to_s
             when "text"
-              @bShowText = xValue
-		          hOpt[0].delete( xKey )
+              @show_text = xValue
+		          options[0].delete( xKey )
             when "attrs"
-              @bShowAttrs = xValue
-		          hOpt[0].delete( xKey )
+              @show_attributs = xValue
+		          options[0].delete( xKey )
           end
         end
       end
 
-      @oReXML = REXML::Document::new( File::new( xFile ) )
-      @graph = GraphViz::new( "XML", *hOpt ) 
-      _init( @oReXML.root() )
+      @rexml_document = REXML::Document::new( File::new( xml_file ) )
+      @graph = GraphViz::new( "XML", *options ) 
+      parse_xml_node( @rexml_document.root() )
     end
     
-    def _init( oXMLNode ) #:nodoc:
-      xLocalNodeName = @xNodeName.clone
-      @xNodeName.succ!
+    def parse_xml_node( xml_node ) #:nodoc:
+      local_node_name = @node_name.clone
+      @node_name.succ!
       
-      label = oXMLNode.name
-      if oXMLNode.has_attributes? == true and @bShowAttrs == true
-        label = "{ " + oXMLNode.name 
+      label = xml_node.name
+      if xml_node.has_attributes? == true and @show_attributs == true
+        label = "{ " + xml_node.name 
 		
-		    oXMLNode.attributes.each do |xName, xValue|
+		    xml_node.attributes.each do |xName, xValue|
 		      label << "| { #{xName} | #{xValue} } " 
 		    end
 		
 		    label << "}"
 	    end
-      @graph.add_node( xLocalNodeName, "label" => label, "color" => "blue", "shape" => "record" )
+      @graph.add_node( local_node_name, "label" => label, "color" => "blue", "shape" => "record" )
 
       ## Act: Search and add Text nodes
-      if oXMLNode.has_text? == true and @bShowText == true
-        xTextNodeName = xLocalNodeName.clone
-        xTextNodeName << "111"
+      if xml_node.has_text? == true and @show_text == true
+        text_node_name = local_node_name.clone
+        text_node_name << "111"
         
         xText = ""
         xSep = ""
-        oXMLNode.texts().each do |l|
+        xml_node.texts().each do |l|
           x = l.value.chomp.strip
           if x.length > 0
             xText << xSep << x
@@ -99,20 +99,20 @@ class GraphViz
         end
 
         if xText.length > 0
-          @graph.add_node( xTextNodeName, "label" => xText, "color" => "black", "shape" => "ellipse" )
-          @graph.add_edge( xLocalNodeName, xTextNodeName )
+          @graph.add_node( text_node_name, "label" => xText, "color" => "black", "shape" => "ellipse" )
+          @graph.add_edge( local_node_name, text_node_name )
         end
       end
 
       ## Act: Search and add attributs
       ## TODO
 
-      oXMLNode.each_element( ) do |oXMLChild|
-        xChildNodeName = _init( oXMLChild )
-        @graph.add_edge( xLocalNodeName, xChildNodeName )
+      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 )
       end
 
-      return( xLocalNodeName )
+      return( local_node_name )
     end
 
   end

data/test/test_graph.rb

@@ -7,9 +7,6 @@ class GraphVizTest < Test::Unit::TestCase
     @graph = GraphViz::new( :G )    
   end
 
-  # def teardown
-  # end
-
   def test_graph
     assert(@graph, 'Create graph faild.')
     
@@ -43,4 +40,69 @@ class GraphVizTest < Test::Unit::TestCase
     
     assert_equal( "\"Hello\\n\\\"world\\\"\\l\"", n['label'].to_s, 'Get attribut for node faild.' )
   end
+
+  def test_search
+     g = GraphViz::new( "G" )
+     g.node["shape"] = "ellipse"
+     g.node["color"] = "black"
+
+     g["color"] = "black"
+
+     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 )
+
+     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 )
+
+     assert g
+
+     assert_equal g.get_node("start"), start
+     assert_equal g.find_node("start"), start
+     assert_equal g.search_node("start"), start
+
+     assert_nil   g.get_node("a0")
+     assert_equal g.find_node("a0"), a0
+     assert_equal g.search_node("a0"), a0
+
+     assert_nil   c0.get_node("start")
+     assert_equal c0.find_node("start"), start
+     assert_nil   c0.search_node("start")
+
+     assert_equal c0.get_node("a0"), a0
+     assert_equal c0.find_node("a0"), a0
+     assert_equal c0.search_node("a0"), a0
+
+     assert_nil   c1.get_node("start")
+     assert_equal c1.find_node("start"), start
+     assert_nil   c1.search_node("start")
+
+     assert_nil   c1.get_node("a0")
+     assert_equal c1.find_node("a0"), a0
+     assert_nil   c1.search_node("a0")
+  end
 end

data/test/test_theory.rb

@@ -0,0 +1,102 @@
+require 'test/unit'
+$:.unshift(File.expand_path('../../lib',__FILE__))
+require 'graphviz'
+require 'graphviz/theory'
+require 'graphviz/math/matrix'
+
+class GraphVizTheoryTest < Test::Unit::TestCase
+   def setup
+      @g = GraphViz.digraph( "G", :path => "/usr/local/bin" ) do |g|
+         g.a[:label => "1"]
+         g.b[:label => "2"]
+         g.c[:label => "3"]
+         g.d[:label => "4"]
+         g.e[:label => "5"]
+         g.f[:label => "6"]
+
+         g.a << g.b
+         g.a << g.d
+         (g.a << g.f)[:weight => 6, :label => "6"]
+         g.b << g.c
+         g.b << g.d
+         g.b << g.e
+         g.c << g.d
+         (g.c << g.f)[:weight => 2, :label => "2"]
+         g.d << g.e
+      end
+   
+      @t = GraphViz::Theory.new( @g )
+   end
+
+   def test_theory
+      assert @g, "Create graph failed!"
+      assert @t, "Theory failed!"
+   end
+
+   def test_adgency_matrix
+      adgency = GraphViz::Math::Matrix.new([
+        [0,1,0,1,0,1], 
+        [0,0,1,1,1,0],
+        [0,0,0,1,0,1],
+        [0,0,0,0,1,0],
+        [0,0,0,0,0,0],
+        [0,0,0,0,0,0]
+      ])
+      assert_equal @t.adjancy_matrix, adgency, "Wrong adgency matrix"
+   end
+
+   def test_symetric
+      assert_equal false, @t.symmetric?
+   end
+
+   def test_incidence_matrix
+      incidence = GraphViz::Math::Matrix.new([
+         [ 1, 1, 1, 0, 0, 0, 0, 0, 0], 
+         [-1, 0, 0, 1, 1, 1, 0, 0, 0],
+         [ 0, 0, 0,-1, 0, 0, 1, 1, 0],
+         [ 0,-1, 0, 0,-1, 0,-1, 0, 1],
+         [ 0, 0, 0, 0, 0,-1, 0, 0,-1],
+         [ 0, 0,-1, 0, 0, 0, 0,-1, 0]
+      ])
+      assert_equal @t.incidence_matrix, incidence
+   end
+
+   def test_degree
+      assert_equal 3, @t.degree(@g.get_node("a"))
+      assert_equal 4, @t.degree(@g.get_node("b"))
+      assert_equal 3, @t.degree(@g.get_node("c"))
+      assert_equal 4, @t.degree(@g.get_node("d"))
+      assert_equal 2, @t.degree(@g.get_node("e"))
+      assert_equal 2, @t.degree(@g.get_node("f"))
+   end
+
+   def test_laplacian_matrix
+      laplacian = GraphViz::Math::Matrix.new([
+         [3,-1, 0,-1, 0,-1],
+         [0, 4,-1,-1,-1, 0], 
+         [0, 0, 3,-1, 0,-1],
+         [0, 0, 0, 4,-1, 0],
+         [0, 0, 0, 0, 2, 0],
+         [0, 0, 0, 0, 0, 2]
+      ])
+      assert_equal @t.laplacian_matrix, laplacian
+   end
+
+   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 4.0, r[:distance]
+   end
+
+   def test_range
+      assert_equal [0, 1, 2, 3, 4, 3], @t.range
+   end
+
+   def test_critical_path
+      r = @t.critical_path
+      assert r
+      assert_equal [1, 6], r[:path]
+      assert_equal 6.0, r[:distance]
+   end
+end

data/test/test_utils_colors.rb

@@ -3,55 +3,52 @@ $:.unshift(File.expand_path('../../lib',__FILE__))
 require 'graphviz/utils/colors'
 
 class TypesTest < Test::Unit::TestCase
-  def test_color_by_name
-    brown = GraphViz::Utils::Colors.name("brown")
-    assert brown
-    
-    assert_equal "brown", brown.name
-    
-    assert_equal "a5", brown.r 
-    assert_equal "2a", brown.g
-    assert_equal "2a", brown.b
-    assert_equal "#a52a2a", brown.rgba_string("#")
-
-    assert_equal 0.0.to_s, brown.h.to_s
-    assert_equal 0.745454545454545.to_s, brown.s.to_s
-    assert_equal 0.647058823529412.to_s, brown.v.to_s
-
-    assert_equal "0.0, 0.745454545454545, 0.647058823529412", brown.hsv_string
+  def setup
+    @brown_txt = GraphViz::Utils::Colors.name("brown")
+    @brown_hsv = GraphViz::Utils::Colors.hsv(0.0, 0.745454545454545, 0.647058823529412)
+    @brown_rgb = GraphViz::Utils::Colors.rgb("a5", "2a", "2a") 
   end
 
-  def test_color_by_hsv
-    brown = GraphViz::Utils::Colors.hsv(0.0, 0.745454545454545, 0.647058823529412)
-    assert brown
-    
-    assert_equal "brown", brown.name
-    
-    assert_equal "a5", brown.r 
-    assert_equal "2a", brown.g
-    assert_equal "2a", brown.b
-    assert_equal "#a52a2a", brown.rgba_string("#")
-    
-    assert_equal 0.0.to_s, brown.h.to_s
-    assert_equal 0.745454545454545.to_s, brown.s.to_s
-    assert_equal 0.647058823529412.to_s, brown.v.to_s
-    assert_equal "0.0, 0.745454545454545, 0.647058823529412", brown.hsv_string
+  def test_color
+    assert @brown_txt
+    assert @brown_hsv
+    assert @brown_rgb
+  end
+
+  def test_color_by_name
+    assert_equal "brown", @brown_txt.name
+    assert_equal "brown", @brown_hsv.name
+    assert_equal "brown", @brown_rgb.name
   end
 
   def test_color_by_rgb
-    brown = GraphViz::Utils::Colors.rgb("a5", "2a", "2a") 
-    assert brown
-    
-    assert_equal "brown", brown.name
-    
-    assert_equal "a5", brown.r 
-    assert_equal "2a", brown.g
-    assert_equal "2a", brown.b
-    assert_equal "#a52a2a", brown.rgba_string("#")
-    
-    assert_equal 0.0.to_s, brown.h.to_s
-    assert_equal 0.745454545454545.to_s, brown.s.to_s
-    assert_equal 0.647058823529412.to_s, brown.v.to_s
-    assert_equal "0.0, 0.745454545454545, 0.647058823529412", brown.hsv_string
+    assert_equal "a5", @brown_txt.r 
+    assert_equal "2a", @brown_txt.g
+    assert_equal "2a", @brown_txt.b
+    assert_equal "#a52a2a", @brown_txt.rgba_string("#")
+
+    assert_equal "a5", @brown_hsv.r 
+    assert_equal "2a", @brown_hsv.g
+    assert_equal "2a", @brown_hsv.b
+    assert_equal "#a52a2a", @brown_hsv.rgba_string("#")
+
+    assert_equal "a5", @brown_rgb.r 
+    assert_equal "2a", @brown_rgb.g
+    assert_equal "2a", @brown_rgb.b
+    assert_equal "#a52a2a", @brown_rgb.rgba_string("#")
+  end
+
+  def test_color_by_hsv
+    assert_equal @brown_rgb.h, @brown_txt.h
+    assert_equal @brown_rgb.s, @brown_txt.s
+    assert_equal @brown_rgb.v, @brown_txt.v
+
+    assert_equal @brown_rgb.hsv_string, @brown_txt.hsv_string
+
+    assert_equal 0.0.to_s, @brown_hsv.h.to_s
+    assert_equal 0.745454545454545.to_s, @brown_hsv.s.to_s
+    assert_equal 0.647058823529412.to_s, @brown_hsv.v.to_s
+
+    assert_equal "0.0, 0.745454545454545, 0.647058823529412", @brown_hsv.hsv_string
   end
 end