ruby-cbc 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4c35ac50e1d6033308676657596808d43ee1562
-  data.tar.gz: 93ae6e4aa7b33bd8f17585d6a6ac20d671054e2e
+  metadata.gz: 123d2f19ca6c970f616b7fc8809132bb40a25e90
+  data.tar.gz: a757a87c2e76369d441fe123ec73d399b62e8177
 SHA512:
-  metadata.gz: 68893fc94cab781da6b5728f9e26752161394c252b9b558162c0fa2926bf4458ec47a7585c6c61e51d0e8dc849f26f8590fa86f63904d25dde1cd206f6f1d7a0
-  data.tar.gz: afa5911247b564e559025151f816351e9f9b3871de8922fdb4db50faa8e01f3abc522e960ae58bf6300eb829c2ebbd47ef62a39c7d0e5dabb81af9748ee992e0
+  metadata.gz: a77e3149e6f303cecf36e20a8cd75aa5c09a34aacaa56a2dc47af448c8b11df48069ce2c30e65d0e6970819c254a757a94dae906254d89fee283ff0030ed62a8
+  data.tar.gz: 5ee5d181c9554e2c6e66719cda6e9c6bec32ea4c3f8884d222d798e93ecb2920c8ac246c7226b1ddb1ad00d880424d0e52a0e10056bf5fa10cae26cb0ccb0cec

data/lib/ruby-cbc/conflict_solver.rb

@@ -11,44 +11,50 @@ module Cbc
       continuous = is_continuous_conflict?
       conflict_set = []
       all_constraints = @model.constraints.to_a
+      nb_constraints = all_constraints.count
       loop do
         m = Model.new
         m.vars = @model.vars
         m.enforce(conflict_set)
         return conflict_set if infeasible?(m, continuous: continuous)
 
-        constraint = first_failing(conflict_set, all_constraints, continuous: continuous)
-        return conflict_set if !constraint
+        constraint_idx = first_failing(conflict_set, all_constraints, nb_constraints, continuous: continuous)
+        return conflict_set if !constraint_idx
 
-        conflict_set << constraint
+        nb_constraints = constraint_idx
+        conflict_set << all_constraints[constraint_idx]
       end
     end
 
     def is_continuous_conflict?
-      infeasible?(@model, continuous: true)
+      # Same model without objective
+      model = Model.new
+      model.vars = @model.vars
+      model.constraints = @model.constraints
+      infeasible?(model, continuous: true)
     end
 
   private
     # finds the first constraint from constraints that makes the problem infeasible
-    def first_failing(conflict_set, constraints, continuous: false)
+    def first_failing(conflict_set, constraints, nb_constraints, continuous: false)
       min_nb_constraints = 1
-      max_nb_constraints = constraints.count + 1
+      max_nb_constraints = nb_constraints + 1
 
       loop do
         m = Model.new
         m.vars = @model.vars
         m.enforce(conflict_set)
 
-        nb_constraints = (max_nb_constraints + min_nb_constraints) / 2
-        m.enforce(constraints.take(nb_constraints))
+        half_constraints = (max_nb_constraints + min_nb_constraints) / 2
+        m.enforce(constraints.take(half_constraints))
         if infeasible?(m, continuous: continuous)
-          max_nb_constraints = nb_constraints
+          max_nb_constraints = half_constraints
         else
-          min_nb_constraints = nb_constraints
+          min_nb_constraints = half_constraints
         end
         if max_nb_constraints - min_nb_constraints <= 1
           return nil if max_nb_constraints > constraints.count
-          return constraints[max_nb_constraints - 1]
+          return max_nb_constraints - 1
         end
       end
       # Shouldn't come here if the whole problem is infeasible

data/lib/ruby-cbc/version.rb

@@ -1,3 +1,3 @@
 module Cbc
-  VERSION = "0.3.1"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cbc
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Guillaume Verger
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler