bipartite_graph 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f94717ca0e980c145bc9eff819518bfc01054c2f
-  data.tar.gz: c88a438ba62df2581510b302298b004e69251d9b
+  metadata.gz: 4ea037a79cf9dbd088c8d4351057ea39f62bdfa3
+  data.tar.gz: ab0f8cc6fb801adf2a3460b01e45a36e7679638e
 SHA512:
-  metadata.gz: 0f886ec5b380f849f11b2c9da2e24e052124a7e69e30794700baf3eb032c853e1d5d97bd3a943a2ce77fc2a066eede3e051e93080798f78398bb312370fd9c00
-  data.tar.gz: e3513a47e120dfdfcbf403478d7d8815fe77c2c4d82c3cdc939b43fecda1b4d8a6b6ecf2fcaa9100665a4657c9a94ab7fb230c3ef87cf53b295d6c7c1a22df5b
+  metadata.gz: 0737da7745f9f99d8f2c7983d61d4b6277a840417afd5db021076733a024b811a345915fd1a6a9ac1a4ad1803a71a37bbb6b81f02f49a812e91609533977c7c6
+  data.tar.gz: 8a1b329e9270035a201e55cc036b29ed103e42073dcecea9c9f9d80e2e4aec7f8dbe356ca37e8389ed89f84d90e02c008f6d935cddcc3314fcb695700de978e6

data/lib/bipartite_graph.rb

@@ -1,5 +1,6 @@
 require "bipartite_graph/version"
 require "bipartite_graph/graph"
+require "bipartite_graph/complete_graph"
 require "bipartite_graph/edge"
 require "bipartite_graph/edge_set"
 require "bipartite_graph/hungarian_algorithm"

data/lib/bipartite_graph/complete_graph.rb

@@ -0,0 +1,34 @@
+require 'delegate'
+
+module BipartiteGraph
+  class CompleteGraph < SimpleDelegator
+    class FakeNode; end
+
+    def initialize(graph)
+      @original_graph = graph
+      @complete_graph = Graph.new
+
+      sinks   = graph.sinks.dup
+      sink_count = sinks.length
+      sources = graph.sources.dup
+      source_count = sources.length
+
+      if sink_count > source_count
+        (sink_count - source_count).times { sources << FakeNode.new }
+      elsif source_count > sink_count
+        (source_count - sink_count).times { sinks << FakeNode.new }
+      end
+
+      sources.each do |source|
+        sinks.each do |sink|
+          edge = graph.edge_between(source, sink)
+          weight = edge ? edge.weight : 0
+          @complete_graph.add_edge(source, sink, weight)
+        end
+      end
+
+      super(@complete_graph)
+    end
+
+  end
+end

data/lib/bipartite_graph/edge_set.rb

@@ -23,6 +23,9 @@ module BipartiteGraph
     def length
       to_a.length
     end
+    def empty?
+      to_a.empty?
+    end
 
     def from(node_or_nodes)
       from_set = Set.new(Array(node_or_nodes))

data/lib/bipartite_graph/graph.rb

@@ -26,6 +26,10 @@ module BipartiteGraph
       @nodes[key]
     end
 
+    def edge_between(a, b)
+      # horrendously inefficient
+      @edges.find {|e| e.from == a && e.to == b }
+    end
 
     def max_weight_matching
       HungarianAlgorithm.new(self).solution

data/lib/bipartite_graph/hungarian_algorithm.rb

@@ -1,13 +1,32 @@
 module BipartiteGraph
   class HungarianAlgorithm
-    attr_reader :labelling, :matching, :graph
+    attr_reader :labelling, :matching, :graph, :original_graph
 
     def initialize(graph)
-      @graph = graph
-      @labelling = Labelling.new(graph)
+      @original_graph = graph
+      @graph = BipartiteGraph::CompleteGraph.new(graph)
+      @labelling = Labelling.new(@graph)
       @matching = create_initial_matching
     end
 
+    def solution
+      while matching.weight != labelling.total
+        root = (graph.sources - matching.sources).first
+        add_to_matching(root)
+      end
+
+      restricted_matching(matching, original_graph)
+    end
+
+    def restricted_matching(matching, graph)
+      m = Matching.new(graph)
+
+      matching.edges.each do |edge|
+        m.add_edge(edge) if edge.weight > 0  # will exclude fake nodes as they're
+                                             # only reachable from 0 edges
+      end
+      m
+    end
 
     def create_initial_matching
       eq_graph = labelling.equality_graph
@@ -117,15 +136,6 @@ module BipartiteGraph
       end
     end
 
-    def solution
-      while matching.weight != labelling.total
-        root = (graph.sources - matching.sources).first
-        add_to_matching(root)
-      end
-
-      matching
-    end
-
     def equality_graph
       labelling.equality_graph
     end

data/lib/bipartite_graph/version.rb

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

data/spec/acceptance/weighted_matching_spec.rb

@@ -25,7 +25,6 @@ describe "weighted matchings" do
   end
 
   describe "simple example 2" do
-
     before do
       [
         ['x1', 'y1', 3],
@@ -46,7 +45,7 @@ describe "weighted matchings" do
       matching = graph.max_weight_matching.edges.map {|e| [e.from, e.to] }
 
       expect(matching).to match_array([
-        ['x1', 'y2'], ['x2', 'y1'], ['x3', 'y4'], ['x4', 'y3']
+        ['x2', 'y1'], ['x3', 'y2'], ['x4', 'y3'] # ['x1', 'y4'] with weight 0
       ])
     end
   end
@@ -68,4 +67,30 @@ describe "weighted matchings" do
       ])
     end
   end
+
+  describe "not connected-enough example" do
+    # the algorithm will run on some non-completely-connected graphs, but
+    # won't complete on all of them
+    # 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],
+        ['x3', 'y3', 8],
+        ['x3', 'y4', 7],
+        ['x4', 'y3', 6],
+        ['x4', 'y4', 4]
+      ].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([
+        ['x2', 'y1'], ['x3', 'y4'], ['x4', 'y3']
+      ])
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bipartite_graph
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Tom Close
@@ -74,6 +74,7 @@ files:
 - bipartite_graph.gemspec
 - lib/bipartite_graph.rb
 - lib/bipartite_graph/alternating_tree.rb
+- lib/bipartite_graph/complete_graph.rb
 - lib/bipartite_graph/edge.rb
 - lib/bipartite_graph/edge_set.rb
 - lib/bipartite_graph/graph.rb