bipartite_graph 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4ea037a79cf9dbd088c8d4351057ea39f62bdfa3
-  data.tar.gz: ab0f8cc6fb801adf2a3460b01e45a36e7679638e
+  metadata.gz: 0337edfbdb191cec4827f50b61319f7b22f09b6e
+  data.tar.gz: 603a6ea7949fc5ceb857835b20f198dd24dfc4ef
 SHA512:
-  metadata.gz: 0737da7745f9f99d8f2c7983d61d4b6277a840417afd5db021076733a024b811a345915fd1a6a9ac1a4ad1803a71a37bbb6b81f02f49a812e91609533977c7c6
-  data.tar.gz: 8a1b329e9270035a201e55cc036b29ed103e42073dcecea9c9f9d80e2e4aec7f8dbe356ca37e8389ed89f84d90e02c008f6d935cddcc3314fcb695700de978e6
+  metadata.gz: 92c315de8e08462a47c4f16e9ae8ad8447f75658e6ac2efafff13dd728c1633472b9db0d4b97970b900605187ae3fb465d4e8f10c27996d68edaecdedd8215bf
+  data.tar.gz: 53cc47a8d53c86f049cdaa5fa82f828bf6051406c797db89eac109ad8a51109555011856b0343a085fe83d0d954e5baefa4f48b3a03bf8ecac7ca616aa2c9dd3

data/lib/bipartite_graph/hungarian_algorithm.rb

@@ -34,12 +34,14 @@ module BipartiteGraph
       matching = Matching.new(graph)
 
       eq_graph.sources.each do |source|
+        matched = false
         eq_graph.edges.from(source).each do |edge|
+          next if matched
           included = matching.has_node?(edge.to)
 
           if !included
             matching.add_edge(edge)
-            next
+            matched = true
           end
         end
       end
@@ -167,6 +169,10 @@ module BipartiteGraph
     def augment_labelling_using(tree)
       target_edges = graph.edges.from(tree.sources).not_to(tree.sinks)
 
+      if target_edges.empty?
+        raise "Target edge not found"
+      end
+
       slack = target_edges.map do |edge|
         labelling.label_for(edge.from) + labelling.label_for(edge.to) - edge.weight
       end

data/lib/bipartite_graph/version.rb

@@ -1,3 +1,3 @@
 module BipartiteGraph
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/spec/acceptance/weighted_matching_spec.rb

@@ -74,7 +74,7 @@ describe "weighted matchings" do
     # this example is constructed from simple example 2, so that the algorithm
     # will fail (unless extra edges are added)
     before do
-       [
+      [
         ['x1', 'y1', 3],
         ['x2', 'y1', 11],
         ['x3', 'y1', 10],
@@ -93,4 +93,26 @@ describe "weighted matchings" do
       ])
     end
   end
+
+  describe "massively degenerate example" do
+    before do
+      [
+        ['x1', 'y1', 1],
+        ['x2', 'y1', 1],
+        ['x3', 'y1', 1],
+        ['x1', 'y2', 1],
+        ['x2', 'y2', 1],
+        ['x3', 'y2', 1],
+      ].each { |from, to, weight| graph.add_edge(from, to, weight) }
+    end
+
+    it "finds the solution" do
+      matching = graph.max_weight_matching.edges
+
+      expect(matching.length).to eq(2)
+      expect(matching.edges.inject(0) {|s, e| s + e.weight}).to eq(2)
+    end
+
+
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: bipartite_graph
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Tom Close
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-16 00:00:00.000000000 Z
+date: 2015-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler