or-tools 0.13.1 → 0.14.1

data/lib/or_tools/variable.rb

@@ -0,0 +1,29 @@
+module ORTools
+  module Variable
+    include ExpressionMethods
+
+    def inspect
+      name
+    end
+
+    def vars
+      @vars ||= [self]
+    end
+  end
+
+  class MPVariable
+    include Variable
+  end
+
+  class SatIntVar
+    include Variable
+  end
+
+  class SatBoolVar
+    include Variable
+  end
+
+  class RoutingIntVar
+    include Variable
+  end
+end

data/lib/or_tools/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.13.1
+  version: 0.14.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-06 00:00:00.000000000 Z
+date: 2024-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.3.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: 4.3.3
 description:
 email: andrew@ankane.org
 executables: []
@@ -42,36 +42,33 @@ files:
 - ext/or-tools/ext.h
 - ext/or-tools/extconf.rb
 - ext/or-tools/linear.cpp
+- ext/or-tools/math_opt.cpp
 - ext/or-tools/network_flows.cpp
 - ext/or-tools/routing.cpp
 - ext/or-tools/vendor.rb
 - lib/or-tools.rb
 - lib/or_tools/basic_scheduler.rb
-- lib/or_tools/bool_var.rb
 - lib/or_tools/comparison.rb
-- lib/or_tools/comparison_operators.rb
 - lib/or_tools/constant.rb
 - lib/or_tools/cp_model.rb
 - lib/or_tools/cp_solver.rb
 - lib/or_tools/cp_solver_solution_callback.rb
-- lib/or_tools/int_var.rb
+- lib/or_tools/expression.rb
 - lib/or_tools/knapsack_solver.rb
-- lib/or_tools/linear_constraint.rb
-- lib/or_tools/linear_expr.rb
-- lib/or_tools/mp_variable.rb
+- lib/or_tools/math_opt/model.rb
+- lib/or_tools/math_opt/variable.rb
 - lib/or_tools/objective_solution_printer.rb
-- lib/or_tools/product_cst.rb
+- lib/or_tools/product.rb
 - lib/or_tools/routing_index_manager.rb
 - lib/or_tools/routing_model.rb
-- lib/or_tools/sat_int_var.rb
-- lib/or_tools/sat_linear_expr.rb
 - lib/or_tools/seating.rb
 - lib/or_tools/solver.rb
 - lib/or_tools/sudoku.rb
-- lib/or_tools/sum_array.rb
 - lib/or_tools/tsp.rb
+- lib/or_tools/utils.rb
 - lib/or_tools/var_array_and_objective_solution_printer.rb
 - lib/or_tools/var_array_solution_printer.rb
+- lib/or_tools/variable.rb
 - lib/or_tools/version.rb
 homepage: https://github.com/ankane/or-tools-ruby
 licenses:
@@ -92,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

data/lib/or_tools/bool_var.rb

@@ -1,9 +0,0 @@
-module ORTools
-  class BoolVar
-    include ComparisonOperators
-
-    def *(other)
-      SatLinearExpr.new([[self, other]])
-    end
-  end
-end

data/lib/or_tools/comparison_operators.rb

@@ -1,9 +0,0 @@
-module ORTools
-  module ComparisonOperators
-    ["==", "!=", ">", ">=", "<", "<="].each do |operator|
-      define_method(operator) do |other|
-        Comparison.new(operator, self, other)
-      end
-    end
-  end
-end

data/lib/or_tools/int_var.rb

@@ -1,5 +0,0 @@
-module ORTools
-  class IntVar
-    include ComparisonOperators
-  end
-end

data/lib/or_tools/linear_constraint.rb

@@ -1,50 +0,0 @@
-module ORTools
-  class LinearConstraint
-    attr_reader :expr, :lb, :ub
-
-    def initialize(expr, lb, ub)
-      @expr = expr
-      @lb = lb
-      @ub = ub
-    end
-
-    def to_s
-      if @lb > -Float::INFINITY && @ub < Float::INFINITY
-        if @lb == @ub
-          "#{@expr} == #{@lb}"
-        else
-          "#{@lb} <= #{@expr} <= #{@ub}"
-        end
-      elsif @lb > -Float::INFINITY
-        "#{@expr} >= #{@lb}"
-      elsif @ub < Float::INFINITY
-        "#{@expr} <= #{@ub}"
-      else
-        "Trivial inequality (always true)"
-      end
-    end
-
-    def inspect
-      "#<#{self.class.name} #{to_s}>"
-    end
-
-    def extract(solver)
-      coeffs = @expr.coeffs
-      constant = coeffs.delete(OFFSET_KEY) || 0.0
-      lb = -solver.infinity
-      ub = solver.infinity
-      if @lb > -Float::INFINITY
-        lb = @lb - constant
-      end
-      if @ub < Float::INFINITY
-        ub = @ub - constant
-      end
-
-      constraint = solver.constraint(lb, ub)
-      coeffs.each do |v, c|
-        constraint.set_coefficient(v, c.to_f)
-      end
-      constraint
-    end
-  end
-end

data/lib/or_tools/linear_expr.rb

@@ -1,85 +0,0 @@
-module ORTools
-  class LinearExpr
-    def solution_value
-      coeffs.sum { |var, coeff| var.solution_value * coeff }
-    end
-
-    def coeffs
-      coeffs = Hash.new(0.0)
-      stack = [[1.0, self]]
-      while stack.any?
-        current_multiplier, current_expression = stack.pop
-
-        # skip empty LinearExpr for backwards compatibility
-        next if current_expression.instance_of?(LinearExpr)
-
-        current_expression.add_self_to_coeff_map_or_stack(coeffs, current_multiplier, stack)
-      end
-      coeffs
-    end
-
-    def +(expr)
-      SumArray.new([self, expr])
-    end
-
-    def -(expr)
-      SumArray.new([self, -expr])
-    end
-
-    def *(other)
-      if is_a?(Constant)
-        ProductCst.new(other, @val)
-      else
-        ProductCst.new(self, other)
-      end
-    end
-
-    def /(cst)
-      ProductCst.new(self, 1.0 / other)
-    end
-
-    def -@
-      ProductCst.new(self, -1)
-    end
-
-    def ==(arg)
-      if arg.is_a?(Numeric)
-        LinearConstraint.new(self, arg, arg)
-      else
-        LinearConstraint.new(self - arg, 0.0, 0.0)
-      end
-    end
-
-    def >=(arg)
-      if arg.is_a?(Numeric)
-        LinearConstraint.new(self, arg, Float::INFINITY)
-      else
-        LinearConstraint.new(self - arg, 0.0, Float::INFINITY)
-      end
-    end
-
-    def <=(arg)
-      if arg.is_a?(Numeric)
-        LinearConstraint.new(self, -Float::INFINITY, arg)
-      else
-        LinearConstraint.new(self - arg, -Float::INFINITY, 0.0)
-      end
-    end
-
-    def to_s
-      "(empty)"
-    end
-
-    def inspect
-      "#<#{self.class.name} #{to_s}>"
-    end
-
-    def coerce(other)
-      if other.is_a?(Numeric)
-        [Constant.new(other), self]
-      else
-        raise TypeError, "#{self.class} can't be coerced into #{other.class}"
-      end
-    end
-  end
-end

data/lib/or_tools/mp_variable.rb

@@ -1,11 +0,0 @@
-module ORTools
-  class MPVariable < LinearExpr
-    def add_self_to_coeff_map_or_stack(coeffs, multiplier, stack)
-      coeffs[self] += multiplier
-    end
-
-    def to_s
-      name
-    end
-  end
-end

data/lib/or_tools/product_cst.rb

