or-tools 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b4b9e112aef49d6377cfb072df599cc64adb317169212e9811ba601946cda981
-  data.tar.gz: 437a96678ed5b1d0b83ae2a8535a9d7b2165ebb28f1b8bf3bac62e3495e65ec4
+  metadata.gz: 309c56f023b6cc67adcf41c3b8b41c491be25ff53b8fc59791370a8be3e97adb
+  data.tar.gz: af24caa0777d73df4b1ae089d40095534fe0186e7c479b376abc5b9172026dc7
 SHA512:
-  metadata.gz: 6cd5ae717f0d0a9f01b3d44e52d311b0b93c82369c48a9dee7b71ca83dbbd094f48b29033d02ec319f4e69233a4366b9b6bd1025670a08b58514d1d068a0b261
-  data.tar.gz: 4806b7bff7d478eda84bb8b5169f683e7df7c08dc0d146d5b0a7bddf52a1c8dd164f4ee0338a5e01841b7057303c20ecb82cb8d4c01e309ea7ebc3478ef305c5
+  metadata.gz: f030d0b629a7193a121c237889a9c9b81a6f0a8167bdddeb02ce08a1bd221e27ba4e92c1b641008b12565f538671ceab4dc9bb36ebc6c217cb2b0adcdae4c7f0
+  data.tar.gz: c383519b49d6e844e086dc61122f2a6dc8732560c5838e3c5684b71972e5910d28d1ab06f5686170b437ff90a9f521ca54189b12ec188eed1cc9fed46c238890

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.18.2 (2026-10-27)
+
+- Added `add_at_most_one` and `add_exactly_one` methods to `CpModel`
+- Added `objective?` and `clear_objective` methods to `CpModel`
+- Added more methods to `CpSolver`
+- Added more methods to `CpSolverSolutionCallback`
+
 ## 0.18.1 (2026-10-02)
 
 - Added support for breaks for routing

data/ext/or-tools/constraint.cpp

@@ -755,6 +755,16 @@ void init_constraint(Rice::Module& m) {
       [](CpModelBuilder& self, const std::vector<BoolVar>& literals) {
         return self.AddBoolOr(literals);
       })
