or-tools 0.3.1 → 0.4.1

data/ext/or-tools/vendor.rb

@@ -3,26 +3,26 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "7.7.7810"
+version = "8.1.8487"
 
 if RbConfig::CONFIG["host_os"] =~ /darwin/i
-  filename = "or-tools_MacOsX-10.15.5_v#{version}.tar.gz"
-  checksum = "764f290f6d916bc366913a37d93e6f83bd7969ad33515ccc1ca390f544d65721"
+  filename = "or-tools_MacOsX-10.15.7_v#{version}.tar.gz"
+  checksum = "cdf5d5c4dd10ddfa39eb951e6b8122b2a48c7d1dbd87bb5f792a7596aea8b8bb"
 else
   os = %x[lsb_release -is].chomp rescue nil
   os_version = %x[lsb_release -rs].chomp rescue nil
-  if os == "Ubuntu" && os_version == "18.04"
+  if os == "Ubuntu" && os_version == "20.04"
+    filename = "or-tools_ubuntu-20.04_v#{version}.tar.gz"
+    checksum = "2de596d649d9a0f0dfec8007d6e1018d8fdddced7aa340b4e68d02e61df89a2e"
+  elsif os == "Ubuntu" && os_version == "18.04"
     filename = "or-tools_ubuntu-18.04_v#{version}.tar.gz"
-    checksum = "12bdac29144b077b3f9ba602f947e4b9b9ce63ed3df4e325cda1333827edbcf8"
-  elsif os == "Ubuntu" && os_version == "16.04"
-    filename = "or-tools_ubuntu-16.04_v#{version}.tar.gz"
-    checksum = "cc696d342b97aa6cf7c62b6ae2cae95dfc665f2483d147c4117fdba434b13a53"
+    checksum = "201cf1d17379240311208f4c641bb5263ae19d8c4c1a6091d2778948fd375f48"
   elsif os == "Debian" && os_version == "10"
     filename = "or-tools_debian-10_v#{version}.tar.gz "
-    checksum = "3dd0299e9ad8d12fe6d186bfd59e63080c8e9f3c6b0489af9900c389cf7e4224"
+    checksum = "18028ef7287cd83eed3dafeae1243a9adb445675f45984e8d3c60ab9e2aa75bd"
   elsif os == "CentOS" && os_version == "8"
     filename = "or-tools_centos-8_v#{version}.tar.gz"
-    checksum = "1f7d8bce56807c4283374e05024ffac8afd81ff99063217418d02d626cf03088"
+    checksum = "e26229320f9b78315f0122b55d16093c79e2dc6c95d591f4788f323f27cfd3bf"
   else
     # there is a binary download for Windows
     # however, it's compiled with Visual Studio rather than MinGW (which RubyInstaller uses)

data/lib/or-tools.rb

@@ -11,12 +11,18 @@ require "or_tools/cp_solver_solution_callback"
 require "or_tools/int_var"
 require "or_tools/knapsack_solver"
 require "or_tools/linear_expr"
+require "or_tools/routing_index_manager"
 require "or_tools/routing_model"
 require "or_tools/sat_linear_expr"
 require "or_tools/sat_int_var"
 require "or_tools/solver"
 require "or_tools/version"
 
+# solution printers
+require "or_tools/objective_solution_printer"
+require "or_tools/var_array_solution_printer"
+require "or_tools/var_array_and_objective_solution_printer"
+
 # higher level interfaces
 require "or_tools/basic_scheduler"
 require "or_tools/seating"

data/lib/or_tools/cp_model.rb

@@ -25,5 +25,9 @@ module ORTools
     def sum(arr)
       arr.sum(SatLinearExpr.new)
     end
+
+    def inspect
+      to_s
+    end
   end
 end

data/lib/or_tools/cp_solver.rb

@@ -7,7 +7,7 @@ module ORTools
     def_delegators :@response, :objective_value, :num_conflicts, :num_branches, :wall_time
 
     def solve(model)
-      @response = _solve(model)
+      @response = _solve(model, parameters)
       @response.status
     end
 
@@ -20,13 +20,17 @@ module ORTools
     end
 
     def solve_with_solution_callback(model, observer)
-      @response = _solve_with_observer(model, observer, false)
+      @response = _solve_with_observer(model, parameters, observer, false)
       @response.status
     end
 
     def search_for_all_solutions(model, observer)
-      @response = _solve_with_observer(model, observer, true)
+      @response = _solve_with_observer(model, parameters, observer, true)
       @response.status
     end
+
+    def parameters
+      @parameters ||= SatParameters.new
+    end
   end
 end

data/lib/or_tools/cp_solver_solution_callback.rb

@@ -9,7 +9,7 @@ module ORTools
       when BoolVar
         @response.solution_boolean_value(expr)
       else
