rgl 0.5.2 → 0.5.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d301ca82307bce4dd2de05303de4bc633f92dbf4
-  data.tar.gz: a133f96bc69d3baa7a790674fd9d6e08a8b93d83
+  metadata.gz: c15acc14278cf56aa4c7bb4de7e65944a7a12fb9
+  data.tar.gz: 718389d3eb3cf3decb71fe37be4a33fdc17c42be
 SHA512:
-  metadata.gz: 88d2fcb68bfc33c482cc11d0c82ac8c143ac9d2fcd1f4c287f3392944fc7ca212dd9f93bed4654a243c4ab9d73038d9c3c34dcd84e1521923756e8833e69963d
-  data.tar.gz: ffe9faef0d0e4f77cef5c830a3ef0a86b2fe61bb8ad7e8f62c272c9360d550e24aca23c5aaf392f9f6990cdf1e36e9d631dab7d982ff1c8b89823eecc4c39042
+  metadata.gz: ee20512b191bc19d6bf702884ac7edcd3522a71248373bb11c0ebe5821388c2245fd8fcbaecdf4c95cfb51df9ea52f6eece56e420a9b56345644f684449dd421
+  data.tar.gz: 4f3e57edb2a8521713bf2171a12cd4683f02e16c5b01ed8b18db25a08d5e5fe54039580c648616f395a506e1919e722852ec648cc80d0c9f6feb0a80aece7fcd

data/ChangeLog

@@ -1,50 +1,59 @@
+2016-05 Release 0.5.3
+
+Horst Duchene
+ * Issue #38: Add error handling or dot functions. (719e38, 5a3423)
+Thomas Orozco
+ * Remove Enumerable Extension (fde8a5)
+ * Update to codeclimate-test-reporter 1.x (25fdb5)
+Mario Daskalov
+ * Clarify that you need graphviz in the README (35a4b4)
+
 2016-05 Release 0.5.2
 
-Horst Duchene <monora@gmail.com>
+Horst Duchene
  * Issue #21: Use new method vertex_id instead of object_id to identify vertices in dot export. (fa7592)
  * Integrate Code Climate's test coverage reporting (0ab722)
  * Clarify traversal order of DFS search (see #20). (afa788)
-Chase Gilliam <chase.gilliam@gmail.com>
+Chase Gilliam
  * drop 1.9.3 add newer jruby and rubinius (fad333)
-Matías Battocchia <matias@riseup.net>
+Matías Battocchia
  * Switched to a different heap implementation. (bd7c13)
-gorn <j@kub.cz>
+gorn
  * Adding failing test for issue #24 (1f6204)
 
 2015-12 Release 0.5.1
 
-Horst Duchene <monora@gmail.com>
+Horst Duchene
  * Changed edge sequence to match example picture (daa88e)
 
-Chase <chase.gilliam@gmail.com>
+Chase
  * updated algorithms to 6.1 and added test unit to support newer rubies (fbd874)
 
-Louis Rose <louismrose@gmail.com>
+Louis Rose
  * Fix #15. Use object IDs rather than labels to identify vertexs in DOT graph
    to ensure that distinct nodes that share a label are shown. (33206f, 4fc455)
 
 2014-12 Release 0.5.0
 
-Horst Duchene <monora@gmail.com>
+Horst Duchene
   * Changed edge sequence to match example picture (daa88e)
   * Fixed comment (6a6c93)
   * Fixed spelling (7ca281)
-Horst Duchêne <monora@gmail.com>
-Chase <chase.gilliam@gmail.com>
+Horst Duchêne
+Chase
   * updated algorithms to 6.1 and added test unit to support newer rubies (fbd874)
-Louis Rose <louismrose@gmail.com>
+Louis Rose
   * Fix #15. Use object IDs rather than labels to identify vertexs in DOT graph to ensure that distinct nodes that share a label are shown. (33206f)
   * Issue #15. Fix tests. (4fc455)
 
-
 2014-12 Release 0.5.0
-Horst Duchene <monora@gmail.com>
+Horst Duchene
   * Changed edge sequence to match example picture (daa88e)
   * Fixed comment (6a6c93)
   * Fixed spelling (7ca281)
-Chase <chase.gilliam@gmail.com>
+Chase
   * updated algorithms to 6.1 and added test unit to support newer rubies (fbd874)
-Louis Rose <louismrose@gmail.com>
+Louis Rose
   * Fix #15. Use object IDs rather than labels to identify vertexs
 	in DOT graph to ensure that distinct nodes that share a label are
 	shown. (33206f)

data/Gemfile

@@ -2,4 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-gem "codeclimate-test-reporter", group: :test, require: nil
+group :test do
+  gem "simplecov"
+  gem "codeclimate-test-reporter", "~> 1.0.0"
+end

data/README.md

@@ -1,4 +1,4 @@
-# Ruby Graph Library (RGL) [<img src="https://secure.travis-ci.org/monora/rgl.png?branch=master" alt="Build Status" />](https://travis-ci.org/monora/rgl) [<img src="https://codeclimate.com/github/monora/rgl/badges/coverage.svg" />](https://codeclimate.com/github/monora/rgl/coverage)
+# Ruby Graph Library (RGL) [<img src="https://secure.travis-ci.org/monora/rgl.png?branch=master" alt="Build Status" />](https://travis-ci.org/monora/rgl) [<img src="https://codeclimate.com/github/monora/rgl/badges/coverage.svg" />](https://codeclimate.com/github/monora/rgl/coverage) [<img src="https://badge.fury.io/rb/rgl.svg" alt="Version"/>](https://badge.fury.io/rb/rgl)
 
 RGL is a framework for graph data structures and algorithms.
 
@@ -108,6 +108,8 @@ the base module Graph. The complexity guarantees can not necessarily provided.
 or download the latest sources from the git repository
 http://github.com/monora/rgl.
 
+If you are going to use the drawing functionalities install [Graphviz](http://www.graphviz.org/).
+
 ## Running tests
 
 Checkout RGL git repository and go to the project directory. First, install
@@ -225,8 +227,8 @@ graph resources.
 
 Robert kindly allowed to integrate his work on graphr, which I did not yet
 succeed. Especially his work to output graphs for
-[GraphViz](http://www.research.att.com/sw/tools/graphviz/download.html) is
-much more elaborated than the minimal support in dot.rb.
+[GraphViz](http://www.graphviz.org) is much more elaborated than the minimal
+support in dot.rb.
 
 Jeremy Siek one of the authors of the nice book [The Boost Graph
 Library](http://www.boost.org/libs/graph/doc) kindly allowed to use the BGL

data/Rakefile

@@ -100,9 +100,8 @@ task :changelog, :since_c, :until_c do |t,args|
   changelog_content = String.new
 
   cmd.split("\n").each do |entry|
-    date, author, subject, hash = entry.chomp.split("::")
+    _, author, subject, hash = entry.chomp.split("::")
     entries[author] = Array.new unless entries[author]
-    day = date.split(" ").first
     entries[author] << "#{subject} (#{hash[0..5]})" unless subject =~ /Merge/
   end
 

data/lib/rgl/base.rb

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

data/lib/rgl/bipartite.rb

@@ -22,7 +22,7 @@ module RGL
         next if bfs.finished_vertex?(u)
 
         bfs.reset_start(u)
-        bfs.move_forward_until { @found_odd_cycle }
+        bfs.move_forward_until { bfs.found_odd_cycle }
 
         return if bfs.found_odd_cycle
       end
@@ -84,4 +84,4 @@ module RGL
 
   end # class BipartiteBFSIterator
 
-end # module RGL
+end # module RGL

data/lib/rgl/dot.rb

@@ -5,6 +5,9 @@
 # Minimal Dot support, based on Dave Thomas's dot module (included in rdoc).
 # rdot.rb is a modified version which also contains support for undirected
 # graphs.
+#
+# You need to have [GraphViz](http://www.graphviz.org) installed, because the
+# functions in this modul execute the GraphViz executables _dot_ or _dotty_.
 
 require 'rgl/rdot'
 
@@ -64,7 +67,9 @@ module RGL
       File.open(dotfile, "w") do |f|
         print_dotted_on(params, f)
       end
-      system("dotty", dotfile)
+      unless system("dotty", dotfile)
+        raise "Error executing dotty. Did you install GraphViz?"
+      end
     end
 
     # Use dot[http://www.graphviz.org] to create a graphical representation of
@@ -78,7 +83,9 @@ module RGL
         f << self.to_dot_graph.to_s << "\n"
       end
 
-      system("dot -T#{fmt} #{src} -o #{dot}")
+      unless system("dot -T#{fmt} #{src} -o #{dot}")
+        raise "Error executing dot. Did you install GraphViz?"
+      end
       dot
     end
 

data/lib/rgl/edmonds_karp.rb

@@ -46,9 +46,9 @@ module RGL
             min_residual_capacity = [min_residual_capacity, @residual_capacity_map[u, v]].min
           end
 
-          augmenting_path.each_cons(2) do |(u, v)|
-            @flow_map[[u, v]] += min_residual_capacity
-            @flow_map[[v, u]] -= min_residual_capacity
+          augmenting_path.each_cons(2) do |(uu, vv)|
+            @flow_map[[uu, vv]] += min_residual_capacity
+            @flow_map[[vv, uu]] -= min_residual_capacity
           end
         end
       end
@@ -133,4 +133,4 @@ module RGL
 
   end # module Graph
 
-end
+end

data/lib/rgl/graph_iterator.rb

@@ -10,6 +10,10 @@ module RGL
   module GraphIterator
     include Stream
     include GraphWrapper
+
+    def length
+      inject(0) { |sum| sum + 1 }
+    end
   end
 
 end # RGL

data/test/components_test.rb

@@ -61,7 +61,7 @@ i -> h j e c
 
     assert_equal(4, vis.num_comp)
 
-    res = vis.comp_map.to_a.sort.reduce({}) { |res, a|
+    result = vis.comp_map.to_a.sort.reduce({}) { |res, a|
       if res.key?(a[1])
         res[a[1]] << a[0]
       else
@@ -70,7 +70,7 @@ i -> h j e c
       res
     }
 
-    std_res = res.to_a.map {
+    std_res = result.to_a.map {
         |a|
       [a[1][0], a[1]]
     }.sort

data/test/dot_test.rb

@@ -11,17 +11,22 @@ class TestDot < Test::Unit::TestCase
 
   def test_to_dot_digraph
     graph = RGL::DirectedAdjacencyGraph["a", "b"]
-    dot   = graph.to_dot_graph.to_s
 
-    first_vertex_id = "a"
-    second_vertex_id = "b"
+    begin
+      dot   = graph.to_dot_graph.to_s
 
-    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
+      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_graph
@@ -33,6 +38,10 @@ class TestDot < Test::Unit::TestCase
     def graph.vertex_id(v)
       "id-"+v.to_s
     end
-    dot = graph.write_to_graphic_file
+    begin
+      graph.write_to_graphic_file
+    rescue
+      puts "Graphviz not installed?"
+    end
   end
 end

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/test_helper.rb

@@ -1,5 +1,5 @@
-require "codeclimate-test-reporter"
-CodeClimate::TestReporter.start
+require 'simplecov'
+SimpleCov.start
 
 require 'rubygems'
 require 'test/unit'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rgl
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
 platform: ruby
 authors:
 - Horst Duchene
@@ -9,7 +9,7 @@ authors:
 autorequire: rgl/base
 bindir: bin
 cert_chain: []
-date: 2016-05-09 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: stream
@@ -107,7 +107,6 @@ files:
 - 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
@@ -189,6 +188,7 @@ files:
 - examples/north/g.10.2.graphml
 - examples/examples.rb
 - Gemfile
+- README.md
 - Rakefile
 - rakelib/dep_graph.rake
 - test/dijkstra_test.rb
@@ -211,7 +211,6 @@ files:
 - test/test_helper.rb
 - test/transitivity_test.rb
 - test/bipartite_test.rb
-- README.md
 homepage: https://github.com/monora/rgl
 licenses: []
 metadata: {}

data/lib/rgl/enumerable_ext.rb

@@ -1,16 +0,0 @@
-module Enumerable
-
-  # Fixnum()
-  #
-  # Return the number of elements of the Enumerable. Same as _size_ but not all
-  # Enumerables implement size.
-  #--
-  # Should we call the methods _size_?
-  #
-  def length
-    inject(0) do |sum, v|
-      sum + 1
-    end
-  end
-
-end