graph_matching 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 9fb85654523ce9fe2560a9973b2371062627116e
-  data.tar.gz: 73dcf437cc9eeef96045c5d0a3a7ff9213f4e7bc
+SHA256:
+  metadata.gz: 5fa48ec20940e407788ff34b0193dc83d8c6ce4d95c562631b8d20171107839d
+  data.tar.gz: 97d33ef07e6ced8896713a083f97128aaedf961292e5a217533a5cc5010d25e5
 SHA512:
-  metadata.gz: 5ac775ea72a05fc3ab61b046f81e0b5e7cd24e3a7cfb58b7d3481351a0bc8ee3a3c3bd73457520cfc7d4c18b093698a86eead01783e46538ef4c50e97ef7bea4
-  data.tar.gz: 164e1863a6460a46fbb844463618e1ee1a1c95e20a830765fd6c590d68d6f4cdf034a5df3553060cebea63fdcc36a5e02aa515a6ca3ed58a40d3bcd077a371d2
+  metadata.gz: 514665406895b92245a4171560bafe40fd2366c90c907b90eb45cfd68d91434c7e54ae759c004a1480391a698249d2db4f74558e8f272061fc20824d74ecf134
+  data.tar.gz: 94febc02ecfd5350ea26d5c4d51fa6079cfe60a209a5826338213925af9ce91cc188334f4c364607e7fa05334489d60dd0369a47fc06aa34802a1625255ffd38

data/.rubocop.yml

@@ -3,6 +3,10 @@ inherit_from: .rubocop_todo.yml
 AllCops:
   TargetRubyVersion: 2.3
 
+# Personal preference
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
 Layout/MultilineOperationIndentation:
   EnforcedStyle: indented
 
@@ -18,11 +22,30 @@ Metrics/ClassLength:
 Metrics/MethodLength:
   Enabled: false
 
+# Too subtle to lint
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+# We use some mathematical symbols because those symbols are used in the papers
+# we reference.
+Style/AsciiComments:
+  AllowedChars:
+    - π
+    - ≠
+
+# Too subtle to lint. Favor semantic style.
+Style/BlockDelimiters:
+  Enabled: false
+
 # Avoid postfix conditionals, except on the shortest of lines. Never use postfix
 # conditional after an assignment.
 Style/IfUnlessModifier:
   Enabled: false
 
+# Too subtle to lint. Definitely use guard clauses though, they're great.
+Style/GuardClause:
+  Enabled: false
+
 # For this project, where performance matters, do not use the nil predicate method
 # (`nil?`), as it is slower than the `==` operator.
 Style/NilComparison:

data/.rubocop_todo.yml

@@ -6,74 +6,6 @@
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Cop supports --auto-correct.
-Layout/CommentIndentation:
-  Exclude:
-    - 'lib/graph_matching/algorithm/mcm_general.rb'
-
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterGuardClause:
-  Exclude:
-    - 'benchmark/mwm_general/incomplete_graphs/benchmark.rb'
-    - 'lib/graph_matching/algorithm/mcm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mcm_general.rb'
-    - 'lib/graph_matching/algorithm/mwm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mwm_general.rb'
-    - 'lib/graph_matching/algorithm/mwmg_delta_assertions.rb'
-    - 'lib/graph_matching/core_ext/set.rb'
-    - 'lib/graph_matching/graph/bigraph.rb'
-    - 'lib/graph_matching/graph/graph.rb'
-    - 'lib/graph_matching/graph/weighted.rb'
-    - 'lib/graph_matching/integer_vertexes.rb'
-    - 'lib/graph_matching/matching.rb'
-    - 'lib/graph_matching/visualize.rb'
-    - 'spec/spec_helper.rb'
-
-# Cop supports --auto-correct.
-Layout/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'graph_matching.gemspec'
-
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, no_empty_lines
-Layout/EmptyLinesAroundBlockBody:
-  Exclude:
-    - 'lib/graph_matching/algorithm/mcm_general.rb'
-
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines, beginning_only, ending_only
-Layout/EmptyLinesAroundClassBody:
-  Exclude:
-    - 'lib/graph_matching/algorithm/mcm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mcm_general.rb'
-    - 'lib/graph_matching/algorithm/mwm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mwm_general.rb'
-
-# Cop supports --auto-correct.
-Layout/EmptyLinesAroundMethodBody:
-  Exclude:
-    - 'lib/graph_matching/algorithm/mcm_general.rb'
-
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: empty_lines, empty_lines_except_namespace, empty_lines_special, no_empty_lines
-Layout/EmptyLinesAroundModuleBody:
-  Exclude:
-    - 'lib/graph_matching/algorithm/matching_algorithm.rb'
-    - 'lib/graph_matching/algorithm/mcm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mcm_general.rb'
-    - 'lib/graph_matching/algorithm/mwm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mwm_general.rb'
-
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: auto_detection, squiggly, active_support, powerpack, unindent
-Layout/IndentHeredoc:
-  Exclude:
-    - 'lib/graph_matching/errors.rb'
-
 Metrics/AbcSize:
   Max: 74
 
@@ -87,14 +19,6 @@ Metrics/ParameterLists:
 Metrics/PerceivedComplexity:
   Max: 17
 
-# Configuration parameters: Blacklist.
-# Blacklist: (?-mix:(^|\s)(EO[A-Z]{1}|END)(\s|$))
-Naming/HeredocDelimiterNaming:
-  Exclude:
-    - 'graph_matching.gemspec'
-    - 'lib/graph_matching/algorithm/mwm_general.rb'
-    - 'lib/graph_matching/errors.rb'
-
 # Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
 # AllowedNames: io, id, to, by, on, in, at, ip, db
 Naming/UncommunicativeMethodParamName:
@@ -124,33 +48,6 @@ Style/Alias:
   Exclude:
     - 'lib/graph_matching/ordered_set.rb'
 
-# Configuration parameters: AllowedChars.
-Style/AsciiComments:
-  Exclude:
-    - 'lib/graph_matching/algorithm/mwm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mwm_general.rb'
-
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, ProceduralMethods, FunctionalMethods, IgnoredMethods.
-# SupportedStyles: line_count_based, semantic, braces_for_chaining
-# ProceduralMethods: benchmark, bm, bmbm, create, each_with_object, measure, new, realtime, tap, with_object
-# FunctionalMethods: let, let!, subject, watch
-# IgnoredMethods: lambda, proc, it
-Style/BlockDelimiters:
-  Exclude:
-    - 'benchmark/mwm_general/incomplete_graphs/benchmark.rb'
-    - 'lib/graph_matching/algorithm/mcm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mwm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mwm_general.rb'
-    - 'lib/graph_matching/graph/graph.rb'
-    - 'lib/graph_matching/matching.rb'
-    - 'lib/graph_matching/ordered_set.rb'
-    - 'spec/graph_matching/algorithm/mcm_bipartite_spec.rb'
-
-Style/CommentedKeyword:
-  Exclude:
-    - 'lib/graph_matching/algorithm/mcm_general.rb'
-
 # Cop supports --auto-correct.
 # Configuration parameters: EnforcedStyle, SingleLineConditionsOnly, IncludeTernaryExpressions.
 # SupportedStyles: assign_to_condition, assign_inside_condition
@@ -164,146 +61,3 @@ Style/ConditionalAssignment:
 Style/EmptyElse:
   Exclude:
     - 'lib/graph_matching/algorithm/mwm_general.rb'
-
-# Cop supports --auto-correct.
-Style/Encoding:
-  Exclude:
-    - 'benchmark/mcm_bipartite/complete_bigraphs/benchmark.rb'
-    - 'benchmark/mcm_general/complete_graphs/benchmark.rb'
-    - 'benchmark/mwm_bipartite/complete_bigraphs/benchmark.rb'
-    - 'benchmark/mwm_bipartite/misc/calc_d2/benchmark.rb'
-    - 'benchmark/mwm_general/complete_graphs/benchmark.rb'
-    - 'benchmark/mwm_general/incomplete_graphs/benchmark.rb'
-    - 'graph_matching.gemspec'
-    - 'lib/graph_matching.rb'
-    - 'lib/graph_matching/algorithm/matching_algorithm.rb'
-    - 'lib/graph_matching/algorithm/mcm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mcm_general.rb'
-    - 'lib/graph_matching/algorithm/mwm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mwm_general.rb'
-    - 'lib/graph_matching/assertion.rb'
-    - 'lib/graph_matching/core_ext/set.rb'
-    - 'lib/graph_matching/directed_edge_set.rb'
-    - 'lib/graph_matching/errors.rb'
-    - 'lib/graph_matching/graph/bigraph.rb'
-    - 'lib/graph_matching/graph/graph.rb'
-    - 'lib/graph_matching/graph/weighted.rb'
-    - 'lib/graph_matching/graph/weighted_bigraph.rb'
-    - 'lib/graph_matching/graph/weighted_graph.rb'
-    - 'lib/graph_matching/integer_vertexes.rb'
-    - 'lib/graph_matching/matching.rb'
-    - 'lib/graph_matching/ordered_set.rb'
-    - 'lib/graph_matching/version.rb'
-    - 'lib/graph_matching/visualize.rb'
-    - 'spec/graph_matching/algorithm/matching_algorithm_spec.rb'
-    - 'spec/graph_matching/algorithm/mcm_bipartite_spec.rb'
-    - 'spec/graph_matching/algorithm/mcm_general_spec.rb'
-    - 'spec/graph_matching/algorithm/mwm_bipartite_spec.rb'
-    - 'spec/graph_matching/algorithm/mwm_general_spec.rb'
-    - 'spec/graph_matching/graph/bigraph_spec.rb'
-    - 'spec/graph_matching/graph/graph_spec.rb'
-    - 'spec/graph_matching/graph/weighted_spec.rb'
-    - 'spec/graph_matching/integer_vertexes_spec.rb'
-    - 'spec/graph_matching/matching_spec.rb'
-    - 'spec/graph_matching/visualize_spec.rb'
-    - 'spec/graph_matching_spec.rb'
-    - 'spec/spec_helper.rb'
-
-# Cop supports --auto-correct.
-Style/ExpandPathArguments:
-  Exclude:
-    - 'graph_matching.gemspec'
-    - 'spec/spec_helper.rb'
-
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: format, sprintf, percent
-Style/FormatString:
-  Exclude:
-    - 'benchmark/mcm_bipartite/complete_bigraphs/benchmark.rb'
-    - 'benchmark/mcm_general/complete_graphs/benchmark.rb'
-    - 'benchmark/mwm_bipartite/complete_bigraphs/benchmark.rb'
-    - 'benchmark/mwm_general/complete_graphs/benchmark.rb'
-    - 'benchmark/mwm_general/incomplete_graphs/benchmark.rb'
-
-# Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle.
-# SupportedStyles: when_needed, always, never
-Style/FrozenStringLiteralComment:
-  Exclude:
-    - 'Gemfile'
-    - 'Rakefile'
-    - 'benchmark/mcm_bipartite/complete_bigraphs/benchmark.rb'
-    - 'benchmark/mcm_general/complete_graphs/benchmark.rb'
-    - 'benchmark/mwm_bipartite/complete_bigraphs/benchmark.rb'
-    - 'benchmark/mwm_bipartite/misc/calc_d2/benchmark.rb'
-    - 'benchmark/mwm_general/complete_graphs/benchmark.rb'
-    - 'benchmark/mwm_general/incomplete_graphs/benchmark.rb'
-    - 'graph_matching.gemspec'
-    - 'lib/graph_matching.rb'
-    - 'lib/graph_matching/algorithm/matching_algorithm.rb'
-    - 'lib/graph_matching/algorithm/mcm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mcm_general.rb'
-    - 'lib/graph_matching/algorithm/mwm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mwm_general.rb'
-    - 'lib/graph_matching/algorithm/mwmg_delta_assertions.rb'
-    - 'lib/graph_matching/assertion.rb'
-    - 'lib/graph_matching/core_ext/set.rb'
-    - 'lib/graph_matching/directed_edge_set.rb'
-    - 'lib/graph_matching/errors.rb'
-    - 'lib/graph_matching/graph/bigraph.rb'
-    - 'lib/graph_matching/graph/graph.rb'
-    - 'lib/graph_matching/graph/weighted.rb'
-    - 'lib/graph_matching/graph/weighted_bigraph.rb'
-    - 'lib/graph_matching/graph/weighted_graph.rb'
-    - 'lib/graph_matching/integer_vertexes.rb'
-    - 'lib/graph_matching/matching.rb'
-    - 'lib/graph_matching/ordered_set.rb'
-    - 'lib/graph_matching/version.rb'
-    - 'lib/graph_matching/visualize.rb'
-    - 'profile/mwm_general/profile.rb'
-    - 'spec/graph_matching/algorithm/matching_algorithm_spec.rb'
-    - 'spec/graph_matching/algorithm/mcm_bipartite_spec.rb'
-    - 'spec/graph_matching/algorithm/mcm_general_spec.rb'
-    - 'spec/graph_matching/algorithm/mwm_bipartite_spec.rb'
-    - 'spec/graph_matching/algorithm/mwm_general_spec.rb'
-    - 'spec/graph_matching/graph/bigraph_spec.rb'
-    - 'spec/graph_matching/graph/graph_spec.rb'
-    - 'spec/graph_matching/graph/weighted_spec.rb'
-    - 'spec/graph_matching/integer_vertexes_spec.rb'
-    - 'spec/graph_matching/matching_spec.rb'
-    - 'spec/graph_matching/visualize_spec.rb'
-    - 'spec/graph_matching_spec.rb'
-    - 'spec/spec_helper.rb'
-
-# Configuration parameters: MinBodyLength.
-Style/GuardClause:
-  Exclude:
-    - 'lib/graph_matching/algorithm/mcm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mcm_general.rb'
-    - 'lib/graph_matching/algorithm/mwm_bipartite.rb'
-    - 'lib/graph_matching/algorithm/mwm_general.rb'
-    - 'lib/graph_matching/algorithm/mwmg_delta_assertions.rb'
-    - 'lib/graph_matching/assertion.rb'
-
-Style/MultipleComparison:
-  Exclude:
-    - 'lib/graph_matching/algorithm/mwmg_delta_assertions.rb'
-
-# Cop supports --auto-correct.
-# Configuration parameters: PreferredDelimiters.
-Style/PercentLiteralDelimiters:
-  Exclude:
-    - 'lib/graph_matching/algorithm/mwm_general.rb'
-    - 'spec/graph_matching/integer_vertexes_spec.rb'
-
-# Cop supports --auto-correct.
-Style/StderrPuts:
-  Exclude:
-    - 'lib/graph_matching/visualize.rb'
-
-# Cop supports --auto-correct.
-# Configuration parameters: MinSize.
-# SupportedStyles: percent, brackets
-Style/SymbolArray:
-  EnforcedStyle: brackets

