rgl 0.5.1 → 0.5.7

data/test/dot_test.rb

@@ -10,25 +10,65 @@ class TestDot < Test::Unit::TestCase
   end
 
   def test_to_dot_digraph
-    graph = RGL::DirectedAdjacencyGraph[1, 2]
-    dot   = graph.to_dot_graph.to_s
-
-    first_vertex_id = 1.object_id
-    second_vertex_id = 2.object_id
-
-    assert_match(dot, /\{[^}]*\}/) # {...}
-    assert_match(dot, /#{first_vertex_id}\s*\[/)  # node 1
-    assert_match(dot, /label\s*=\s*1/)            # node 1 label
-    assert_match(dot, /#{second_vertex_id}\s*\[/) # node 2
-    assert_match(dot, /label\s*=\s*2/)            # node 2 label
-    assert_match(dot, /#{first_vertex_id}\s*->\s*#{second_vertex_id}/) # edge
+    graph = RGL::DirectedAdjacencyGraph["a", "b"]
+
+    begin
+      dot   = graph.to_dot_graph.to_s
+
+      first_vertex_id = "a"
+      second_vertex_id = "b"
+
+      assert_match(dot, /\{[^}]*\}/) # {...}
+      assert_match(dot, /#{first_vertex_id}\s*\[/)  # node 1
+      assert_match(dot, /label\s*=\s*a/)            # node 1 label
+      assert_match(dot, /#{second_vertex_id}\s*\[/) # node 2
+      assert_match(dot, /label\s*=\s*b/)            # node 2 label
+      assert_match(dot, /#{first_vertex_id}\s*->\s*#{second_vertex_id}/) # edge
+    rescue
+      puts "Graphviz not installed?"
+    end
+  end
+
+  def test_to_dot_digraph_with_options
+      graph = RGL::DirectedAdjacencyGraph["a", "b"]
+
+    begin
+      edge_labels = {}
+      graph.each_edge do |b, e|
+        key              = "#{b}-#{e}"
+        edge_labels[key] = "#{b} to #{e}"
+      end
+      
+      vertex_fontcolors = {'a' => 'green', 'b' => 'blue'}
+      vertex_fontcolor_setting = Proc.new{|v| vertex_fontcolors[v]}
+      vertex_settings          = {'fontcolor' => vertex_fontcolor_setting, 'fontsize' => 12}
+      
+      edge_label_setting = Proc.new{|b, e| edge_labels["#{b}-#{e}"]}
+      edge_settings      = {'color' => 'red', 'label' => edge_label_setting}
+      dot_options        = {'edge' => edge_settings,'vertex' => vertex_settings}
+      dot                = graph.to_dot_graph(dot_options).to_s
+
+      assert_match(dot, /a \[\n\s*fontcolor = green,\n\s*fontsize = 12,\n\s*label = a\n\s*/)
+      assert_match(dot, /b \[\n\s*fontcolor = blue,\n\s*fontsize = 12,\n\s*label = b\n\s*/)
+      assert_match(dot, /a -> b \[\n\s*color = red,\n\s*fontsize = 8,\n\s*label = \"a to b\"\n/)
+    rescue
+      puts "Graphviz not installed?"
+    end
   end
 
   def test_to_dot_graph
-    graph = RGL::AdjacencyGraph[1, 2]
+    graph = RGL::AdjacencyGraph["a", "b"]
     def graph.vertex_label(v)
       "label-"+v.to_s
     end
-    dot = graph.write_to_graphic_file
+
+    def graph.vertex_id(v)
+      "id-"+v.to_s
+    end
+    begin
+      graph.write_to_graphic_file
+    rescue
+      puts "Graphviz not installed?"
+    end
   end
 end

data/test/graph_test.rb

@@ -63,6 +63,11 @@ class TestGraph < Test::Unit::TestCase
     assert_equal edges, @dg1.edges
   end
 
+  # Test for issue #22
+  def test_edges_to_s
+    assert_equal @dg1.edges.sort.to_s, "[(1-2), (1-6), (2-3), (2-4), (4-5), (6-4)]"
+  end
+
   def test_not_implemented
     graph = NotImplementedGraph.new
     assert_raise(NotImplementedError) { graph.each_vertex }

data/test/graph_xml_test.rb

@@ -31,7 +31,7 @@ class TestGraphXML < Test::Unit::TestCase
         name, nnodes, nedges = $1, $2.to_i, $3.to_i
       end
       if name && /directed: (\w+).*acyclic: (\w+).*connected: (\w+).*biconnected: (\w+)\s+/ =~ line
-        directed, acyclic, connected, biconnected = $1, $2, $3, $4
+        directed, acyclic, connected = $1, $2, $3
         File.open(NORTH_DIR + name + '.graphml') {
             |file|
           print '.'; $stdout.flush
@@ -44,12 +44,6 @@ class TestGraphXML < Test::Unit::TestCase
           num_comp = 0
           graph.to_undirected.each_connected_component { |x| num_comp += 1 }
           assert_equal(connected, (num_comp == 1).to_s)
-
-# 		  if graph.directed?
-# 			num_comp = graph.strongly_connected_components.num_comp
-# 			#puts num_comp
-# 			assert_equal(biconnected, (num_comp == 1).to_s)
-# 		  end
         }
       end
     }

data/test/path_test.rb

@@ -0,0 +1,52 @@
+# frozen_string_literal: true
+
+require 'test_helper'
+
+require 'rgl/adjacency'
+require 'rgl/path'
+
+class TestPath < Test::Unit::TestCase
+  include RGL
+
+  def setup
+    edges = [[1, 2], [2, 3], [2, 4], [4, 5], [6, 4], [1, 6]]
+    @directed_graph, @undirected_graph =
+      [DirectedAdjacencyGraph, AdjacencyGraph].map do |klass|
+        graph = klass.new
+        graph.add_edges(*edges)
+        graph
+      end
+  end
+
+  def test_path_for_directed_graph
+    assert(@directed_graph.path?(1, 5))
+  end
+
+  def test_path_for_undirected_graph
+    assert(@undirected_graph.path?(1, 5))
+  end
+
+  def test_inverse_path_for_directed_graph
+    assert_equal(@directed_graph.path?(3, 1), false)
+  end
+
+  def test_inverse_path_for_undirected_graph
+    assert(@undirected_graph.path?(3, 1))
+  end
+
+  def test_path_for_directed_graph_wrong_source
+    assert_equal(@directed_graph.path?(0, 1), false)
+  end
+
+  def test_path_for_undirected_graph_wrong_source
+    assert_equal(@undirected_graph.path?(0, 1), false)
+  end
+
+  def test_path_for_directed_graph_wrong_target
+    assert_equal(@directed_graph.path?(4, 0), false)
+  end
+
+  def test_path_for_undirected_graph_wrong_target
+    assert_equal(@undirected_graph.path?(4, 0), false)
+  end
+end

data/test/test_helper.rb

@@ -1,3 +1,6 @@
+require 'simplecov'
+SimpleCov.start
+
 require 'rubygems'
 require 'test/unit'
 

data/test/traversal_test.rb

@@ -218,4 +218,30 @@ END
     dg.depth_first_search(vis) { |x| }
     assert_equal("(1 (2 (3  3)(4 (5  5) 4) 2)(6  6) 1)(10 (11  11) 10)", a)
   end
+
+  def test_bfs_stream_protocol
+    it = @dg.bfs_iterator(1)
+    assert_true(it.at_beginning?)
+
+    it.set_to_end()
+    assert_true(it.at_end?)
+
+    it.set_to_begin()
+    assert_true(it.at_beginning?)
+
+    assert_equal(it.to_a(), [1, 2, 6, 3, 4, 5])
+  end
+
+  def test_dfs_stream_protocol
+    it = @dg.dfs_iterator(1)
+    assert_true(it.at_beginning?)
+
+    it.set_to_end()
+    assert_true(it.at_end?)
+
+    it.set_to_begin()
+    assert_true(it.at_beginning?)
+
+    assert_equal(it.to_a(), [1, 6, 4, 5, 2, 3])
+  end
 end

metadata

@@ -1,8 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgl
 version: !ruby/object:Gem::Version
-  version: 0.5.1
-  prerelease: 
+  version: 0.5.7
 platform: ruby
 authors:
 - Horst Duchene
@@ -10,86 +9,76 @@ authors:
 autorequire: rgl/base
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2020-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stream
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.3
 - !ruby/object:Gem::Dependency
-  name: algorithms
+  name: lazy_priority_queue
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.6.1
+        version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RGL is a framework for graph data structures and algorithms
@@ -97,168 +86,160 @@ email: monora@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files:
-- README.rdoc
+- README.md
 files:
-- lib/rgl/dijkstra.rb
-- lib/rgl/edmonds_karp.rb
-- lib/rgl/graphxml.rb
-- lib/rgl/edge_properties_map.rb
-- lib/rgl/transitiv_closure.rb
-- lib/rgl/condensation.rb
-- lib/rgl/topsort.rb
-- lib/rgl/path_builder.rb
-- lib/rgl/bellman_ford.rb
-- lib/rgl/graph_visitor.rb
-- lib/rgl/bidirectional.rb
-- lib/rgl/rdot.rb
-- lib/rgl/prim.rb
-- lib/rgl/adjacency.rb
-- lib/rgl/implicit.rb
-- lib/rgl/traversal.rb
-- lib/rgl/base.rb
-- lib/rgl/dot.rb
-- lib/rgl/graph_iterator.rb
-- lib/rgl/enumerable_ext.rb
-- lib/rgl/dijkstra_visitor.rb
-- lib/rgl/mutable.rb
-- lib/rgl/connected_components.rb
-- lib/rgl/transitivity.rb
-- lib/rgl/graph_wrapper.rb
-- lib/rgl/bipartite.rb
 - ChangeLog
-- examples/images/module_graph.jpg
-- examples/images/example.jpg
-- examples/images/rgl_modules.png
-- examples/insel_der_tausend_gefahren.rb
-- examples/rdep-rgl.rb
-- examples/north2.rb
+- Gemfile
+- README.md
+- Rakefile
 - examples/canvas.rb
+- examples/examples.rb
+- examples/insel_der_tausend_gefahren.rb
 - examples/north.rb
-- examples/north/g.10.45.graphml
-- examples/north/g.10.6.graphml
-- examples/north/g.10.56.graphml
-- examples/north/g.10.8.graphml
-- examples/north/g.10.29.graphml
-- examples/north/g.10.30.graphml
-- examples/north/g.10.37.graphml
 - examples/north/Graph.log
-- examples/north/g.10.20.graphml
-- examples/north/g.10.9.graphml
-- examples/north/g.10.74.graphml
-- examples/north/g.10.61.graphml
-- examples/north/g.12.8.graphml
-- examples/north/g.10.71.graphml
-- examples/north/g.10.7.graphml
-- examples/north/g.10.38.graphml
+- examples/north/g.10.0.graphml
+- examples/north/g.10.1.graphml
+- examples/north/g.10.11.graphml
+- examples/north/g.10.12.graphml
+- examples/north/g.10.13.graphml
+- examples/north/g.10.14.graphml
 - examples/north/g.10.15.graphml
-- examples/north/g.10.50.graphml
+- examples/north/g.10.16.graphml
+- examples/north/g.10.17.graphml
 - examples/north/g.10.19.graphml
-- examples/north/g.10.62.graphml
+- examples/north/g.10.2.graphml
+- examples/north/g.10.20.graphml
+- examples/north/g.10.22.graphml
+- examples/north/g.10.24.graphml
+- examples/north/g.10.25.graphml
+- examples/north/g.10.27.graphml
+- examples/north/g.10.28.graphml
+- examples/north/g.10.29.graphml
+- examples/north/g.10.3.graphml
+- examples/north/g.10.30.graphml
 - examples/north/g.10.31.graphml
-- examples/north/g.10.92.graphml
-- examples/north/g.10.88.graphml
-- examples/north/g.10.91.graphml
-- examples/north/g.10.93.graphml
-- examples/north/g.10.16.graphml
-- examples/north/g.10.90.graphml
 - examples/north/g.10.34.graphml
-- examples/north/g.10.0.graphml
-- examples/north/g.10.27.graphml
-- examples/north/g.10.82.graphml
-- examples/north/g.10.5.graphml
-- examples/north/g.10.17.graphml
+- examples/north/g.10.37.graphml
+- examples/north/g.10.38.graphml
 - examples/north/g.10.39.graphml
-- examples/north/g.10.94.graphml
+- examples/north/g.10.4.graphml
+- examples/north/g.10.40.graphml
 - examples/north/g.10.41.graphml
-- examples/north/g.10.70.graphml
-- examples/north/g.10.68.graphml
-- examples/north/g.10.72.graphml
-- examples/north/g.10.86.graphml
-- examples/north/g.10.79.graphml
-- examples/north/g.10.85.graphml
 - examples/north/g.10.42.graphml
-- examples/north/g.10.83.graphml
-- examples/north/g.10.24.graphml
-- examples/north/g.10.13.graphml
-- examples/north/g.10.75.graphml
-- examples/north/g.10.22.graphml
-- examples/north/g.10.89.graphml
-- examples/north/g.10.12.graphml
+- examples/north/g.10.45.graphml
 - examples/north/g.10.46.graphml
-- examples/north/g.10.40.graphml
-- examples/north/g.10.3.graphml
-- examples/north/g.10.80.graphml
-- examples/north/g.10.11.graphml
+- examples/north/g.10.5.graphml
+- examples/north/g.10.50.graphml
+- examples/north/g.10.56.graphml
 - examples/north/g.10.57.graphml
+- examples/north/g.10.58.graphml
+- examples/north/g.10.6.graphml
+- examples/north/g.10.60.graphml
+- examples/north/g.10.61.graphml
+- examples/north/g.10.62.graphml
+- examples/north/g.10.68.graphml
 - examples/north/g.10.69.graphml
-- examples/north/g.10.4.graphml
+- examples/north/g.10.7.graphml
+- examples/north/g.10.70.graphml
+- examples/north/g.10.71.graphml
+- examples/north/g.10.72.graphml
+- examples/north/g.10.74.graphml
+- examples/north/g.10.75.graphml
 - examples/north/g.10.78.graphml
+- examples/north/g.10.79.graphml
+- examples/north/g.10.8.graphml
+- examples/north/g.10.80.graphml
+- examples/north/g.10.82.graphml
+- examples/north/g.10.83.graphml
+- examples/north/g.10.85.graphml
+- examples/north/g.10.86.graphml
+- examples/north/g.10.88.graphml
+- examples/north/g.10.89.graphml
+- examples/north/g.10.9.graphml
+- examples/north/g.10.90.graphml
+- examples/north/g.10.91.graphml
+- examples/north/g.10.92.graphml
+- examples/north/g.10.93.graphml
+- examples/north/g.10.94.graphml
+- examples/north/g.12.8.graphml
 - examples/north/g.14.9.graphml
-- examples/north/g.10.58.graphml
-- examples/north/g.10.60.graphml
-- examples/north/g.10.1.graphml
-- examples/north/g.10.25.graphml
-- examples/north/g.10.14.graphml
-- examples/north/g.10.28.graphml
-- examples/north/g.10.2.graphml
-- examples/examples.rb
-- Gemfile
-- README.rdoc
-- Rakefile
+- examples/north2.rb
+- examples/rdep-rgl.rb
+- examples/unix.dot
+- lib/rgl/adjacency.rb
+- lib/rgl/base.rb
+- lib/rgl/bellman_ford.rb
+- lib/rgl/bidirectional.rb
+- lib/rgl/bipartite.rb
+- lib/rgl/condensation.rb
+- lib/rgl/connected_components.rb
+- lib/rgl/dijkstra.rb
+- lib/rgl/dijkstra_visitor.rb
+- lib/rgl/dot.rb
+- lib/rgl/edge_properties_map.rb
+- lib/rgl/edmonds_karp.rb
+- lib/rgl/graph_iterator.rb
+- lib/rgl/graph_visitor.rb
+- lib/rgl/graph_wrapper.rb
+- lib/rgl/graphxml.rb
+- lib/rgl/implicit.rb
+- lib/rgl/mutable.rb
+- lib/rgl/path.rb
+- lib/rgl/path_builder.rb
+- lib/rgl/prim.rb
+- lib/rgl/rdot.rb
+- lib/rgl/topsort.rb
+- lib/rgl/transitiv_closure.rb
+- lib/rgl/transitivity.rb
+- lib/rgl/traversal.rb
 - rakelib/dep_graph.rake
+- test/bellman_ford_test.rb
+- test/bipartite_test.rb
+- test/components_test.rb
+- test/cycles_test.rb
+- test/dijkstra_issue24_test.rb
 - test/dijkstra_test.rb
-- test/prim_test.rb
+- test/directed_graph_test.rb
 - test/dot_test.rb
-- test/graph_xml_test.rb
+- test/edge_properties_map_test.rb
 - test/edge_test.rb
 - test/edmonds_karp_test.rb
-- test/traversal_test.rb
-- test/edge_properties_map_test.rb
 - test/graph_test.rb
-- test/undirected_graph_test.rb
-- test/components_test.rb
+- test/graph_xml_test.rb
 - test/implicit_test.rb
-- test/directed_graph_test.rb
-- test/bellman_ford_test.rb
+- test/path_test.rb
+- test/prim_test.rb
 - test/rdot_test.rb
-- test/cycles_test.rb
 - test/test_helper.rb
 - test/transitivity_test.rb
-- test/bipartite_test.rb
+- test/traversal_test.rb
+- test/undirected_graph_test.rb
 homepage: https://github.com/monora/rgl
-licenses: []
-post_install_message: 
+licenses:
+- ruby
+metadata: {}
+post_install_message:
 rdoc_options:
-- --title
+- "--title"
 - RGL - Ruby Graph Library
-- --main
-- README.rdoc
-- --line-numbers
+- "--main"
+- README.md
+- "--line-numbers"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 900116365
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 900116365
 requirements: []
-rubyforge_project: 
-rubygems_version: 1.8.23
-signing_key: 
-specification_version: 3
+rubygems_version: 3.0.6
+signing_key:
+specification_version: 4
 summary: Ruby Graph Library
 test_files: []
-has_rdoc: true