or-tools 0.3.3 → 0.4.3

data/ext/or-tools/vendor.rb

@@ -3,34 +3,40 @@ require "fileutils"
 require "net/http"
 require "tmpdir"
 
-version = "7.8.7959"
+version = "8.2.8710"
 
 if RbConfig::CONFIG["host_os"] =~ /darwin/i
-  filename = "or-tools_MacOsX-10.15.6_v#{version}.tar.gz"
-  checksum = "8d1d92105e962fab2fd7bde5843b711334a9f246dc22c51d41281898dbc1f69d"
+  filename = "or-tools_MacOsX-11.2.1_v#{version}.tar.gz"
+  checksum = "1c3bd45ab10677aa96d404cb837067e786a6d98123d8b556cf29d6994aa43b3b"
 else
   os = %x[lsb_release -is].chomp rescue nil
   os_version = %x[lsb_release -rs].chomp rescue nil
   if os == "Ubuntu" && os_version == "20.04"
     filename = "or-tools_ubuntu-20.04_v#{version}.tar.gz"
-    checksum = "40018cd573305cec76e12ff87e84d4ec18ce0823f265e4d75625bf3aefdea7c9"
+    checksum = "ab3b3051b10a4bbe8d080857f3c4ef3cfe9c10896ff94f352bb779e993756dd7"
   elsif os == "Ubuntu" && os_version == "18.04"
     filename = "or-tools_ubuntu-18.04_v#{version}.tar.gz"
-    checksum = "6e53e1a7b82b65b928617b9dce663778c5200de9366ad948948597dc763b1943"
-  elsif os == "Ubuntu" && os_version == "16.04"
-    filename = "or-tools_ubuntu-16.04_v#{version}.tar.gz"
-    checksum = "182cd4e2a1d2f29a9a81f2f90cb3e05cf1c0731c1a1e94c471d79a74dc09fff0"
+    checksum = "0d052deb2ba4491c29e86242fb5d61d0fe14bac847c2feaa35fbeff925ea40a0"
   elsif os == "Debian" && os_version == "10"
-    filename = "or-tools_debian-10_v#{version}.tar.gz "
-    checksum = "87dd294237095a7fea466c47789802b0a66c664fa1f79e6bbb2cd36323b409ca"
+    filename = "or-tools_debian-10_v#{version}.tar.gz"
+    checksum = "1f2ec99181c92859ab46e68a6231babce92ded949fd1d08ee31afa4db04c43b3"
   elsif os == "CentOS" && os_version == "8"
     filename = "or-tools_centos-8_v#{version}.tar.gz"
-    checksum = "4e61bf2994fc767da1b4fd073f554c944d2c811609df4bc1afa6a2d876c05bb4"
+    checksum = "be638a20b36f6da81aa29fd24c69c4a66afc980b8a221b1cbabb3910b9827718"
   else
+    platform =
+      if Gem.win_platform?
+        "Windows"
+      elsif os || os_version
+        "#{os} #{os_version}"
+      else
+        "Unknown"
+      end
+
     # there is a binary download for Windows
     # however, it's compiled with Visual Studio rather than MinGW (which RubyInstaller uses)
     raise <<~MSG
-      Binary installation not available for this platform.
+      Binary installation not available for this platform: #{platform}
 
       Build the OR-Tools C++ library from source, then run:
       bundle config build.or-tools --with-or-tools-dir=/path/to/or-tools
@@ -44,7 +50,9 @@ url = "https://github.com/google/or-tools/releases/download/v#{short_version}/#{
 
 $stdout.sync = true
 
-def download_file(url, download_path)
+def download_file(url, download_path, redirects = 0)
+  raise "Too many redirects" if redirects > 10
+
   uri = URI(url)
   location = nil
 
@@ -73,7 +81,7 @@ def download_file(url, download_path)
   end
 
   # outside of Net::HTTP block to close previous connection
-  download_file(location, download_path) if location
+  download_file(location, download_path, redirects + 1) if location
 end
 
 # download

data/lib/or-tools.rb

@@ -18,6 +18,11 @@ 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/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.3"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.3
 platform: ruby
 authors:
 - Andrew Kane
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-10-13 00:00:00.000000000 Z
+date: 2021-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -16,72 +16,16 @@ 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'
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rake-compiler
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '5'
-description: 
-email: andrew@chartkick.com
+        version: '3'
+description:
+email: andrew@ankane.org
 executables: []
 extensions:
 - ext/or-tools/extconf.rb
@@ -91,8 +35,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 +55,7 @@ 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
@@ -113,12 +64,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
@@ -126,15 +79,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: []