bipartite_graph 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9a66f77f8c4a20067ac92fc48800665accb90811
-  data.tar.gz: b4bab5f71d800b0da8fc8bff0c347b39e70eb1e4
+  metadata.gz: f94717ca0e980c145bc9eff819518bfc01054c2f
+  data.tar.gz: c88a438ba62df2581510b302298b004e69251d9b
 SHA512:
-  metadata.gz: 8f448ee0be1644f62e2365cfcdfc433f45309a8393cef8986491dc9129f4c795ca2757bd0aa059c9c652fa6ea08cc2d792287a515e3784d96a824d6b696c42a2
-  data.tar.gz: e32b1adc8829db74a08d1ac12c4fb54eaf56d4c7d3830991fc8031abe4712456e23380accb4304069ece23a269a1bac52363aad6ab5ec7e6d97e766fb7f92db1
+  metadata.gz: 0f886ec5b380f849f11b2c9da2e24e052124a7e69e30794700baf3eb032c853e1d5d97bd3a943a2ce77fc2a066eede3e051e93080798f78398bb312370fd9c00
+  data.tar.gz: e3513a47e120dfdfcbf403478d7d8815fe77c2c4d82c3cdc939b43fecda1b4d8a6b6ecf2fcaa9100665a4657c9a94ab7fb230c3ef87cf53b295d6c7c1a22df5b

data/bipartite_graph.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
-  spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
+  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 

data/lib/bipartite_graph/hungarian_algorithm.rb

@@ -53,6 +53,10 @@ module BipartiteGraph
         @labels[node]
       end
 
+      def total
+        graph.nodes.inject(0) {|sum, node| sum + label_for(node) }
+      end
+
       def recalculate_equality_graph
         equality_graph.clear
 
@@ -94,6 +98,10 @@ module BipartiteGraph
         2 * edges.length == graph.nodes.length
       end
 
+      def weight
+        edges.inject(0) {|sum, e| sum + e.weight }
+      end
+
       def add_edge(edge)
         edges << edge
       end
@@ -110,7 +118,7 @@ module BipartiteGraph
     end
 
     def solution
-      while !matching.perfect?
+      while matching.weight != labelling.total
         root = (graph.sources - matching.sources).first
         add_to_matching(root)
       end

data/lib/bipartite_graph/version.rb

@@ -1,3 +1,3 @@
 module BipartiteGraph
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/acceptance/weighted_matching_spec.rb

@@ -1,10 +1,9 @@
 require 'spec_helper'
 
 describe "weighted matchings" do
+  let(:graph) { BipartiteGraph.new }
   describe "simple example 1" do
     #http://www.cse.ust.hk/~golin/COMP572/Notes/Matching.pdf
-    let(:graph) { BipartiteGraph.new }
-
     before do
       [
         ['x1', 'y1', 1],
@@ -26,7 +25,6 @@ describe "weighted matchings" do
   end
 
   describe "simple example 2" do
-    let(:graph) { BipartiteGraph.new }
 
     before do
       [
@@ -40,7 +38,7 @@ describe "weighted matchings" do
         ['x3', 'y3', 8],
         ['x3', 'y4', 7],
         ['x4', 'y3', 6],
-        ['x4', 'y4', 4],
+        ['x4', 'y4', 4]
       ].each { |from, to, weight| graph.add_edge(from, to, weight) }
     end
 
@@ -53,4 +51,21 @@ describe "weighted matchings" do
     end
   end
 
+  describe "unbalanced example" do
+    before do
+      [
+        ['x1', 'y1', 3],
+        ['x1', 'y2', 1],
+        ['x1', 'y3', 11]
+      ].each { |from, to, weight| graph.add_edge(from, to, weight) }
+    end
+
+    it "finds the solution" do
+      matching = graph.max_weight_matching.edges.map {|e| [e.from, e.to] }
+
+      expect(matching).to match_array([
+        ['x1', 'y3']
+      ])
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipartite_graph
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Tom Close
@@ -55,12 +55,7 @@ dependencies:
 description: 
 email:
 - tom.close@cantab.net
-executables:
-- bundler
-- htmldiff
-- ldiff
-- rake
-- rspec
+executables: []
 extensions: []
 extra_rdoc_files: []
 files: