Merge branch 'master' into valgrind

Author: ankane

.github/workflows/build.yml

@@ -7,18 +7,18 @@ jobs:
       fail-fast: false
       matrix:
         include:
-          - ruby: 3.3
+          - ruby: "4.0"
             os: ubuntu-24.04
+          # - ruby: 3.4
+          #   os: ubuntu-24.04
+          # - ruby: 3.3
+          #   os: macos-26
           # - ruby: 3.2
           #   os: ubuntu-22.04
           # - ruby: 3.1
-          #   os: ubuntu-20.04
-          # - ruby: 3.2
-          #   os: macos-14
-          # - ruby: 3.1
-          #   os: macos-13
+          #   os: macos-15-intel
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v5
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}

CHANGELOG.md

@@ -1,3 +1,43 @@
+## 0.17.0 (2026-01-12)
+
+- Updated OR-Tools to 9.15
+
+## 0.16.3 (2026-01-05)
+
+- Fixed errors with Rice 4.9
+
+## 0.16.2 (2026-01-02)
+
+- Fixed error with Rice 4.8
+
+## 0.16.1 (2025-10-26)
+
+- Added `add_allowed_assignments` and `add_forbidden_assignments` methods to `CpModel`
+- Fixed error with Rice 4.7
+
+## 0.16.0 (2025-06-19)
+
+- Updated OR-Tools to 9.14
+
+## 0.15.1 (2025-06-18)
+
+- Fixed error with Rice 4.6
+
+## 0.15.0 (2025-02-17)
+
+- Updated OR-Tools to 9.12
+- Removed `pickup_positions` and `pickup_index_pairs` (use `pickup_position` instead)
+- Removed `delivery_positions` and `delivery_index_pairs` (use `delivery_position` instead)
+
+## 0.14.2 (2025-02-10)
+
+- Fixed error with Rice 4.5
+
+## 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`

Gemfile

@@ -4,5 +4,8 @@ gemspec
 
 gem "rake"
 gem "rake-compiler"
-gem "minitest", ">= 5"
-gem "ruby_memcheck"
+gem "minitest"
+gem "ruby_memcheck", require: false
+
+# https://github.com/ruby/openssl/issues/952
+gem "openssl" if RUBY_PLATFORM =~ /darwin/

NOTICE.txt

@@ -1,5 +1,5 @@
-Copyright 2010-2021 Google LLC
-Copyright 2020-2022 Andrew Kane
+Copyright 2010-2025 Google LLC
+Copyright 2020-2026 Andrew Kane
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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")}
 ]
 ```
 

Rakefile

@@ -3,25 +3,26 @@ require "rake/testtask"
 require "rake/extensiontask"
 require "ruby_memcheck"
 
-task default: :test
 test_config = lambda do |t|
-  t.libs << "test"
   t.pattern = "test/**/*_test.rb"
 end
-Rake::TestTask.new(:test, &test_config)
+Rake::TestTask.new(&test_config)
 
 namespace :test do
   RubyMemcheck::TestTask.new(:valgrind, &test_config)
 end
 
+task default: :test
+
 Rake::ExtensionTask.new("or-tools") do |ext|
   ext.name = "ext"
   ext.lib_dir = "lib/or_tools"
 end
 
 task :remove_ext do
-  path = "lib/or_tools/ext.bundle"
-  File.unlink(path) if File.exist?(path)
+  Dir["lib/or_tools/ext.{bundle,so}"].each do |path|
+    File.unlink(path)
+  end
 end
 
 Rake::Task["build"].enhance [:remove_ext]
@@ -31,8 +32,17 @@ task :update do
   require "open-uri"
   require "tmpdir"
 
-  version = "9.11.4210"
-  distributions = ["arm64_macOS-14.6.1", "x86_64_macOS-14.6.1", "amd64_ubuntu-24.04", "amd64_ubuntu-22.04", "amd64_ubuntu-20.04", "amd64_debian-11", "amd64_debian-12", "amd64_archlinux"]
+  version = "9.15.6755"
+  distributions = [
+    "arm64_macOS-26.2",
+    "x86_64_macOS-26.2",
+    "amd64_ubuntu-24.04",
+    "amd64_ubuntu-22.04",
+    "amd64_ubuntu-20.04",
+    "amd64_debian-12",
+    "amd64_debian-11",
+    "amd64_archlinux"
+  ]
 
   short_version = version.split(".").first(2).join(".")
   distributions.each do |dist|
@@ -48,3 +58,5 @@ task :update do
     puts "#{dist}: #{Digest::SHA256.file(dest).hexdigest}"
   end
 end
+
+CLEAN.add("tmp/or-tools")

ext/or-tools/assignment.cpp

@@ -1,6 +1,6 @@
 #include <ortools/graph/assignment.h>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::SimpleLinearSumAssignment;
 

ext/or-tools/bin_packing.cpp

@@ -1,39 +1,44 @@
-#include <ortools/algorithms/knapsack_solver.h>
+#include <string>
+#include <vector>
 
-#include "ext.h"
+#include <ortools/algorithms/knapsack_solver.h>
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::KnapsackSolver;
 
 using Rice::Array;
 using Rice::Object;
 using Rice::Symbol;
 
-namespace Rice::detail
-{
+namespace Rice::detail {
   template<>
-  struct Type<KnapsackSolver::SolverType>
-  {
-    static bool verify()
-    {
-      return true;
-    }
+  struct Type<KnapsackSolver::SolverType> {
+    static bool verify() { return true; }
   };
 
   template<>
-  class From_Ruby<KnapsackSolver::SolverType>
-  {
+  class From_Ruby<KnapsackSolver::SolverType> {
   public:
-    KnapsackSolver::SolverType convert(VALUE x)
-    {
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
+    double is_convertible(VALUE value) { return Convertible::Exact; }
+
+    KnapsackSolver::SolverType convert(VALUE x) {
       auto s = Symbol(x).str();
       if (s == "branch_and_bound") {
         return KnapsackSolver::KNAPSACK_MULTIDIMENSION_BRANCH_AND_BOUND_SOLVER;
       } else {
         throw std::runtime_error("Unknown solver type: " + s);
       }
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
-}
+} // namespace Rice::detail
 
 void init_bin_packing(Rice::Module& m) {
   Rice::define_class_under<KnapsackSolver>(m, "KnapsackSolver")

ext/or-tools/constraint.cpp

@@ -1,11 +1,15 @@
+#include <string>
+#include <vector>
+
 #include <google/protobuf/text_format.h>
 #include <ortools/sat/cp_model.h>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::Domain;
 using operations_research::sat::BoolVar;
 using operations_research::sat::Constraint;
+using operations_research::sat::TableConstraint;
 using operations_research::sat::CpModelBuilder;
 using operations_research::sat::CpSolverResponse;
 using operations_research::sat::CpSolverStatus;
@@ -27,23 +31,22 @@ using Rice::Symbol;
 Class rb_cBoolVar;
 Class rb_cSatIntVar;
 
-namespace Rice::detail
-{
+namespace Rice::detail {
   template<>
-  struct Type<LinearExpr>
-  {
-    static bool verify()
-    {
-      return true;
-    }
+  struct Type<LinearExpr> {
+    static bool verify() { return true; }
   };
 
   template<>
-  class From_Ruby<LinearExpr>
-  {
+  class From_Ruby<LinearExpr> {
   public:
-    LinearExpr convert(VALUE v)
-    {
+    From_Ruby() = default;
+
+    explicit From_Ruby(Arg* arg) : arg_(arg) { }
+
+    double is_convertible(VALUE value) { return Convertible::Exact; }
+
+    LinearExpr convert(VALUE v) {
       LinearExpr expr;
 
       Rice::Object utils = Rice::define_module("ORTools").const_get("Utils");
@@ -64,12 +67,16 @@ namespace Rice::detail
 
       return expr;
     }
+
+  private:
+    Arg* arg_ = nullptr;
   };
-}
+} // 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);
 
@@ -104,6 +111,13 @@ void init_constraint(Rice::Module& m) {
         }
       });
 
+  Rice::define_class_under<TableConstraint, Constraint>(m, "SatTableConstraint")
+    .define_method(
+      "add_tuple",
+      [](TableConstraint& self, std::vector<int64_t> tuple) {
+        self.AddTuple(tuple);
+      });
+
   rb_cBoolVar = Rice::define_class_under<BoolVar>(m, "SatBoolVar")
     .define_method("name", &BoolVar::Name)
     .define_method("index", &BoolVar::index)
@@ -252,6 +266,16 @@ void init_constraint(Rice::Module& m) {
       [](CpModelBuilder& self, std::vector<IntVar> vars) {
         return self.AddAllDifferent(vars);
       })
+    .define_method(
+      "add_allowed_assignments",
+      [](CpModelBuilder& self, std::vector<LinearExpr> expressions) {
+        return self.AddAllowedAssignments(expressions);
+      })
+    .define_method(
+      "add_forbidden_assignments",
+      [](CpModelBuilder& self, std::vector<LinearExpr> expressions) {
+        return self.AddForbiddenAssignments(expressions);
+      })
     .define_method(
       "add_inverse_constraint",
       [](CpModelBuilder& self, std::vector<IntVar> variables, std::vector<IntVar> inverse_variables) {
@@ -392,7 +416,7 @@ void init_constraint(Rice::Module& m) {
         auto a = Array();
         auto assumptions = self.sufficient_assumptions_for_infeasibility();
         for (const auto& v : assumptions) {
-          a.push(v);
+          a.push(v, false);
         }
         return a;
       });

ext/or-tools/ext.cpp

@@ -1,7 +1,7 @@
 #include <ortools/base/version.h>
 #include <ortools/init/init.h>
-
-#include "ext.h"
+#include <rice/rice.hpp>
+#include <rice/stl.hpp>
 
 using operations_research::CppBridge;
 using operations_research::CppFlags;
@@ -15,8 +15,7 @@ void init_network_flows(Rice::Module& m);
 void init_routing(Rice::Module& m);
 
 extern "C"
-void Init_ext()
-{
+void Init_ext() {
   auto m = Rice::define_module("ORTools");
 
   m.define_singleton_function("lib_version", &operations_research::OrToolsVersionString);