-        raise "Unsupported type"
+        raise "Unsupported type: #{expr.class.name}"
       end
     end
 

data/lib/or_tools/objective_solution_printer.rb

@@ -0,0 +1,18 @@
+module ORTools
+  class ObjectiveSolutionPrinter < CpSolverSolutionCallback
+    attr_reader :solution_count
+
+    def initialize
+      super
+      @solution_count = 0
+      @start_time = Time.now
+    end
+
+    def on_solution_callback
+      current_time = Time.now
+      obj = objective_value
+      puts "Solution %i, time = %0.2f s, objective = %i" % [@solution_count, current_time - @start_time, obj]
+      @solution_count += 1
+    end
+  end
+end

data/lib/or_tools/routing_index_manager.rb

@@ -0,0 +1,11 @@
+module ORTools
+  class RoutingIndexManager
+    def self.new(num_nodes, num_vehicles, starts, ends = nil)
+      if ends
+        _new_starts_ends(num_nodes, num_vehicles, starts, ends)
+      else
+        _new_depot(num_nodes, num_vehicles, starts)
+      end
+    end
+  end
+end

data/lib/or_tools/sat_int_var.rb

@@ -14,6 +14,10 @@ module ORTools
       SatLinearExpr.new([[self, 1], [-other, 1]])
     end
 
+    def -@
+      SatLinearExpr.new([[self, -1]])
+    end
+
     # for now
     def inspect
       name

data/lib/or_tools/sat_linear_expr.rb

@@ -43,10 +43,10 @@ module ORTools
         case other
         when SatLinearExpr
           other.vars
-        when BoolVar, SatIntVar
+        when BoolVar, SatIntVar, Integer
           [[other, 1]]
         else
-          raise ArgumentError, "Unsupported type"
+          raise ArgumentError, "Unsupported type: #{other.class.name}"
         end
 
       self.class.new(vars + other_vars.map { |a, b| [a, sign * b] })

data/lib/or_tools/var_array_and_objective_solution_printer.rb

@@ -0,0 +1,20 @@
+module ORTools
+  class VarArrayAndObjectiveSolutionPrinter < CpSolverSolutionCallback
+    attr_reader :solution_count
+
+    def initialize(variables)
+      super()
+      @variables = variables
+      @solution_count = 0
+      @start_time = Time.now
+    end
+
+    def on_solution_callback
+      current_time = Time.now
+      obj = objective_value
+      puts "Solution %i, time = %0.2f s, objective = %i" % [@solution_count, current_time - @start_time, obj]
+      puts @variables.map { |v| "  %s = %i" % [v.name, value(v)] }.join(" ")
+      @solution_count += 1
+    end
+  end
+end

data/lib/or_tools/var_array_solution_printer.rb

@@ -0,0 +1,19 @@
+module ORTools
+  class VarArraySolutionPrinter < CpSolverSolutionCallback
+    attr_reader :solution_count
+
+    def initialize(variables)
+      super()
+      @variables = variables
+      @solution_count = 0
+      @start_time = Time.now
+    end
+
+    def on_solution_callback
+      current_time = Time.now
+      puts "Solution %i, time = %0.2f s" % [@solution_count, current_time - @start_time]
+      puts @variables.map { |v| "  %s = %i" % [v.name, value(v)] }.join(" ")
+      @solution_count += 1
+    end
+  end
+end

data/lib/or_tools/version.rb

@@ -1,3 +1,3 @@
 module ORTools
-  VERSION = "0.3.1"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-07-21 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -80,7 +80,7 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '5'
-description: 
+description:
 email: andrew@chartkick.com
 executables: []
 extensions:
@@ -91,8 +91,14 @@ files:
 - LICENSE.txt
 - NOTICE.txt
 - README.md
+- ext/or-tools/assignment.cpp
+- ext/or-tools/bin_packing.cpp
+- ext/or-tools/constraint.cpp
 - ext/or-tools/ext.cpp
 - ext/or-tools/extconf.rb
+- ext/or-tools/linear.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
@@ -105,6 +111,8 @@ files:
 - lib/or_tools/int_var.rb
 - lib/or_tools/knapsack_solver.rb
 - lib/or_tools/linear_expr.rb
+- lib/or_tools/objective_solution_printer.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
@@ -112,12 +120,14 @@ files:
 - lib/or_tools/solver.rb
 - lib/or_tools/sudoku.rb
 - lib/or_tools/tsp.rb
+- lib/or_tools/var_array_and_objective_solution_printer.rb
+- lib/or_tools/var_array_solution_printer.rb
 - lib/or_tools/version.rb
 homepage: https://github.com/ankane/or-tools
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -125,15 +135,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.6'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Operations research tools for Ruby
 test_files: []