+    .define_method(
+      "add_at_most_one",
+      [](CpModelBuilder& self, const std::vector<BoolVar>& literals) {
+        return self.AddAtMostOne(literals);
+      })
+    .define_method(
+      "add_exactly_one",
+      [](CpModelBuilder& self, const std::vector<BoolVar>& literals) {
+        return self.AddExactlyOne(literals);
+      })
     .define_method(
       "add_bool_and",
       [](CpModelBuilder& self, const std::vector<BoolVar>& literals) {
@@ -875,6 +885,16 @@ void init_constraint(Rice::Module& m) {
       [](CpModelBuilder& self, LinearExpr expr) {
         self.Minimize(expr);
       })
+    .define_method(
+      "clear_objective",
+      [](CpModelBuilder& self) {
+        self.ClearObjective();
+      })
+    .define_method(
+      "objective?",
+      [](CpModelBuilder& self) {
+        return self.HasObjective();
+      })
     .define_method(
       "add_hint",
       [](CpModelBuilder& self, Object var, Object value) {
@@ -926,9 +946,23 @@ void init_constraint(Rice::Module& m) {
       });
 
   Rice::define_class_under<CpSolverResponse>(m, "CpSolverResponse")
-    .define_method("objective_value", &CpSolverResponse::objective_value)
-    .define_method("num_conflicts", &CpSolverResponse::num_conflicts)
+    .define_method("best_objective_bound", &CpSolverResponse::best_objective_bound)
+    .define_method("deterministic_time", &CpSolverResponse::deterministic_time)
+    .define_method("gap_integral", &CpSolverResponse::gap_integral)
+    .define_method("inner_objective_lower_bound", &CpSolverResponse::inner_objective_lower_bound)
+    .define_method("num_binary_propagations", &CpSolverResponse::num_binary_propagations)
+    .define_method("num_booleans", &CpSolverResponse::num_booleans)
     .define_method("num_branches", &CpSolverResponse::num_branches)
+    .define_method("num_conflicts", &CpSolverResponse::num_conflicts)
+    .define_method("num_fixed_booleans", &CpSolverResponse::num_fixed_booleans)
+    .define_method("num_integer_propagations", &CpSolverResponse::num_integer_propagations)
+    .define_method("num_integers", &CpSolverResponse::num_integers)
+    .define_method("num_lp_iterations", &CpSolverResponse::num_lp_iterations)
+    .define_method("num_restarts", &CpSolverResponse::num_restarts)
+    .define_method("objective_value", &CpSolverResponse::objective_value)
+    .define_method("solution_info", &CpSolverResponse::solution_info)
+    .define_method("solve_log", &CpSolverResponse::solve_log)
+    .define_method("user_time", &CpSolverResponse::user_time)
     .define_method("wall_time", &CpSolverResponse::wall_time)
     .define_method(
       "solution_integer_value",
@@ -956,17 +990,11 @@ void init_constraint(Rice::Module& m) {
           throw std::runtime_error{"Unknown solver status"};
         }
       })
-    .define_method(
-      "solution_info",
-      [](CpSolverResponse& self) {
-        return self.solution_info();
-      })
     .define_method(
       "sufficient_assumptions_for_infeasibility",
       [](CpSolverResponse& self) {
-        auto a = Array();
-        auto assumptions = self.sufficient_assumptions_for_infeasibility();
-        for (const auto& v : assumptions) {
+        Array a;
+        for (const auto& v : self.sufficient_assumptions_for_infeasibility()) {
           a.push(v, false);
         }
         return a;

data/lib/or_tools/cp_solver.rb

@@ -1,10 +1,8 @@
-require "forwardable"
-
 module ORTools
   class CpSolver
-    extend Forwardable
-
-    def_delegators :@response, :objective_value, :num_conflicts, :num_branches, :wall_time
+    def parameters
+      @parameters ||= SatParameters.new
+    end
 
     def solve(model, observer = nil)
       @response = _solve(model, parameters, observer)
@@ -13,29 +11,78 @@ module ORTools
     end
 
     def value(var)
+      response = checked_response
+
       # could also check solution_size == 0
-      unless [:feasible, :optimal].include?(@response.status)
+      unless [:feasible, :optimal].include?(response.status)
         # could return nil, but raise error like Python library
         raise Error, "No solution found"
       end
 
       if var.is_a?(BoolVar)
-        _solution_boolean_value(@response, var)
+        _solution_boolean_value(response, var)
       else
-        _solution_integer_value(@response, var)
+        _solution_integer_value(response, var)
       end
     end
 
-    def solution_info
-      @response.solution_info
+    def objective_value
+      checked_response.objective_value
+    end
+
+    def best_objective_bound
+      checked_response.best_objective_bound
+    end
+
+    def num_booleans
+      checked_response.num_booleans
+    end
+
+    def num_conflicts
+      checked_response.num_conflicts
+    end
+
+    def num_branches
+      checked_response.num_branches
+    end
+
+    def num_binary_propagations
+      checked_response.num_binary_propagations
+    end
+
+    def num_integer_propagations
+      checked_response.num_integer_propagations
+    end
+
+    def deterministic_time
+      checked_response.deterministic_time
+    end
+
+    def wall_time
+      checked_response.wall_time
+    end
+
+    def user_time
+      checked_response.user_time
+    end
+
+    def solve_log
+      checked_response.solve_log
     end
 
     def sufficient_assumptions_for_infeasibility
-      @response.sufficient_assumptions_for_infeasibility
+      checked_response.sufficient_assumptions_for_infeasibility
     end
 
-    def parameters
-      @parameters ||= SatParameters.new
+    def solution_info
+      checked_response.solution_info
+    end
+
+    private
+
+    def checked_response
+      raise "solve() has not been called." if @response.nil?
+      @response
     end
   end
 end

data/lib/or_tools/cp_solver_solution_callback.rb

@@ -3,6 +3,8 @@ module ORTools
     attr_writer :response
 
     def value(expr)
+      # TODO uncomment in 0.19.0
+      # raise "solve() has not been called." unless response?
       case expr
       when SatIntVar
         @response&.solution_integer_value(expr)
@@ -13,12 +15,65 @@ module ORTools
       end
     end
 
-    def objective_value
-      @response&.objective_value
+    def response?
+      !@response.nil?
     end
 
     def stop_search
+      # TODO uncomment in 0.19.0
+      # raise "solve() has not been called." unless response?
       @stopped = true
     end
+
+    def objective_value
+      # TODO uncomment in 0.19.0
+      # raise "solve() has not been called." unless response?
+      @response&.objective_value
+    end
+
+    def best_objective_bound
+      raise "solve() has not been called." unless response?
+      @response.best_objective_bound
+    end
+
+    def num_booleans
+      raise "solve() has not been called." unless response?
+      @response.num_booleans
+    end
+
+    def num_conflicts
+      raise "solve() has not been called." unless response?
+      @response.num_conflicts
+    end
+
+    def num_branches
+      raise "solve() has not been called." unless response?
+      @response.num_branches
+    end
+
+    def num_integer_propagations
+      raise "solve() has not been called." unless response?
+      @response.num_integer_propagations
+    end
+
+    def num_binary_propagations
+      raise "solve() has not been called." unless response?
+      @response.num_binary_propagations
+    end
+
+    def deterministic_time
+      raise "solve() has not been called." unless response?
+      @response.deterministic_time
+    end
+
+    def wall_time
+      raise "solve() has not been called." unless response?
+      @response.wall_time
+    end
+
+    def user_time
+      raise "solve() has not been called." unless response?
+      @response.user_time
+    end
   end
 end

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.18.1"
+  VERSION = "0.18.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Andrew Kane