or-tools 0.4.0 → 0.4.1

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_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.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: or-tools
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Andrew Kane
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rice
@@ -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,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,6 +120,8 @@ 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: