graph_matching 0.0.2 → 0.1.0

data/lib/graph_matching/algorithm/mwmg_delta_assertions.rb

@@ -19,27 +19,25 @@ module GraphMatching
       # > Check optimized delta2 against a trivial computation.
       # > (Van Rantwijk, mwmatching.py, line 580)
       def check_delta2
-        (0 ... @nvertex).each do |v|
-          if @label[@in_blossom[v]] == MWMGeneral::LBL_FREE
-            bd = nil
-            bk = nil
-            @neighb_end[v].each do |p|
-              k = p / 2 # Note: floor division
-              w = @endpoint[p]
-              if @label[@in_blossom[w]] == MWMGeneral::LBL_S
-                d = slack(k)
-                if bk.nil? || d < bd
-                  bk = k
-                  bd = d
-                end
-              end
-            end
-            option1 = bk.nil? && @best_edge[v].nil?
-            option2 = !@best_edge[v].nil? && bd == slack(@best_edge[v])
-            unless option1 || option2
-              fail "Assertion failed: Free vertex #{v}"
+        (0...@nvertex).each do |v|
+          next unless @label[@in_blossom[v]] == MWMGeneral::LBL_FREE
+          bd = nil
+          bk = nil
+          @neighb_end[v].each do |p|
+            k = p / 2 # Note: floor division
+            w = @endpoint[p]
+            next unless @label[@in_blossom[w]] == MWMGeneral::LBL_S
+            d = slack(k)
+            if bk.nil? || d < bd
+              bk = k
+              bd = d
             end
           end
+          option1 = bk.nil? && @best_edge[v].nil?
+          option2 = !@best_edge[v].nil? && bd == slack(@best_edge[v])
+          unless option1 || option2
+            raise "Assertion failed: Free vertex #{v}"
+          end
         end
       end
 
@@ -50,43 +48,42 @@ module GraphMatching
         bd = nil
         tbk = nil
         tbd = nil
-        (0 ... 2 * @nvertex).each do |b|
-          if @blossom_parent[b].nil? && @label[b] == MWMGeneral::LBL_S
-            blossom_leaves(b).each do |v|
-              @neighb_end[v].each do |p|
-                k = p / 2 # Note: floor division
-                w = @endpoint[p]
-                if @in_blossom[w] != b &&
-                    @label[@in_blossom[w]] == MWMGeneral::LBL_S
-                  d = slack(k)
-                  if bk.nil? || d < bd
-                    bk = k
-                    bd = d
-                  end
-                end
-              end
-            end
-            unless @best_edge[b].nil?
-              i, j = @edges[@best_edge[b]].to_a
-              unless @in_blossom[i] == b || @in_blossom[j] == b
-                fail 'Assertion failed'
-              end
-              unless @in_blossom[i] != b || @in_blossom[j] != b
-                fail 'Assertion failed'
-              end
-              unless @label[@in_blossom[i]] == MWMGeneral::LBL_S &&
-                  @label[@in_blossom[j]] == MWMGeneral::LBL_S
-                fail 'Assertion failed'
+        (0...2 * @nvertex).each do |b|
+          next unless @blossom_parent[b].nil? && @label[b] == MWMGeneral::LBL_S
+          blossom_leaves(b).each do |v|
+            @neighb_end[v].each do |p|
+              k = p / 2 # Note: floor division
+              w = @endpoint[p]
+              unless @in_blossom[w] != b &&
+                  @label[@in_blossom[w]] == MWMGeneral::LBL_S
+                next
               end
-              if tbk.nil? || slack(@best_edge[b]) < tbd
-                tbk = @best_edge[b]
-                tbd = slack(@best_edge[b])
+              d = slack(k)
+              if bk.nil? || d < bd
+                bk = k
+                bd = d
               end
             end
           end