@@ -1,35 +0,0 @@
-module ORTools
-  class ProductCst < LinearExpr
-    attr_reader :expr, :coef
-
-    def initialize(expr, coef)
-      @expr = cast_to_lin_exp(expr)
-      # TODO improve message
-      raise TypeError, "expected numeric" unless coef.is_a?(Numeric)
-      @coef = coef
-    end
-
-    def to_s
-      if @coef == -1
-        "-#{@expr}"
-      else
-        expr = @expr.to_s
-        if expr.include?("+") || expr.include?("-")
-          expr = "(#{expr})"
-        end
-        "#{@coef} * #{expr}"
-      end
-    end
-
-    def add_self_to_coeff_map_or_stack(coeffs, multiplier, stack)
-      current_multiplier = multiplier * @coef
-      if current_multiplier
-        stack << [current_multiplier, @expr]
-      end
-    end
-
-    def cast_to_lin_exp(v)
-      v.is_a?(Numeric) ? Constant.new(v) : v
-    end
-  end
-end

data/lib/or_tools/sat_int_var.rb

@@ -1,29 +0,0 @@
-module ORTools
-  class SatIntVar
-    include ComparisonOperators
-
-    def *(other)
-      SatLinearExpr.new([[self, other]])
-    end
-
-    def +(other)
-      SatLinearExpr.new([[self, 1], [other, 1]])
-    end
-
-    def -(other)
-      SatLinearExpr.new([[self, 1], [-other, 1]])
-    end
-
-    def -@
-      SatLinearExpr.new([[self, -1]])
-    end
-
-    def to_s
-      name
-    end
-
-    def inspect
-      "#<#{self.class.name} #{to_s}>"
-    end
-  end
-end

data/lib/or_tools/sat_linear_expr.rb

@@ -1,59 +0,0 @@
-module ORTools
-  class SatLinearExpr
-    include ComparisonOperators
-
-    attr_reader :vars
-
-    def initialize(vars = [])
-      @vars = vars
-    end
-
-    def +(other)
-      add(other, 1)
-    end
-
-    def -(other)
-      add(other, -1)
-    end
-
-    def *(other)
-      if vars.size == 1
-        self.class.new([[vars[0][0], vars[0][1] * other]])
-      else
-        raise ArgumentError, "Multiplication not allowed here"
-      end
-    end
-
-    def to_s
-      vars.map do |v|
-        k = v[0]
-        k = k.respond_to?(:name) ? k.name : k.to_s
-        if v[1] == 1
-          k
-        else
-          "#{k} * #{v[1]}"
-        end
-      end.join(" + ").sub(" + -", " - ")
-    end
-
-    def inspect
-      "#<#{self.class.name} #{to_s}>"
-    end
-
-    private
-
-    def add(other, sign)
-      other_vars =
-        case other
-        when SatLinearExpr
-          other.vars
-        when BoolVar, SatIntVar, Integer
-          [[other, 1]]
-        else
-          raise ArgumentError, "Unsupported type: #{other.class.name}"
-        end
-
-      self.class.new(vars + other_vars.map { |a, b| [a, sign * b] })
-    end
-  end
-end

data/lib/or_tools/sum_array.rb

@@ -1,23 +0,0 @@
-module ORTools
-  class SumArray < LinearExpr
-    attr_reader :array
-
-    def initialize(array)
-      @array = array.map { |v| cast_to_lin_exp(v) }
-    end
-
-    def add_self_to_coeff_map_or_stack(coeffs, multiplier, stack)
-      @array.reverse_each do |arg|
-        stack << [multiplier, arg]
-      end
-    end
-
-    def cast_to_lin_exp(v)
-      v.is_a?(Numeric) ? Constant.new(v) : v
-    end
-
-    def to_s
-      "#{@array.map(&:to_s).reject { |v| v == "0" }.join(" + ")}".gsub(" + -", " - ")
-    end
-  end
-end