or-tools 0.14.0 → 0.14.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 29ccd0801b240802b1a4c5b3344aeb33feff36381aa3bc714c369ae1ea4912ea
-  data.tar.gz: 3d64b0da4320c77545b75d4830ee23040c5bb3d4eab568db23ab425e9ec0a3dd
+  metadata.gz: 5803be6e2ff6de980c6f1a89ab9ccda1e2ee264139229bca865103c8379dc4a2
+  data.tar.gz: 323fda85d36cc8dadb6720a23ac3e9eaa881e3618e74044c8b04773bb979c16e
 SHA512:
-  metadata.gz: 660915a87810919150acf5c5e5a67ae51c775a4df66a99293f3f58b6520615fd5519b7298a8d0f1d1127488faffaba8f326c7cd1740ff6d3ea2636a5e5e16062
-  data.tar.gz: 760fc1cf72fe774787b2ae0a28f6b1f3a7f8a954af855a86d7061945e112f88408cbf160117832568878f01bcbac86d8a6078b6c174778be8e51b025d04d6f8f
+  metadata.gz: 48c9eba03b16bb2ce63edf62d52f33fc88595e691543f68dd1a2090adb7212958331534a97b801c7f54acce6626461bc0e268ac312ea34c1c50045dedcfbb3b4
+  data.tar.gz: 8d91150d41201f8e47129ef3b48cfb4b63b5cb91c09c87d7ef01f87de4b82ff6d287fb2ca5e3b5a4984152bdb2e5a33f4c5b8fe9495d6a9e89ab81b31c1674ac

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.14.1 (2024-12-04)
+
+- Added support for parameters to `Solver`
+- Fixed error with `inspect` for `MathOpt` variables
+
 ## 0.14.0 (2024-10-22)
 
 - Added experimental support for `MathOpt`

data/README.md

