ruby-cbc 0.3.9 → 0.3.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b400b079a0878a8b069de6806d0a39307ec7cbaa
-  data.tar.gz: c12f4fb20c21d4f0a2f56ee300f14ab7af90a693
+  metadata.gz: fb4564011e69a1bd69b32e0717f34ade1b74ba08
+  data.tar.gz: 27e6c72d7a52f68782a4419565f654c6008ad8dd
 SHA512:
-  metadata.gz: 7d60c2ca3659d4de0f4c2fc5619b372755b6d403fef0daa62f04117b4fab5a9c3808e9b1f1369e59445ffae46bc08ee31f393984e3714a887c31f2cea5758174
-  data.tar.gz: d57f7aad33405975ca485b8a3cdb7ab5da8646ef49a1966b8dc0a6bb6ec5ab66a26236f3293ac0b30e3be23136bde96c2ea66fc0d4623d40e264660368334f9c
+  metadata.gz: b831fe254cfbcbb95360b09c779a2b952a9d1c64fc6b37ac23268eb2975fbbbe7c81e8d25f35c81e81a795a70d135b5f8e32d63956c472e4d86628dd57317798
+  data.tar.gz: ce4e9693f8448a70c2ad498bb6a0cac2af42a492ad328668830a8be1c58e54dce3d4305feb41e56b97de46e54925efd914be3b2cfdf7430a94b083aeb94269bd

data/lib/ruby-cbc/conflict_solver.rb

@@ -23,7 +23,6 @@ module Cbc
       loop do
         range_idxs = first_failing(conflict_set_size, crs, continuous: continuous, max_iterations: max_iter)
         break if range_idxs.nil?
-        puts "RANGE #{range_idxs}"
         crs = crs.restrict_to_n_constraints(range_idxs.max + 1)
         crs.move_constraint_to_start(range_idxs)
         clusters.insert(0, range_idxs.size)
@@ -34,7 +33,6 @@ module Cbc
         crs2 = crs.restrict_to_n_constraints(conflict_set_size)
         problem = Problem.from_compressed_row_storage(crs2, continuous: continuous)
         if infeasible?(problem)
-          puts "CONFLICT"
           clusters.delete_at(-1)
           break if clusters.size == conflict_set_size
 
@@ -54,8 +52,7 @@ module Cbc
         end
 
         conflict_set_size = crs.nb_constraints - clusters[-1]
-        puts "CLUSTERS #{clusters.inspect}"
-        puts "VARS #{crs.col_idx.uniq.size}"
+        # puts "CLUSTERS #{clusters.inspect}"
       end
       crs.model.constraints[0, conflict_set_size]
     end
@@ -77,18 +74,18 @@ module Cbc
           max_iterations -= 1
         end
         half_constraint_idx = (max_idx + min_idx) / 2
-        puts "Refining: [#{min_idx}:#{max_idx}] -> #{half_constraint_idx}"
+        # puts "Refining: [#{min_idx}:#{max_idx}] -> #{half_constraint_idx}"
         crs2 = crs.restrict_to_n_constraints(half_constraint_idx + 1)
         problem = Problem.from_compressed_row_storage(crs2, continuous: continuous)
         if infeasible?(problem)
           max_idx = half_constraint_idx
-          puts "                                INFEAS"
+          # puts "                                INFEAS"
         else
           min_idx = half_constraint_idx + 1
-          puts "                                FEAS"
+          # puts "                                FEAS"
         end
         if max_idx == min_idx
-          puts "found: max = #{max_idx} min = #{min_idx} nb = #{crs.nb_constraints}"
+          # puts "found: max = #{max_idx} min = #{min_idx} nb = #{crs.nb_constraints}"
           return nil if max_idx > crs.nb_constraints
           return min_idx..max_idx
         end

data/lib/ruby-cbc/problem.rb

@@ -86,13 +86,13 @@ module Cbc
 
       idx = 0
       while idx < @crs.nb_constraints do
-        c = model.constraints[idx]
+        c = @crs.model.constraints[idx]
         set_constraint_bounds(c, idx)
         idx += 1
       end
       idx = 0
       while idx < ccs.nb_vars do
-        v = model.vars[idx]
+        v = @crs.model.vars[idx]
         if continuous
           Cbc_wrapper.Cbc_setContinuous(@cbc_model, idx)
         else

data/lib/ruby-cbc/utils/compressed_row_storage.rb

@@ -44,11 +44,50 @@ module Util
     def restrict_to_n_constraints(nb_constraints)
       length_of_values = @row_ptr[nb_constraints]
       CompressedRowStorage.new.tap do |crs|
-        crs.model = @model
+        crs.model = @model.clone
         crs.variable_index = @variable_index
         crs.row_ptr = @row_ptr[0, nb_constraints + 1]
         crs.col_idx = @col_idx[0, length_of_values]
         crs.values = @values[0, length_of_values]
+        crs.delete_missing_vars
+      end
+    end
+
+    def present_var_indices
+      is_present = Array.new(@variable_index.count, false)
+      @col_idx.each do |col_idx|
+        is_present[col_idx] = true
+      end
+      is_present
+    end
+
+    def delete_missing_vars
+      at_least_one_missing = false
+      here = present_var_indices
+      new_idx = Array.new(@variable_index.count, -1)
+      idx = 0
+      current_index = 0
+      while idx < new_idx.size do
+        if here[idx]
+          new_idx[idx] = current_index
+          current_index += 1
+        else
+          at_least_one_missing = true
+        end
+        idx += 1
+      end
+
+      return unless at_least_one_missing
+
+      new_variable_index = {}
+      @variable_index.each do |v, i|
+        new_variable_index[v] = new_idx[i] if new_idx[i] != -1
+      end
+      @variable_index = new_variable_index
+      @col_idx.map! { |idx| new_idx[idx] }
+      @model.vars = Array.new(@variable_index.size)
+      @variable_index.each do |var, idx|
+        @model.vars[idx] = var
       end
     end
 

data/lib/ruby-cbc/version.rb

@@ -1,3 +1,3 @@
 module Cbc
-  VERSION = "0.3.9"
+  VERSION = "0.3.10"
 end

metadata

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