ruby-cbc 0.3.7 → 0.3.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2de5ed8e62dc379bc8da7ae805eb03b316e615df
-  data.tar.gz: df00a0e1f03c468ad3d93b768fec26267c034e9b
+  metadata.gz: 3d05d2dddacdfb1243b0ccbe0db95ef785002175
+  data.tar.gz: b9ea06e2a20a3b60a8a28c7a7ccfac5f7af73e3f
 SHA512:
-  metadata.gz: e5896e52aace5c6ee29c49feb554b69532ffe9b88f67d01ccac1901aed594759180e860658db31f50a9a840b51c8b34e3ae3ccf80f3576d0e0cba0c46e6c6de8
-  data.tar.gz: 8261b051167142baf52e6debe96058b783bb6e32e6784984509bc2cf0a81bc5276e28b96a1c588abe289cf35afc5ce66f82b2dc12c7f66ee6bad50e98c409ca1
+  metadata.gz: 4d876f561b81578e8d1b69108e5c4e024eb2c52b66b34eeaade45b4f941d357145a2889e3ad71919bd0a979d7ee3f7a28d92223c263e67777a9a2cce842a8561
+  data.tar.gz: eb4aed1071260b46aacd4ec4c228a56a1dfb24e8e691c3d4e7ad941348e3521200d747413a75de80fca2bbef3e2a0456f81c66bc23637a9b84dcbe8ca82811e8

data/lib/ruby-cbc/conflict_solver.rb

@@ -10,12 +10,12 @@ module Cbc
     def find_conflict
       continuous = is_continuous_conflict?
       conflict_set = []
-      all_constraints = @model.constraints.to_a
+      all_constraints = @model.constraints
       nb_constraints = all_constraints.count
       loop do
         m = Model.new
         m.vars = @model.vars
-        m.enforce(conflict_set)
+        m.constraints = conflict_set
         return conflict_set if infeasible?(m, continuous: continuous)
 
         constraint_idx = first_failing(conflict_set, all_constraints, nb_constraints, continuous: continuous)
@@ -43,10 +43,9 @@ module Cbc
       loop do
         m = Model.new
         m.vars = @model.vars
-        m.enforce(conflict_set)
 
         half_constraints = (max_nb_constraints + min_nb_constraints) / 2
-        m.enforce(constraints.take(half_constraints))
+        m.constraints = conflict_set + constraints.take(half_constraints)
         if infeasible?(m, continuous: continuous)
           max_nb_constraints = half_constraints
         else

data/lib/ruby-cbc/model.rb

@@ -25,7 +25,7 @@ module Cbc
 
     def initialize(name: "ILP Problem")
       @vars = Set.new
-      @constraints = Set.new
+      @constraints = []
       @objective = nil
       @name = name
     end

data/lib/ruby-cbc/version.rb

@@ -1,3 +1,3 @@
 module Cbc
-  VERSION = "0.3.7"
+  VERSION = "0.3.8"
 end

metadata

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