@@ -93,15 +93,15 @@ Specify people and their availabililty
 people = [
   {
     availability: [
-      {starts_at: Time.parse("2020-01-01 08:00:00"), ends_at: Time.parse("2020-01-01 16:00:00")},
-      {starts_at: Time.parse("2020-01-02 08:00:00"), ends_at: Time.parse("2020-01-02 16:00:00")}
+      {starts_at: Time.parse("2025-01-01 08:00:00"), ends_at: Time.parse("2025-01-01 16:00:00")},
+      {starts_at: Time.parse("2025-01-02 08:00:00"), ends_at: Time.parse("2025-01-02 16:00:00")}
     ],
     max_hours: 40 # optional, applies to entire scheduling period
   },
   {
     availability: [
-      {starts_at: Time.parse("2020-01-01 08:00:00"), ends_at: Time.parse("2020-01-01 16:00:00")},
-      {starts_at: Time.parse("2020-01-03 08:00:00"), ends_at: Time.parse("2020-01-03 16:00:00")}
+      {starts_at: Time.parse("2025-01-01 08:00:00"), ends_at: Time.parse("2025-01-01 16:00:00")},
+      {starts_at: Time.parse("2025-01-03 08:00:00"), ends_at: Time.parse("2025-01-03 16:00:00")}
     ],
     max_hours: 20
   }
@@ -112,9 +112,9 @@ Specify shifts
 
 ```ruby
 shifts = [
-  {starts_at: Time.parse("2020-01-01 08:00:00"), ends_at: Time.parse("2020-01-01 16:00:00")},
-  {starts_at: Time.parse("2020-01-02 08:00:00"), ends_at: Time.parse("2020-01-02 16:00:00")},
-  {starts_at: Time.parse("2020-01-03 08:00:00"), ends_at: Time.parse("2020-01-03 16:00:00")}
+  {starts_at: Time.parse("2025-01-01 08:00:00"), ends_at: Time.parse("2025-01-01 16:00:00")},
+  {starts_at: Time.parse("2025-01-02 08:00:00"), ends_at: Time.parse("2025-01-02 16:00:00")},
+  {starts_at: Time.parse("2025-01-03 08:00:00"), ends_at: Time.parse("2025-01-03 16:00:00")}
 ]
 ```
 

data/ext/or-tools/constraint.cpp

@@ -70,6 +70,7 @@ namespace Rice::detail
 void init_constraint(Rice::Module& m) {
   Rice::define_class_under<Domain>(m, "Domain")
     .define_constructor(Rice::Constructor<Domain, int64_t, int64_t>())
+    .define_singleton_function("from_values", &Domain::FromValues)
     .define_method("min", &Domain::Min)
     .define_method("max", &Domain::Max);
 

data/ext/or-tools/linear.cpp

@@ -4,6 +4,7 @@
 
 using operations_research::MPConstraint;
 using operations_research::MPObjective;
+using operations_research::MPSolverParameters;
 using operations_research::MPSolver;
 using operations_research::MPVariable;
 
@@ -56,8 +57,94 @@ void init_linear(Rice::Module& m) {
     .define_method("set_coefficient", &MPObjective::SetCoefficient)
     .define_method("set_offset", &MPObjective::SetOffset)
     .define_method("set_maximization", &MPObjective::SetMaximization)
+    .define_method("best_bound", &MPObjective::BestBound)
     .define_method("set_minimization", &MPObjective::SetMinimization);
 
+  Rice::define_class_under<MPSolverParameters>(m, "MPSolverParameters")
+    .define_constructor(Rice::Constructor<MPSolverParameters>())
+    .define_method("reset", &MPSolverParameters::Reset)
+    .define_method(
+      "relative_mip_gap=",
+      [](MPSolverParameters& self, double relative_mip_gap) {
+        self.SetDoubleParam(MPSolverParameters::DoubleParam::RELATIVE_MIP_GAP, relative_mip_gap);
+      })
+    .define_method(
+      "relative_mip_gap",
+      [](MPSolverParameters& self) {
+        return self.GetDoubleParam(MPSolverParameters::DoubleParam::RELATIVE_MIP_GAP);
+      })
+    .define_method(
+      "primal_tolerance=",
+      [](MPSolverParameters& self, double primal_tolerance) {
+        self.SetDoubleParam(MPSolverParameters::DoubleParam::PRIMAL_TOLERANCE, primal_tolerance);
+      })
+    .define_method(
+      "primal_tolerance",
+      [](MPSolverParameters& self) {
+        return self.GetDoubleParam(MPSolverParameters::DoubleParam::PRIMAL_TOLERANCE);
+      })
+    .define_method(
+      "dual_tolerance=",
+      [](MPSolverParameters& self, double dual_tolerance) {
+        self.SetDoubleParam(MPSolverParameters::DoubleParam::DUAL_TOLERANCE, dual_tolerance);
+      })
+    .define_method(
+      "dual_tolerance",
+      [](MPSolverParameters& self) {
+        return self.GetDoubleParam(MPSolverParameters::DoubleParam::DUAL_TOLERANCE);
+      })
+    .define_method(
+      "presolve=",
+      [](MPSolverParameters& self, bool value) {
+        int presolve;
+        if (value) {
+          presolve = MPSolverParameters::PresolveValues::PRESOLVE_ON;
+        } else {
+          presolve = MPSolverParameters::PresolveValues::PRESOLVE_OFF;
+        }
+        self.SetIntegerParam(MPSolverParameters::IntegerParam::PRESOLVE, presolve);
+      })
+    .define_method(
+      "presolve",
+      [](MPSolverParameters& self) {
+        int presolve = self.GetIntegerParam(MPSolverParameters::IntegerParam::PRESOLVE);
+        return presolve != MPSolverParameters::PresolveValues::PRESOLVE_OFF;
+      })
+    .define_method(
+      "incrementality=",
+      [](MPSolverParameters& self, bool value) {
+        int incrementality;
+        if (value) {
+          incrementality = MPSolverParameters::IncrementalityValues::INCREMENTALITY_ON;
+        } else {
+          incrementality = MPSolverParameters::IncrementalityValues::INCREMENTALITY_OFF;
+        }
+        self.SetIntegerParam(MPSolverParameters::IntegerParam::INCREMENTALITY, incrementality);
+      })
+    .define_method(
+      "incrementality",
+      [](MPSolverParameters& self) {
+        int incrementality = self.GetIntegerParam(MPSolverParameters::IntegerParam::INCREMENTALITY);
+        return incrementality != MPSolverParameters::IncrementalityValues::INCREMENTALITY_OFF;
+      })
+    .define_method(
+      "scaling=",
+      [](MPSolverParameters& self, bool value) {
+        int scaling;
+        if (value) {
+          scaling = MPSolverParameters::ScalingValues::SCALING_ON;
+        } else {
+          scaling = MPSolverParameters::ScalingValues::SCALING_OFF;
+        }
+        self.SetIntegerParam(MPSolverParameters::IntegerParam::SCALING, scaling);
+      })
+    .define_method(
+      "scaling",
+      [](MPSolverParameters& self) {
+        int scaling = self.GetIntegerParam(MPSolverParameters::IntegerParam::SCALING);
+        return scaling != MPSolverParameters::ScalingValues::SCALING_OFF;
+      });
+
   Rice::define_class_under<MPSolver>(m, "Solver")
     .define_singleton_function(
       "_new",
@@ -109,9 +196,9 @@ void init_linear(Rice::Module& m) {
         return self.MakeRowConstraint(lb, ub);
       })
     .define_method(
-      "solve",
-      [](MPSolver& self) {
-        auto status = self.Solve();
+      "_solve",
+      [](MPSolver& self, MPSolverParameters& params) {
+        auto status = self.Solve(params);
 
         if (status == MPSolver::ResultStatus::OPTIMAL) {
           return Symbol("optimal");

data/ext/or-tools/math_opt.cpp

@@ -64,6 +64,7 @@ void init_math_opt(Rice::Module& m) {
 
   Rice::define_class_under<Variable>(mathopt, "Variable")
     .define_method("id", &Variable::id)
+    .define_method("name", &Variable::name)
     .define_method(
       "_eql?",
       [](Variable& self, Variable &other) {

data/lib/or_tools/solver.rb

@@ -34,6 +34,11 @@ module ORTools
       objective.set_minimization
     end
 
+    def solve(parameters = nil)
+      parameters ||= MPSolverParameters.new
+      _solve(parameters)
+    end
+
     private
 
     def set_objective(expr)

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.14.0"
+  VERSION = "0.14.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.14.0
+  version: 0.14.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-22 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -89,7 +89,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.16
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Operations research tools for Ruby