ruby-cbc 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: def94f63dff658ab3ab9eeeccea2035d7d7e48b0
-  data.tar.gz: 69d3ebaa3e51a0d84bbd36ec51de60284146850a
+  metadata.gz: c4c35ac50e1d6033308676657596808d43ee1562
+  data.tar.gz: 93ae6e4aa7b33bd8f17585d6a6ac20d671054e2e
 SHA512:
-  metadata.gz: 9dc9707ea5aea3055b058a373e3490332f86d2ce2a7f3954bafd054dbce1f81d37dec5c72d7948cd20aa21e6353f6b76935af8aafe337c83a3d80dbfea699a14
-  data.tar.gz: 13daf4f282e9c9863a9c23d00c296924b0e7c30c31951343a43b6538953fa64e1126c0726b985e1cb6775f84ef84156cac2fd83a5ce8a0a9d9c660a6d3cd43db
+  metadata.gz: 68893fc94cab781da6b5728f9e26752161394c252b9b558162c0fa2926bf4458ec47a7585c6c61e51d0e8dc849f26f8590fa86f63904d25dde1cd206f6f1d7a0
+  data.tar.gz: afa5911247b564e559025151f816351e9f9b3871de8922fdb4db50faa8e01f3abc522e960ae58bf6300eb829c2ebbd47ef62a39c7d0e5dabb81af9748ee992e0

data/lib/ruby-cbc/conflict_solver.rb

@@ -8,24 +8,29 @@ module Cbc
 
     # Assuming there is a conflict
     def find_conflict
+      continuous = is_continuous_conflict?
       conflict_set = []
       all_constraints = @model.constraints.to_a
       loop do
         m = Model.new
         m.vars = @model.vars
         m.enforce(conflict_set)
-        return conflict_set if infeasible?(m)
+        return conflict_set if infeasible?(m, continuous: continuous)
 
-        constraint = first_failing(conflict_set, all_constraints)
+        constraint = first_failing(conflict_set, all_constraints, continuous: continuous)
         return conflict_set if !constraint
 
         conflict_set << constraint
       end
     end
 
+    def is_continuous_conflict?
+      infeasible?(@model, continuous: true)
+    end
+
   private
     # finds the first constraint from constraints that makes the problem infeasible
-    def first_failing(conflict_set, constraints)
+    def first_failing(conflict_set, constraints, continuous: false)
       min_nb_constraints = 1
       max_nb_constraints = constraints.count + 1
 
@@ -36,7 +41,7 @@ module Cbc
 
         nb_constraints = (max_nb_constraints + min_nb_constraints) / 2
         m.enforce(constraints.take(nb_constraints))
-        if infeasible?(m)
+        if infeasible?(m, continuous: continuous)
           max_nb_constraints = nb_constraints
         else
           min_nb_constraints = nb_constraints
@@ -50,8 +55,8 @@ module Cbc
       return nil
     end
 
-    def infeasible?(model)
-      problem = model.to_problem
+    def infeasible?(model, continuous: false)
+      problem = Problem.new(model, continuous: continuous)
       problem.solve
       problem.proven_infeasible?
     end

data/lib/ruby-cbc/model.rb

@@ -25,11 +25,11 @@ module Cbc
     end
 
     def bin_var(name: nil)
-      var(Ilp::Var::BINARY_KIND, nil, name)
+      var(Ilp::Var::BINARY_KIND, 0..1, name)
     end
 
     def bin_var_array(length, names: nil)
-      array_var(length, Ilp::Var::BINARY_KIND, nil, names)
+      array_var(length, Ilp::Var::BINARY_KIND, 0..1, names)
     end
 
     def cont_var(range = nil, name: nil)

data/lib/ruby-cbc/problem.rb

@@ -3,7 +3,7 @@ module Cbc
 
     attr_reader :model
 
-    def initialize(model)
+    def initialize(model, continuous: false)
 
       @int_arrays = []
       @double_arrays = []
@@ -71,14 +71,15 @@ module Cbc
         end
       end
       model.vars.each_with_index do |v, idx|
-        case v.kind
-        when Ilp::Var::INTEGER_KIND
-          Cbc_wrapper.Cbc_setInteger(@cbc_model, idx)
-        when Ilp::Var::BINARY_KIND
-          Cbc_wrapper.Cbc_setInteger(@cbc_model, idx)
-          v.bounds = 0..1
-        when Ilp::Var::CONTINUOUS_KIND
+        if continuous
           Cbc_wrapper.Cbc_setContinuous(@cbc_model, idx)
+        else
+          case v.kind
+          when Ilp::Var::INTEGER_KIND, Ilp::Var::BINARY_KIND
+            Cbc_wrapper.Cbc_setInteger(@cbc_model, idx)
+          when Ilp::Var::CONTINUOUS_KIND
+            Cbc_wrapper.Cbc_setContinuous(@cbc_model, idx)
+          end
         end
         Cbc_wrapper.Cbc_setColLower(@cbc_model, idx, v.lower_bound) unless v.lower_bound.nil?
         Cbc_wrapper.Cbc_setColUpper(@cbc_model, idx, v.upper_bound) unless v.upper_bound.nil?

data/lib/ruby-cbc/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruby-cbc
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Guillaume Verger