data/.travis.yml

@@ -2,8 +2,13 @@ cache: bundler
 language: ruby
 notifications:
   email: false
+
+# Do not request the very latest ruby patch. It'll slow down the build by
+# making rvm download a ruby. Instead, specify only major/minor and travis
+# will just use whatever patch level it has, and that's good enough for this
+# project.
 rvm:
-  - "2.3.8"
-  - "2.4.5"
-  - "2.5.3"
-  - "2.6.1"
+  - "2.3"
+  - "2.4"
+  - "2.5"
+  - "2.6"

data/CHANGELOG.md

@@ -3,7 +3,12 @@
 This project follows [semver 2.0.0][1] and the recommendations
 of [keepachangelog.com][2].
 
-## Unreleased
+## 0.2.1 (2020-02-10)
+
+### Fixed
+
+- [#10](https://github.com/jaredbeck/graph_matching/pull/10) -
+   `WeightedBigraph#maximum_weighted_matching` hangs forever
 
 ## 0.2.0 (2019-02-15)
 

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in graph_matching.gemspec

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'bundler/gem_tasks'
 
 task(:spec).clear
@@ -9,4 +11,4 @@ end
 require 'rubocop/rake_task'
 RuboCop::RakeTask.new
 
-task default: [:rubocop, :spec]
+task default: %i[rubocop spec]

data/graph_matching.gemspec

@@ -1,5 +1,6 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
+# frozen_string_literal: true
+
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'graph_matching/version'
 
@@ -23,11 +24,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
   spec.required_ruby_version = '>= 2.3.0'
   spec.add_runtime_dependency 'rgl', '~> 0.5.0'
-  spec.add_development_dependency 'bundler', '~> 1.12'
-  spec.add_development_dependency 'pry-byebug', '~> 3.4'
-  spec.add_development_dependency 'rake', '~> 12.0'
-  spec.add_development_dependency 'rspec-core', '~> 3.6'
-  spec.add_development_dependency 'rspec-expectations', '~> 3.6'
-  spec.add_development_dependency 'rspec-mocks', '~> 3.6'
+  spec.add_development_dependency 'byebug', '~> 11.0'
+  spec.add_development_dependency 'rake', '~> 12.3'
+  spec.add_development_dependency 'rspec-core', '~> 3.8'
+  spec.add_development_dependency 'rspec-expectations', '~> 3.8'
+  spec.add_development_dependency 'rspec-mocks', '~> 3.8'
   spec.add_development_dependency 'rubocop', '~> 0.64.0'
 end

data/lib/graph_matching.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'graph_matching/core_ext/set'
 require 'graph_matching/graph/graph'

data/lib/graph_matching/algorithm/matching_algorithm.rb

@@ -1,10 +1,9 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../assertion'
 
 module GraphMatching
   module Algorithm
-
     # All matching algorithms operate on a graph, hence the
     # common constructor.
     class MatchingAlgorithm
@@ -18,6 +17,5 @@ module GraphMatching
         Assertion.new(obj)
       end
     end
-
   end
 end

data/lib/graph_matching/algorithm/mcm_bipartite.rb

@@ -1,11 +1,10 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../matching'
 require_relative 'matching_algorithm'
 
 module GraphMatching
   module Algorithm
-
     # `MCMBipartite` implements Maximum Cardinality Matching in
     # bipartite graphs.
     class MCMBipartite < MatchingAlgorithm
@@ -24,9 +23,11 @@ module GraphMatching
           predecessors = {}
           aug_path = nil
 
-          # Label unmatched vertexes in U with label R.  These R-vertexes
-          # are candidates for the start of an augmenting path.
-          unmarked = r = u.select { |i| m[i] == nil }
+          # Label unmatched vertexes in U with label R.
+          r = u.select { |i| m[i] == nil }
+
+          # These R-vertexes are candidates for the start of an augmenting path.
+          unmarked = r.dup.to_a
 
           # While there are unmarked R-vertexes
           loop do
@@ -47,6 +48,7 @@ module GraphMatching
 
               adj_u_in_m.each do |ui|
                 r << ui
+                unmarked << ui
                 predecessors[ui] = vi
               end
 
@@ -113,7 +115,6 @@ module GraphMatching
           m[v] != i && !t.include?(i)
         }
       end
-
     end
   end
 end

data/lib/graph_matching/algorithm/mcm_general.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../directed_edge_set'
 require_relative '../matching'
@@ -6,11 +6,9 @@ require_relative 'matching_algorithm'
 
 module GraphMatching
   module Algorithm
-
     # `MCMGeneral` implements Maximum Cardinality Matching in
     # general graphs (as opposed to bipartite).
     class MCMGeneral < MatchingAlgorithm
-
       # An LFlag represents a flag on an edge during Gabow's `l` function.
       class LFlag
         attr_reader :edge
@@ -66,17 +64,17 @@ module GraphMatching
             label[u] = first[u] = 0
           end
 
-        # E2 [Choose an edge ] Choose an edge xy, where x is an outer
-        # vertex. (An edge vw may be chosen twice in a search--once
-        # with x = v, and once with x = w.) If no such edge exists,
-        # go to E7. (Edges xy can be chosen in an arbitrary order. A
-        # possible choice method is "breadth-first": an outer vertex
-        # x = x1 is chosen, and edges (x1,y) are chosen in succeeding
-        # executions of E2, when all such edges have been chosen, the
-        # vertex x2 that was labeled immediately after x1 is chosen,
-        # and the process is repeated for x = x2. This breadth-first
-        # method requires that Algorithm E maintain a list of outer
-        # vertices, x1, x2, ...)
+          # E2 [Choose an edge ] Choose an edge xy, where x is an outer
+          # vertex. (An edge vw may be chosen twice in a search--once
+          # with x = v, and once with x = w.) If no such edge exists,
+          # go to E7. (Edges xy can be chosen in an arbitrary order. A
+          # possible choice method is "breadth-first": an outer vertex
+          # x = x1 is chosen, and edges (x1,y) are chosen in succeeding
+          # executions of E2, when all such edges have been chosen, the
+          # vertex x2 that was labeled immediately after x1 is chosen,
+          # and the process is repeated for x = x2. This breadth-first
+          # method requires that Algorithm E maintain a list of outer
+          # vertices, x1, x2, ...)
 
           searching = true
           visited_nodes = Set.new
@@ -91,9 +89,9 @@ module GraphMatching
             discovered.each do |y|
               visited_edges.add(x, y)
 
-        # E3. [Augment the matching.] If y is unmatched and y != u,
-        # set MATE(y) = x, call R(x, y): then go to E7 (R
-        # completes the augment along path (y)*P(x))
+              # E3. [Augment the matching.] If y is unmatched and y != u,
+              # set MATE(y) = x, call R(x, y): then go to E7 (R
+              # completes the augment along path (y)*P(x))
 
               if mate[y] == 0 && y != u
                 mate[y] = x
@@ -101,18 +99,18 @@ module GraphMatching
                 searching = false # go to E7
                 break
 
-        # E4. [Assign edge labels.] If y is outer, call L, then go to
-        # E2 (L assigns edge label n(xy) to nonouter vertices in P(x)
-        # and P(y))
+              # E4. [Assign edge labels.] If y is outer, call L, then go to
+              # E2 (L assigns edge label n(xy) to nonouter vertices in P(x)
+              # and P(y))
 
               elsif outer?(label[y])
                 l(x, y, first, label, mate, q, visited_nodes)
 
-        # E5. [Assign a vertex label.] Set v <- MATE(y). If v is
-        # nonouter, set LABEL(v) <- x, FIRST(v) <- y, and go to E2
-        #
-        # E6. [Get next edge.] Go to E2 (y is nonouter and MATE(y) is
-        # outer, so edge xy adds nothing).
+              # E5. [Assign a vertex label.] Set v <- MATE(y). If v is
+              # nonouter, set LABEL(v) <- x, FIRST(v) <- y, and go to E2
+              #
+              # E6. [Get next edge.] Go to E2 (y is nonouter and MATE(y) is
+              # outer, so edge xy adds nothing).
 
               else
                 v = mate[y]
@@ -124,15 +122,14 @@ module GraphMatching
                   q.enq(v)
                 end
               end
-
             end
           end
 
-        #
-        # E7. [Stop the search] Set LABEL(O) <- -1. For all outer
-        # vertices i set LABEL(i) <- LABEL(MATE(i)) <- -1 Then go
-        # to E1 (now all vertexes are nonouter for the next search).
-        #
+          #
+          # E7. [Stop the search] Set LABEL(O) <- -1. For all outer
+          # vertices i set LABEL(i) <- LABEL(MATE(i)) <- -1 Then go
+          # to E1 (now all vertexes are nonouter for the next search).
+          #
 
           label[0] = -1
           label.each_with_index do |obj, ix|
@@ -140,8 +137,7 @@ module GraphMatching
               label[ix] = label[mate[ix]] = -1
             end
           end
-
-        end # while e0_loop
+        end
 
         Matching.gabow(mate)
       end
@@ -155,7 +151,6 @@ module GraphMatching
       # vertex in both P(x) and P(y). Then it labels all nonouter
       # vertices preceding join in P(x) or P(y).
       def l(x, y, first, label, mate, q, visited_nodes)
-
         # L0. [Initialize.] Set r <- FIRST(x), s <= FIRST(y).
         # If r = s, return (no vertices can be labeled).
         # Otherwise flag r and s. (Steps L1-L2 find join by advancing
@@ -184,10 +179,10 @@ module GraphMatching
             s = temp
           end
 