+          next if @best_edge[b].nil?
+          i, j = @edges[@best_edge[b]].to_a
+          unless @in_blossom[i] == b || @in_blossom[j] == b
+            raise 'Assertion failed'
+          end
+          unless @in_blossom[i] != b || @in_blossom[j] != b
+            raise 'Assertion failed'
+          end
+          unless @label[@in_blossom[i]] == MWMGeneral::LBL_S &&
+              @label[@in_blossom[j]] == MWMGeneral::LBL_S
+            raise 'Assertion failed'
+          end
+          if tbk.nil? || slack(@best_edge[b]) < tbd
+            tbk = @best_edge[b]
+            tbd = slack(@best_edge[b])
+          end
         end
         unless bd == tbd
-          fail 'Assertion failed'
+          raise 'Assertion failed'
         end
       end
     end

data/lib/graph_matching/assertion.rb

@@ -14,27 +14,27 @@ module GraphMatching
 
     def eq(other)
       unless obj == other
-        fail "Expected #{other}, got #{obj}"
+        raise "Expected #{other}, got #{obj}"
       end
     end
 
     def gte(other)
       unless obj >= other
-        fail "Expected #{obj} to be >= #{other}"
+        raise "Expected #{obj} to be >= #{other}"
       end
     end
 
     # rubocop:disable Style/PredicateName
     def is_a(klass)
       unless obj.is_a?(klass)
-        fail TypeError, "Expected #{klass}, got #{obj.class}"
+        raise TypeError, "Expected #{klass}, got #{obj.class}"
       end
     end
     # rubocop:enable Style/PredicateName
 
     def not_nil
       if obj.nil?
-        fail "Unexpected nil"
+        raise 'Unexpected nil'
       end
     end
   end

data/lib/graph_matching/core_ext/set.rb

@@ -16,7 +16,7 @@ unless Set.instance_methods.include?(:intersect?)
     # http://www.ruby-doc.org/stdlib-2.2.0/libdoc/set/rdoc/Set.html#method-i-intersect-3F
     def intersect?(set)
       unless set.is_a?(Set)
-        fail ArgumentError, "value must be a set"
+        raise ArgumentError, 'value must be a set'
       end
       if size < set.size
         any? { |o| set.include?(o) }

data/lib/graph_matching/graph/bigraph.rb

@@ -28,7 +28,7 @@ module GraphMatching
           [Set.new, Set.new]
         else
           arrays = bipartite_sets
-          fail NotBipartite if arrays.nil?
+          raise NotBipartite if arrays.nil?
           [Set.new(arrays[0]), Set.new(arrays[1])]
         end
       end

data/lib/graph_matching/graph/graph.rb

@@ -56,7 +56,7 @@ module GraphMatching
 
       def vertexes_must_be_integers
         return if vertices.none? { |v| !v.is_a?(Integer) }
-        fail ArgumentError, 'All vertexes must be integers'
+        raise ArgumentError, 'All vertexes must be integers'
       end
     end
   end

data/lib/graph_matching/graph/weighted.rb

@@ -44,7 +44,9 @@ module GraphMatching
           g = super(*weightless_edges.flatten)
           g.init_weights
           args.each do |edge|
-            i, j, weight = edge[0] - 1, edge[1] - 1, edge[2]
+            i = edge[0] - 1
+            j = edge[1] - 1
+            weight = edge[2]
             g.weight[i][j] = weight
             g.weight[j][i] = weight
           end
@@ -56,7 +58,7 @@ module GraphMatching
         # (The first two represent the edge, the third, the weight)
         def assert_weighted_edges(ary)
           return if ary.is_a?(Array) && ary.all?(&method(:weighted_edge?))
-          fail 'Invalid array of weighted edges'
+          raise 'Invalid array of weighted edges'
         end
 
         # `weighted_edge?` returns true if `e` is an array whose
@@ -83,8 +85,8 @@ module GraphMatching
       # clarity outweighs performance.
       def w(edge)
         i, j = edge
-        fail ArgumentError, "Invalid edge: #{edge}" if i.nil? || j.nil?
-        fail "Edge not found: #{edge}" unless has_edge?(*edge)
+        raise ArgumentError, "Invalid edge: #{edge}" if i.nil? || j.nil?
+        raise "Edge not found: #{edge}" unless has_edge?(*edge)
         init_weights if @weight.nil?
         @weight[i - 1][j - 1]
       end
