rgl 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c15acc14278cf56aa4c7bb4de7e65944a7a12fb9
-  data.tar.gz: 718389d3eb3cf3decb71fe37be4a33fdc17c42be
+SHA256:
+  metadata.gz: 8756a57ea9c8151eadaa993efee20e2d41ddba102bee5d4106e00c94318d328e
+  data.tar.gz: c2400afcdcc2d5c8f22ed0da9e48cd843629f57747335265087a7e3e892d55d0
 SHA512:
-  metadata.gz: ee20512b191bc19d6bf702884ac7edcd3522a71248373bb11c0ebe5821388c2245fd8fcbaecdf4c95cfb51df9ea52f6eece56e420a9b56345644f684449dd421
-  data.tar.gz: 4f3e57edb2a8521713bf2171a12cd4683f02e16c5b01ed8b18db25a08d5e5fe54039580c648616f395a506e1919e722852ec648cc80d0c9f6feb0a80aece7fcd
+  metadata.gz: 83cebc1a0570644f5dc1a48c16a5a38e11d73b9baf095f2627ef91676139c473f8027b608748dfe5d7df1926b17759e07dab85722fa0ced05b1656880fade8da
+  data.tar.gz: ad2d7ee636584a077313323efacf8c274f25643cc78e85b4f4f0e01dfbbbb522e00b7e50c295ad1e2ff395300c8f4f0551e00bb7b2a514cc179f01b9d327487e

data/ChangeLog

@@ -1,4 +1,15 @@
-2016-05 Release 0.5.3
+2019-01 Release 0.5.4
+
+Lia Skalkos
+ * Enable options to be passed to #write_to_graphic_file (4ca972). For details see PR #41
+Horst Duchene
+ * Fix travis-ci errors
+ * Add new ruby versions
+ * Fix gemspec errors
+ * Fix lint warnings
+ * Use version stream 0.5.2
+
+2017-04 Release 0.5.3
 
 Horst Duchene
  * Issue #38: Add error handling or dot functions. (719e38, 5a3423)

data/README.md

@@ -134,6 +134,10 @@ The result:
 
 ![Example](https://github.com/monora/rgl/raw/master/images/example.jpg)
 
+You can control the graph layout by passing layout parameters to `write_to_graphic_file`. See
+`TestDot::test_to_dot_digraph_with_options` for an example using a feature implemented by Lia
+Skalkos (see [PR #41](https://github.com/monora/rgl/pull/41)).
+
     irb> dg.directed?
     true
     irb> dg.vertices
@@ -249,6 +253,6 @@ See also http://github.com/monora/rgl/contributors.
 
 ## Copying
 
-RGL is Copyright (c) 2002,2004,2005,2008,2013,2015 by Horst Duchene. It is
+RGL is Copyright (c) 2002,2004,2005,2008,2013,2015,2019 by Horst Duchene. It is
 free software, and may be redistributed under the terms specified in the
 README file of the Ruby distribution.

data/lib/rgl/adjacency.rb

@@ -77,7 +77,7 @@ module RGL
     # Complexity is O(1), because the vertices are kept in a Hash containing
     # as values the lists of adjacent vertices of _v_.
     #
-    def has_vertex? (v)
+    def has_vertex?(v)
       @vertices_dict.has_key?(v)
     end
 
@@ -87,7 +87,7 @@ module RGL
     # ---
     # MutableGraph interface.
     #
-    def has_edge? (u, v)
+    def has_edge?(u, v)
       has_vertex?(u) && @vertices_dict[u].include?(v)
     end
 

data/lib/rgl/base.rb

@@ -4,7 +4,7 @@
 # library. The main module is RGL::Graph which defines the abstract behavior of
 # all graphs in the library.
 
-RGL_VERSION = "0.5.3"
+RGL_VERSION = "0.5.4"
 
 module RGL
   class NotDirectedError < RuntimeError; end

data/lib/rgl/dot.rb

@@ -33,21 +33,29 @@ module RGL
       fontsize       = params['fontsize'] ? params['fontsize'] : '8'
       graph          = (directed? ? DOT::Digraph : DOT::Graph).new(params)
       edge_class     = directed? ? DOT::DirectedEdge : DOT::Edge
+      vertex_options = params['vertex'] || {}
+      edge_options   = params['edge'] || {}
 
       each_vertex do |v|
-        graph << DOT::Node.new(
-            'name'     => vertex_id(v),
-            'fontsize' => fontsize,
-            'label'    => vertex_label(v)
-        )
+        default_vertex_options =  {
+          'name'     => vertex_id(v),
+          'fontsize' => fontsize,
+          'label'    => vertex_label(v)
+        }
+        each_vertex_options = default_vertex_options.merge(vertex_options)
+        vertex_options.each{|option, val| each_vertex_options[option] = val.call(v) if val.is_a?(Proc)}
+        graph << DOT::Node.new(each_vertex_options)
       end
 
       each_edge do |u, v|
-        graph << edge_class.new(
-            'from'     => vertex_id(u),
-            'to'       => vertex_id(v),
-            'fontsize' => fontsize
-        )
+        default_edge_options = {
+          'from'     => vertex_id(u),
+          'to'       => vertex_id(v),
+          'fontsize' => fontsize
+        }
+        each_edge_options = default_edge_options.merge(edge_options)
+        edge_options.each{|option, val| each_edge_options[option] = val.call(u, v) if val.is_a?(Proc)}
+        graph << edge_class.new(each_edge_options)
       end
 
       graph
@@ -75,12 +83,12 @@ module RGL
     # Use dot[http://www.graphviz.org] to create a graphical representation of
     # the graph. Returns the filename of the graphics file.
     #
-    def write_to_graphic_file(fmt='png', dotfile="graph")
+    def write_to_graphic_file(fmt='png', dotfile="graph", options={})
       src = dotfile + ".dot"
       dot = dotfile + "." + fmt
 
       File.open(src, 'w') do |f|
-        f << self.to_dot_graph.to_s << "\n"
+        f << self.to_dot_graph(options).to_s << "\n"
       end
 
       unless system("dot -T#{fmt} #{src} -o #{dot}")

data/test/dot_test.rb

@@ -29,6 +29,33 @@ class TestDot < Test::Unit::TestCase
     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["a", "b"]
     def graph.vertex_label(v)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgl
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Horst Duchene
@@ -9,76 +9,76 @@ authors:
 autorequire: rgl/base
 bindir: bin
 cert_chain: []
-date: 2017-04-22 00:00:00.000000000 Z
+date: 2019-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stream
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.0
+        version: 0.5.2
 - !ruby/object:Gem::Dependency
   name: lazy_priority_queue
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: RGL is a framework for graph data structures and algorithms
@@ -88,156 +88,154 @@ extensions: []
 extra_rdoc_files:
 - 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/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/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.md
-- Rakefile
+- examples/north2.rb
+- examples/rdep-rgl.rb
+- 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_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/prim_test.rb
 - test/rdot_test.rb
-- test/cycles_test.rb
-- test/dijkstra_issue24_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: []
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --title
+- "--title"
 - RGL - Ruby Graph Library
-- --main
+- "--main"
 - README.md
-- --line-numbers
+- "--line-numbers"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Ruby Graph Library
 test_files: []
-has_rdoc: true