rulp 0.0.12 → 0.0.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YmU0YjdmMjllMmU1YWJlMWM1MDNiMmM1OTc5YjNlMmYxN2ViMjg3OA==
+    MzVkMDQ0N2U5ZTg3NGNiMGQ3N2ZlODAyNDljY2U4MDNlMDVkOGRhMg==
   data.tar.gz: !binary |-
-    MjM3MDZmYmY4NmZjNzI1ZmYzOTk3ZjYzNTQxMDAzYTk2OGFjY2FmMg==
+    MGI2M2ZiYWVlZWYzMmUzZDM2NjU4NzZlNGQ2Y2M4YzU4YTU0NGE5Ng==
 SHA512:
   metadata.gz: !binary |-
-    NGY4YTJjOWNkOWNiNDNlMjU1ZjM0Njg0ZGE4YzFkYjhkMTYxMTg0ODMzMjQx
-    M2NiOWYyMWI5YTc4NDZlOWQ2ZmZmYzZlYzAxMjM0OTAyMjRiOGY1ZmJlOGVh
-    Mjc4MjRiMTQ4OGZiZWQ3NjMxOTg5NGY2NmFhZmU3YzJiZjNmZGE=
+    NGQxOWZlNDZkNTU2ZjA1ZTM1M2RkMTIxYmY0ZTExOWE5YjMyODRhNjVlZDhj
+    MGI5YWZiM2MwMTU5ZTcyNDQ2MmI1NWU2NzVmZjNhYzViNmE4MGY5MjcxZjZh
+    YjJjZTM3YTUzZmZiYWE5MGJiNTNlZjBjNWFiYzNjOTg5NTgzZDc=
   data.tar.gz: !binary |-
-    YmVjYWJiNzFhZDliZmM4MWNlMDAzMjk4OGM2MGQ5ZGMzNDBiODZkNzk5MjM4
-    Yjk3M2RmZWRiYjVhNmJlMDY5ZTUwOTAzNWEwMGM4YWIzNzQwNzIyMDhjYjIx
-    MTZlZTYzY2M0NzY1M2YzYWI5NzZhZGViZDcyMzY0MjYwYzI2MGM=
+    NmYwM2Q1NmFmODk1OGI3OGNjNDRmNDU5OTRhMDRiZGE5ZDJmYzAzZTI3YTQw
+    MzNiMTRhZjdlOTQzZWE2NDE4ZGMwOWI0YzM5MTFjZjAyM2M0MjM4M2YyZjZl
+    Yzc0OWI5NGYxYjdiZTRhMzUxMmM1ODYxZGI3ZWU1NDM3ODBjOWE=

data/lib/rulp/rulp.rb

@@ -15,6 +15,7 @@ SCIP  = "scip"
 CBC   = "cbc"
 PSCIP = "pscip"
 PCBC  = "pcbc"
+GUROBI = "gurobi_cl"
 
 module Rulp
   attr_accessor :expressions
@@ -22,37 +23,47 @@ module Rulp
   MAX = "Maximize"
 
   GLPK  = ::GLPK
+  GUROBI  = ::GUROBI
   SCIP  = ::SCIP
   CBC   = ::CBC
   PSCIP = ::PSCIP
   PCBC  = ::PCBC
 
   SOLVERS = {
-    GLPK  => Glpk,
-    SCIP  => Scip,
-    PSCIP => PScip,
-    PCBC  => PCbc,
-    CBC   => Cbc
+    GLPK     => Glpk,
+    SCIP     => Scip,
+    PSCIP    => PScip,
+    PCBC     => PCbc,
+    CBC      => Cbc,
+    GUROBI   => Gurobi,
   }
 
-  def self.Glpk(lp)
-    lp.solve_with(GLPK) rescue nil
+  def self.Glpk(lp, opts={})
+    lp.solve_with(GLPK, opts) rescue nil
   end
 
-  def self.Cbc(lp)
-    lp.solve_with(CBC) rescue nil
+  def self.Cbc(lp, opts={})
+    lp.solve_with(CBC, opts)
   end
 
-  def self.Scip(lp)
-    lp.solve_with(SCIP) rescue nil
+  def self.Scip(lp, opts={})
+    lp.solve_with(SCIP, opts) rescue nil
   end
 
-  def self.Pcbc(lp)
-    lp.solve_with(PCBC) rescue nil
+  def self.Pcbc(lp, opts={})
+    lp.solve_with(PCBC, opts) rescue nil
   end
 
-  def self.Pscip(lp)
-    lp.solve_with(PSCIP) rescue nil
+  def self.Pscip(lp, opts={})
+    lp.solve_with(PSCIP, opts) rescue nil
+  end
+
+  def self.Pscip(lp, opts={})
+    lp.solve_with(PSCIP, opts) rescue nil
+  end
+
+  def self.Gurobi(lp, opts={})
+    lp.solve_with(GUROBI, opts) rescue nil
   end
 
   def self.Max(objective_expression)
@@ -86,12 +97,12 @@ module Rulp
       self
     end
 
-    def solve
-      Rulp.send(self.solver, self)
+    def solve(opts={})
+      Rulp.send(self.solver, self, opts)
     end
 
-    def method_missing(method_name)
-      self.call(method_name)
+    def method_missing(method_name, *args)
+      self.call(method_name, *args)
     end
 
     def solver(solver=nil)
@@ -99,8 +110,8 @@ module Rulp
       solver = solver[0].upcase + solver[1..-1].downcase
     end
 
-    def call(using=nil)
-      Rulp.send(self.solver(using), self)
+    def call(using=nil, options={})
+      Rulp.send(self.solver(using), self, options)
     end
 
     def constraints
@@ -139,17 +150,19 @@ module Rulp
       IO.write(filename, self)
     end
 