@@ -94,14 +96,15 @@ module GraphMatching
       # graph with `.[]` is not convenient.
       def set_w(edge, weight)
         if edge[0].nil? || edge[1].nil?
-          fail ArgumentError, "Invalid edge: #{edge}"
+          raise ArgumentError, "Invalid edge: #{edge}"
         end
         unless weight.is_a?(Integer)
-          fail TypeError, "Edge weight must be integer"
+          raise TypeError, 'Edge weight must be integer'
         end
         init_weights if @weight.nil?
-        i, j = edge[0] - 1, edge[1] - 1
-        fail "Edge not found: #{edge}" unless has_edge?(*edge)
+        i = edge[0] - 1
+        j = edge[1] - 1
+        raise "Edge not found: #{edge}" unless has_edge?(*edge)
         @weight[i] ||= []
         @weight[j] ||= []
         @weight[i][j] = weight

data/lib/graph_matching/integer_vertexes.rb

@@ -10,7 +10,7 @@ module GraphMatching
     # original vertexes.
     #
     def self.to_integers(graph)
-      fail ArgumentError unless graph.is_a?(RGL::MutableGraph)
+      raise ArgumentError unless graph.is_a?(RGL::MutableGraph)
       legend = {}
       reverse_legend = {}
       new_graph = graph.class.new
@@ -23,7 +23,7 @@ module GraphMatching
         target = reverse_legend[edge.target]
         new_graph.add_edge(source, target)
       end
-      return new_graph, legend
+      [new_graph, legend]
     end
   end
 end

data/lib/graph_matching/version.rb

@@ -2,7 +2,7 @@
 
 # no-doc
 module GraphMatching
-  VERSION = "0.0.2"
+  VERSION = '0.1.0'.freeze
 
   def self.gem_version
     ::Gem::Version.new(VERSION)

data/lib/graph_matching/visualize.rb

@@ -6,8 +6,8 @@ require 'rgl/rdot'
 module GraphMatching
   # Renders `GraphMatching::Graph` objects using `graphviz`.
   class Visualize
-    TMP_DIR = '/tmp/graph_matching'
-    USR_BIN_ENV = '/usr/bin/env'
+    TMP_DIR = '/tmp/graph_matching'.freeze
+    USR_BIN_ENV = '/usr/bin/env'.freeze
 
     attr_reader :graph
 
@@ -34,8 +34,8 @@ module GraphMatching
 
     def check_that_dot_is_installed
       return if dot_installed?
-      $stderr.puts "Executable not found: dot"
-      $stderr.puts "Please install graphviz"
+      $stderr.puts 'Executable not found: dot'
+      $stderr.puts 'Please install graphviz'
       exit(1)
     end
 
@@ -85,7 +85,7 @@ module GraphMatching
     def write_png(abs_path)
       _so, se, st = Open3.capture3("dot -T png > #{abs_path}", stdin_data: dot)
       return if st.success?
-      $stderr.puts "Failed to generate .png"
+      $stderr.puts 'Failed to generate .png'
       $stderr.puts se
       exit(1)
     end

data/profile/mwm_general/profile.rb

@@ -7,7 +7,7 @@ require 'ruby-prof'
 
 def complete_graph(n)
   g = GraphMatching::Graph::WeightedGraph.new
-  n_edges = (1 .. n - 1).reduce(:+)
+  n_edges = (1..n - 1).reduce(:+)
   0.upto(n - 2) do |i|
     (i + 1).upto(n - 1) do |j|
       g.add_edge(i, j)

data/spec/graph_matching/algorithm/mcm_bipartite_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe GraphMatching::Algorithm::MCMBipartite do
 
   describe '.new' do
     it 'requires a Bigraph' do
-      expect { described_class.new("banana") }.to raise_error(TypeError)
+      expect { described_class.new('banana') }.to raise_error(TypeError)
     end
   end
 

data/spec/graph_matching/algorithm/mcm_general_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe GraphMatching::Algorithm::MCMGeneral do
 
   describe '.new' do
     it 'requires a Graph' do