-        # L2. [Next nonouter vertex.] Set r <- FIRST(LABEL(MATE(r)))
-        # (r is set to the next nonouter vertex in P(x) or P(y)). If
-        # r is not flagged, flag r and go to L1 Otherwise set
-        # join <- r and go to L3.
+          # L2. [Next nonouter vertex.] Set r <- FIRST(LABEL(MATE(r)))
+          # (r is set to the next nonouter vertex in P(x) or P(y)). If
+          # r is not flagged, flag r and go to L1 Otherwise set
+          # join <- r and go to L3.
 
           r = first[label[mate[r]]]
           if label[r].is_a?(LFlag)
@@ -204,10 +199,9 @@ module GraphMatching
         # set v <- FIRST(y) and do L4. Then go to L5.
 
         [first[x], first[y]].each do |v|
-
-        # L4 [Label v] If v != join, set LABEL(v) <- n(xy), FIRST(v) <- join,
-        # v <- FIRST(LABEL(MATE(v))) and repeat step L4
-        # Otherwise continue as specified in L3.
+          # L4 [Label v] If v != join, set LABEL(v) <- n(xy), FIRST(v) <- join,
+          # v <- FIRST(LABEL(MATE(v))) and repeat step L4
+          # Otherwise continue as specified in L3.
 
           until v == join
             label[v] = n(x, y)
@@ -250,7 +244,6 @@ module GraphMatching
       # does not set MATE(w) <- v. This is done in step E3 or another
       # call to R.) R is a recursive routine.
       def r(v, w, label, mate)
-
         # R1. [Match v to w ] Set t <- MATE(v), MATE(v) <- w.
         # If MATE(t) != v, return (the path is completely re-matched)
 
@@ -282,8 +275,6 @@ module GraphMatching
       def vertex_label?(label_value)
         label_value.is_a?(Integer) && label_value > 0
       end
-
     end
-
   end
 end

data/lib/graph_matching/algorithm/mwm_bipartite.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../graph/weighted_bigraph'
 require_relative '../matching'
@@ -6,12 +6,14 @@ require_relative 'matching_algorithm'
 
 module GraphMatching
   module Algorithm
-
     # `MWMBipartite` implements Maximum Weighted Matching in
     # bipartite graphs.  It extends Maximum Cardinality
     # Matching for `Weighted` graphs.
+    #
+    # > In each stage we look for an augmenting path, as in the simple algorithm
+    # > for Problem 1 [Maximum Cardinality Matching], except that we use only
+    # > edges with zero slack. (Galil, 1986, p. 30)
     class MWMBipartite < MCMBipartite
-
       def initialize(graph)
         assert(graph).is_a(Graph::WeightedBigraph)
         super
@@ -50,13 +52,14 @@ module GraphMatching
               t << j
               predecessors[j] = i
 
-              # If there are matched edges, follow each to a dog and
-              # label the dog with S.  Otherwise, backtrack to
-              # construct an augmenting path.
+              # If `j` has matched edges (other than the one we just traversed,
+              # `i`) then follow each to a dog and label the dog with S.
+              # Otherwise, backtrack to construct an augmenting path.
               m_dogs = matched_adjacent(j, i, g, m)
 
               m_dogs.each do |md|
                 s << md
+                q << md
                 predecessors[md] = j
               end
 

data/lib/graph_matching/algorithm/mwm_general.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative '../graph/weighted_graph'
 require_relative '../matching'
@@ -6,11 +6,9 @@ require_relative 'matching_algorithm'
 
 module GraphMatching
   module Algorithm
-
     # `MWMGeneral` implements Maximum Weighted Matching in
     # general graphs.
     class MWMGeneral < MatchingAlgorithm
-
       # If b is a top-level blossom,
       # label[b] is 0 if b is unlabeled (free);
       #             1 if b is an S-vertex/blossom;
@@ -19,7 +17,7 @@ module GraphMatching
       LBL_S = 1
       LBL_T = 2
       LBL_CRUMB = 5
-      LBL_NAMES = %w(Free S T Crumb).freeze
+      LBL_NAMES = %w[Free S T Crumb].freeze
 
       def initialize(graph)
         assert(graph).is_a(Graph::WeightedGraph)

data/lib/graph_matching/algorithm/mwmg_delta_assertions.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module GraphMatching
   module Algorithm
     # Can be mixed into MWMGeneral to add runtime assertions
@@ -67,7 +69,7 @@ module GraphMatching
           end
           next if @best_edge[b].nil?
           i, j = @edges[@best_edge[b]].to_a
-          unless @in_blossom[i] == b || @in_blossom[j] == b
+          unless @in_blossom.values_at(i, j).include?(b)
             raise 'Assertion failed'
           end
           unless @in_blossom[i] != b || @in_blossom[j] != b

data/lib/graph_matching/assertion.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module GraphMatching
   # Provides expressive methods for common runtime assertions, e.g.

data/lib/graph_matching/core_ext/set.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'set'
 

data/lib/graph_matching/directed_edge_set.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module GraphMatching
   # A `DirectedEdgeSet` is simply a set of directed edges in a

data/lib/graph_matching/errors.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module GraphMatching
   class GraphMatchingError < StandardError
@@ -7,9 +7,9 @@ module GraphMatching
   # no-doc
   class InvalidVertexNumbering < GraphMatchingError
     def initialize(msg = nil)
-      msg ||= <<-EOS
-Expected vertexes to be consecutive positive integers \
-starting with zero
+      msg ||= <<~EOS
+        Expected vertexes to be consecutive positive integers \
+        starting with zero
       EOS
       super(msg)
     end

data/lib/graph_matching/graph/bigraph.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'rgl/bipartite'
 require_relative 'graph'

data/lib/graph_matching/graph/graph.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'rgl/adjacency'
 require 'rgl/connected_components'

data/lib/graph_matching/graph/weighted.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module GraphMatching
   module Graph

data/lib/graph_matching/graph/weighted_bigraph.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'weighted'
 require_relative '../algorithm/mwm_bipartite'

data/lib/graph_matching/graph/weighted_graph.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require_relative 'weighted'
 require_relative '../algorithm/mwm_general'

data/lib/graph_matching/integer_vertexes.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module GraphMatching
   # Converts the vertices of a graph to integers.  Many graph

data/lib/graph_matching/matching.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module GraphMatching
   # > In .. graph theory, a matching .. in a graph is a set of

data/lib/graph_matching/ordered_set.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 module GraphMatching
   # An `OrderedSet` acts like a `Set`, but preserves insertion order.

data/lib/graph_matching/version.rb

@@ -1,8 +1,8 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 # no-doc
 module GraphMatching
   def self.gem_version
-    ::Gem::Version.new('0.2.0')
+    ::Gem::Version.new('0.2.1')
   end
 end

data/lib/graph_matching/visualize.rb

@@ -1,4 +1,4 @@
-# encoding: utf-8
+# frozen_string_literal: true
 
 require 'open3'
 require 'rgl/rdot'
@@ -6,8 +6,8 @@ require 'rgl/rdot'
 module GraphMatching
   # Renders `GraphMatching::Graph` objects using `graphviz`.
   class Visualize
-    TMP_DIR = '/tmp/graph_matching'.freeze
-    USR_BIN_ENV = '/usr/bin/env'.freeze
+    TMP_DIR = '/tmp/graph_matching'
+    USR_BIN_ENV = '/usr/bin/env'
 
     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'
+      warn 'Executable not found: dot'
+      warn 'Please install graphviz'
       exit(1)
     end
 
@@ -56,7 +56,7 @@ module GraphMatching
 
     def assert_usr_bin_env_exists
       return if File.exist?(USR_BIN_ENV)
-      $stderr.puts "File not found: #{USR_BIN_ENV}"
+      warn "File not found: #{USR_BIN_ENV}"
       exit(1)
     end
 
@@ -85,8 +85,8 @@ 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 se
+      warn 'Failed to generate .png'
+      warn se
       exit(1)
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: graph_matching
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Jared Beck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-16 00:00:00.000000000 Z
+date: 2020-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rgl
@@ -25,89 +25,75 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 0.5.0
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '11.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
-- !ruby/object:Gem::Dependency
-  name: pry-byebug
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '11.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: rspec-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec-expectations
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rspec-mocks
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.6'
+        version: '3.8'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
@@ -181,8 +167,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.2.3
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Finds maximum matchings in undirected graphs.