-    def solve_with(type, open_definition=false, open_solution=false)
+    def solve_with(type, options={})
       filename = get_output_filename
-      solver = SOLVERS[type].new(filename)
+      solver = SOLVERS[type].new(filename, options)
 
       "Writing problem".log(:info)
       IO.write(filename, self)
 
-      `open #{filename}` if open_definition
+      `open #{filename}` if options[:open_definition]
 
       "Solving problem".log(:info)
-      _, time = _profile{ solver.solve(open_solution) }
+      _, time = _profile{ solver.solve(options) }
+
+      `open #{solver.outfile}` if options[:open_solution]
 
       "Solver took #{time}".log(:debug)
 

data/lib/rulp/rulp_bounds.rb

@@ -56,7 +56,7 @@ module Rulp
       [
         self.gt,
         self.gt ? "<=" : nil,
-        self.name,
+        self.to_s,
         self.lt ? "<=" : nil,
         self.lt
       ].compact.join(" ")

data/lib/solvers/cbc.rb

@@ -1,7 +1,9 @@
 class Cbc < Solver
-  def solve(open_solution=false)
-    system("#{executable} #{@filename} branch solution #{@outfile}")
-    `open #{@outfile}` if open_solution
+  def solve(options)
+    command =  "#{executable} #{@filename} %s branch solution #{@outfile}"
+    command %= options[:gap] ? "ratio #{options[:gap]}":""
+    system(command)
+    `open #{@outfile}` if options[:open_solution]
   end
 
   def self.executable

data/lib/solvers/glpk.rb

@@ -1,7 +1,8 @@
 class Glpk < Solver
-  def solve(open_solution=false)
-    system("#{executable} --lp #{@filename} --write #{@outfile}")
-    `open #{@outfile}` if open_solution
+  def solve(options)
+    command = "#{executable} --lp #{@filename} %s --cuts --write #{@outfile}"
+    command %= options[:gap] ? "--mipgap #{options[:gap]}" : ""
+    system(command)
   end
 
   def self.executable

data/lib/solvers/gurobi.rb

@@ -0,0 +1,25 @@
+class Gurobi < Solver
+  def solve(options)
+    command = "gurobi_cl ResultFile=#{@outfile} #{@filename}"
+    command %= options[:gap] ? "MipGap=#{options[:gap]}":""
+    system(command)
+  end
+
+  def self.executable
+    :cbc
+  end
+
+  def store_results(variables)
+    rows = IO.read(@outfile).split("\n")
+    objective = rows[0].split(/\s+/)[-1].to_f
+    vars_by_name = {}
+    rows[1..-1].each do |row|
+      cols = row.strip.split(/\s+/)
+      vars_by_name[cols[0].to_s] = cols[1].to_f
+    end
+    variables.each do |var|
+      var.value = vars_by_name[var.to_s].to_f
+    end
+    return objective
+  end
+end

data/lib/solvers/pcbc.rb

@@ -1,7 +1,8 @@
 class PCbc < Solver
-  def solve(open_solution=false)
-    system("#{executable} #{@filename} threads 8 branch solution #{@outfile}")
-    `open #{@outfile}` if open_solution
+  def solve(options)
+    command =  "#{executable} #{@filename} %s threads 8 branch solution #{@outfile}"
+    command %= options[:gap] ? "ratio #{options[:gap]}":""
+    system(command)
   end
 
   def self.executable

data/lib/solvers/pscip.rb

@@ -4,11 +4,10 @@ class PScip < Solver
     :fscip
   end
 
-  def solve(open_solution=false)
+  def solve(options)
     command = "touch /tmp/fscip_params; rm #{@outfile}; #{executable} /tmp/fscip_params #{@filename} -fsol #{@outfile}"
     command += " -s ./scip.set" if File.exists?("./scip.set")
     system(command)
-    `open #{@outfile}` if open_solution
   end
 
   def store_results(variables)

data/lib/solvers/scip.rb

@@ -1,12 +1,10 @@
 class Scip < Solver
-
   def self.executable
     :scip
   end
 
-  def solve(open_solution=false)
+  def solve(options)
     system("rm #{@outfile}; #{executable} -f #{@filename} -l #{@outfile} -s ./scip.set")
-    `open #{@outfile}` if open_solution
   end
 
   def store_results(variables)

data/lib/solvers/solvers.rb

@@ -1,5 +1,8 @@
 class Solver
-  def initialize(filename)
+  attr_reader :options, :outfile
+
+  def initialize(filename, options)
+    @options = options
     @filename = filename
     @outfile = get_output_filename
     raise StandardError.new("Couldn't find solver #{executable}!") if `which #{executable}`.length == 0
@@ -32,3 +35,4 @@ require_relative 'scip'
 require_relative 'glpk'
 require_relative 'pscip'
 require_relative 'pcbc'
+require_relative 'gurobi'

data/test/test_save_to_file.rb

@@ -13,6 +13,7 @@ require_relative 'test_helper'
 
 class SaveToFile < Minitest::Test
   def setup
+    LV::clear
     given[ X_i >= 0,  Y_i >= 0,  Z_i >= 0 ]
     @objective = 10 * X_i + 6 * Y_i + 4 * Z_i
     @problem   = Rulp::Max( @objective ) [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-01 00:00:00.000000000 Z
+date: 2015-04-09 00:00:00.000000000 Z
 dependencies: []
 description: A simple Ruby LP description DSL
 email: wc@pico.net.nz
@@ -34,6 +34,7 @@ files:
 - lib/rulp/rulp_initializers.rb
 - lib/solvers/cbc.rb
 - lib/solvers/glpk.rb
+- lib/solvers/gurobi.rb
 - lib/solvers/pcbc.rb
 - lib/solvers/pscip.rb
 - lib/solvers/scip.rb