-      expect { described_class.new("banana") }.to raise_error(TypeError)
+      expect { described_class.new('banana') }.to raise_error(TypeError)
     end
   end
 

data/spec/graph_matching/algorithm/mwm_bipartite_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe GraphMatching::Algorithm::MWMBipartite do
 
   describe '.new' do
     it 'requires a WeightedBigraph' do
-      expect { described_class.new("banana") }.to raise_error(TypeError)
+      expect { described_class.new('banana') }.to raise_error(TypeError)
     end
   end
 

data/spec/graph_matching/algorithm/mwm_general_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
 
   describe '.new' do
     it 'requires a WeightedGraph' do
-      expect { described_class.new("banana") }.to raise_error(TypeError)
+      expect { described_class.new('banana') }.to raise_error(TypeError)
     end
   end
 
@@ -22,14 +22,17 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
           [3, 4, 0]
         ]
         a = described_class.new(g)
-        a.instance_variable_set(:@blossom_children, [
-          nil,
-          nil,
-          nil,
-          nil,
-          nil,
-          [2, 3, 4]
-        ])
+        a.instance_variable_set(
+          :@blossom_children,
+          [
+            nil,
+            nil,
+            nil,
+            nil,
+            nil,
+            [2, 3, 4]
+          ]
+        )
         expect(a.send(:blossom_leaves, 0)).to eq([0])
         expect(a.send(:blossom_leaves, 4)).to eq([4])
         expect(a.send(:blossom_leaves, 5)).to eq([2, 3, 4])
@@ -104,14 +107,14 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    it "passes Van Rantwijk test 12" do
+    it 'passes Van Rantwijk test 12' do
       g = graph_class[[1, 2, 10], [2, 3, 11]]
       m = described_class.new(g).match(false)
       expect(m).to match_edges [[2, 3]]
       expect(m.weight(g)).to eq(11)
     end
 
-    it "passes Van Rantwijk test 13" do
+    it 'passes Van Rantwijk test 13' do
       g = graph_class[
         [1, 2, 5],
         [2, 3, 11],
@@ -122,7 +125,7 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       expect(m.weight(g)).to eq(11)
     end
 
-    it "passes Van Rantwijk test 14: max. cardinality" do
+    it 'passes Van Rantwijk test 14: max. cardinality' do
       g = graph_class[
         [1, 2, 5],
         [2, 3, 11],
@@ -133,7 +136,7 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       expect(m.weight(g)).to eq(10)
     end
 
-    it "passes Van Rantwijk test 15: floating-point weights" do
+    it 'passes Van Rantwijk test 15: floating-point weights' do
       g = graph_class[
         [1, 2, Math::PI],
         [2, 3, Math.exp(1)],
@@ -145,7 +148,7 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       expect(m.weight(g)).to be_within(0.00001).of(Math.sqrt(2.0) + Math.exp(1))
     end
 
-    it "passes Van Rantwijk test 16: negative weights" do
+    it 'passes Van Rantwijk test 16: negative weights' do
       g = graph_class[
         [1, 2, 2],
         [1, 3, -2],
@@ -161,8 +164,8 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       expect(m.weight(g)).to eq(-3)
     end
 
-    context "Van Rantwijk test 20: Uses S-blossom for augmentation" do
-      it "passes test 20-A" do
+    context 'Van Rantwijk test 20: Uses S-blossom for augmentation' do
+      it 'passes test 20-A' do
         g = graph_class[
           [1, 2, 8],
           [1, 3, 9],
@@ -174,7 +177,7 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
         expect(m.weight(g)).to eq(15)
       end
 
-      it "passes test 20-B" do
+      it 'passes test 20-B' do
         g = graph_class[
           [1, 2, 8],
           [1, 3, 9],
@@ -190,8 +193,8 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
     end
 
     # Van Rantwijk test 21
-    context "create S-blossom, relabel as T-blossom, use for augmentation" do
-      it "passes test 21-A" do
+    context 'create S-blossom, relabel as T-blossom, use for augmentation' do
+      it 'passes test 21-A' do
         g = graph_class[
           [1, 2, 9],
           [1, 3, 8],
@@ -204,7 +207,7 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
         expect(m).to match_edges [[1, 6], [2, 3], [4, 5]]
       end
 
-      it "passes test 21-B" do
+      it 'passes test 21-B' do
         g = graph_class[
           [1, 2, 9],
           [1, 3, 8],
@@ -217,7 +220,7 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
         expect(m).to match_edges [[1, 6], [2, 3], [4, 5]]
       end
 
-      it "passes test 21-C" do
+      it 'passes test 21-C' do
         g = graph_class[
           [1, 2, 9],
           [1, 3, 8],
@@ -231,8 +234,8 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    context "Van Rantwijk test 22" do
-      it "creates nested S-blossom, uses for augmentation" do
+    context 'Van Rantwijk test 22' do
+      it 'creates nested S-blossom, uses for augmentation' do
         g = graph_class[
           [1, 2, 9],
           [1, 3, 9],
@@ -247,8 +250,8 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    context "Van Rantwijk test 23" do
-      it "create S-blossom, relabel as S, include in nested S-blossom" do
+    context 'Van Rantwijk test 23' do
+      it 'create S-blossom, relabel as S, include in nested S-blossom' do
         g = graph_class[
           [1, 2, 10],
           [1, 7, 10],
@@ -265,8 +268,8 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    context "Van Rantwijk test 24" do
-      it "create nested S-blossom, augment, expand recursively" do
+    context 'Van Rantwijk test 24' do
+      it 'create nested S-blossom, augment, expand recursively' do
         g = graph_class[
           [1, 2, 8],
           [1, 3, 8],
@@ -284,8 +287,8 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    context "Van Rantwijk test 25" do
-      it "create S-blossom, relabel as T, expand" do
+    context 'Van Rantwijk test 25' do
+      it 'create S-blossom, relabel as T, expand' do
         g = graph_class[
           [1, 2, 23],
           [1, 5, 22],
@@ -301,8 +304,8 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    context "Van Rantwijk test 26" do
-      it "create nested S-blossom, relabel as T, expand" do
+    context 'Van Rantwijk test 26' do
+      it 'create nested S-blossom, relabel as T, expand' do
         g = graph_class[
           [1, 2, 19],
           [1, 3, 20],
@@ -319,8 +322,8 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    context "Van Rantwijk test 30" do
-      it "create blossom, relabel as T in more than one way, expand, augment" do
+    context 'Van Rantwijk test 30' do
+      it 'create blossom, relabel as T in more than one way, expand, augment' do
         g = graph_class[
           [1, 2, 45],
           [1, 5, 45],
@@ -338,8 +341,8 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    context "Van Rantwijk test 31" do
-      it "similar to test 30, but slightly different" do
+    context 'Van Rantwijk test 31' do
+      it 'similar to test 30, but slightly different' do
         g = graph_class[
           [1, 2, 45],
           [1, 5, 45],
@@ -357,10 +360,10 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    context "Van Rantwijk test 32" do
+    context 'Van Rantwijk test 32' do
       # create blossom, relabel as T, expand such that a new
       # least-slack S-to-free edge is produced, augment
-      it "see comment" do
+      it 'see comment' do
         g = graph_class[
           [1, 2, 45],
           [1, 5, 45],
@@ -378,11 +381,11 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    context "Van Rantwijk test 33" do
+    context 'Van Rantwijk test 33' do
       # create nested blossom, relabel as T in more than one way,
       # expand outer blossom such that inner blossom ends up on
       # an augmenting path
-      it "see comment" do
+      it 'see comment' do
         g = graph_class[
           [1, 2, 45],
           [1, 7, 45],
@@ -410,8 +413,8 @@ RSpec.describe GraphMatching::Algorithm::MWMGeneral do
       end
     end
 
-    context "Van Rantwijk test 34: nest, relabel, expand" do
-      it "create nested S-blossom, relabel as S, expand recursively" do
+    context 'Van Rantwijk test 34: nest, relabel, expand' do
+      it 'create nested S-blossom, relabel as S, expand recursively' do
         g = graph_class[
           [1, 2, 40],
           [1, 3, 40],