rulp 0.0.13 → 0.0.14

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzVkMDQ0N2U5ZTg3NGNiMGQ3N2ZlODAyNDljY2U4MDNlMDVkOGRhMg==
+    YzYxYzBjMTNmYmFhN2MxY2MwOGVmZTgzZmEzNTBlZTczMzAzODg4YQ==
   data.tar.gz: !binary |-
-    MGI2M2ZiYWVlZWYzMmUzZDM2NjU4NzZlNGQ2Y2M4YzU4YTU0NGE5Ng==
+    OGYxNzNjODE3YmJmMWVjYzU5MjFhOWM2NTg2OWQ2ZTY2MTI3ZTEyYg==
 SHA512:
   metadata.gz: !binary |-
-    NGQxOWZlNDZkNTU2ZjA1ZTM1M2RkMTIxYmY0ZTExOWE5YjMyODRhNjVlZDhj
-    MGI5YWZiM2MwMTU5ZTcyNDQ2MmI1NWU2NzVmZjNhYzViNmE4MGY5MjcxZjZh
-    YjJjZTM3YTUzZmZiYWE5MGJiNTNlZjBjNWFiYzNjOTg5NTgzZDc=
+    YTZhMmIyYjdkMGZhNzFjM2VkNDBjNjZkOTBjYWU1YjNjMmQzOGRiMDUxNWZm
+    MmQwNmJkZWIzZjczMjU3YTAzNTc4NjFlYTgzNWIyMjIxYTI3ODM4ZDkwNTcy
+    Y2Y1N2RjM2I4N2U4YzFmNjVhYzI0N2FkMzAwZGIyMzBmNzY0Nzk=
   data.tar.gz: !binary |-
-    NmYwM2Q1NmFmODk1OGI3OGNjNDRmNDU5OTRhMDRiZGE5ZDJmYzAzZTI3YTQw
-    MzNiMTRhZjdlOTQzZWE2NDE4ZGMwOWI0YzM5MTFjZjAyM2M0MjM4M2YyZjZl
-    Yzc0OWI5NGYxYjdiZTRhMzUxMmM1ODYxZGI3ZWU1NDM3ODBjOWE=
+    YzllNGI2NTQxZDcyNGU0OWQxYjg0MjM4NjY5YTRlNDFkMWYzZTU0NDMzODFj
+    NjRiYzc3Njc5NjAwZWEwZDBjYzg3NGU3ZjNkNGM1MDdlM2EwY2NjOWQzOGI1
+    ZmU5YWFlNjM5MDI5N2ZlZDFkZWE5ZDIyNjk0MGNmZTdhOTQyODM=

data/lib/rulp/rulp.rb

@@ -13,8 +13,6 @@ require 'set'
 GLPK  = "glpsol"
 SCIP  = "scip"
 CBC   = "cbc"
-PSCIP = "pscip"
-PCBC  = "pcbc"
 GUROBI = "gurobi_cl"
 
 module Rulp
@@ -26,20 +24,16 @@ module Rulp
   GUROBI  = ::GUROBI
   SCIP  = ::SCIP
   CBC   = ::CBC
-  PSCIP = ::PSCIP
-  PCBC  = ::PCBC
 
   SOLVERS = {
     GLPK     => Glpk,
     SCIP     => Scip,
-    PSCIP    => PScip,
-    PCBC     => PCbc,
     CBC      => Cbc,
     GUROBI   => Gurobi,
   }
 
   def self.Glpk(lp, opts={})
-    lp.solve_with(GLPK, opts) rescue nil
+    lp.solve_with(GLPK, opts)
   end
 
   def self.Cbc(lp, opts={})
@@ -47,23 +41,11 @@ module Rulp
   end
 
   def self.Scip(lp, opts={})
-    lp.solve_with(SCIP, opts) rescue nil
-  end
-
-  def self.Pcbc(lp, opts={})
-    lp.solve_with(PCBC, opts) rescue nil
-  end
-
-  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
+    lp.solve_with(SCIP, opts)
   end
 
   def self.Gurobi(lp, opts={})
-    lp.solve_with(GUROBI, opts) rescue nil
+    lp.solve_with(GUROBI, opts)
   end
 
   def self.Max(objective_expression)
@@ -160,7 +142,7 @@ module Rulp
       `open #{filename}` if options[:open_definition]
 
       "Solving problem".log(:info)
-      _, time = _profile{ solver.solve(options) }
+      _, time = _profile{ solver.solve }
 
       `open #{solver.outfile}` if options[:open_solution]
 

data/lib/solvers/cbc.rb

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

data/lib/solvers/glpk.rb

@@ -1,5 +1,5 @@
 class Glpk < Solver
-  def solve(options)
+  def solve
     command = "#{executable} --lp #{@filename} %s --cuts --write #{@outfile}"
     command %= options[:gap] ? "--mipgap #{options[:gap]}" : ""
     system(command)

data/lib/solvers/gurobi.rb

@@ -1,12 +1,15 @@
 class Gurobi < Solver
-  def solve(options)
-    command = "gurobi_cl ResultFile=#{@outfile} #{@filename}"
-    command %= options[:gap] ? "MipGap=#{options[:gap]}":""
+  def solve
+    command = "#{executable} ResultFile=#{@outfile} %s %s #{@filename}"
+    command %= [
+      options[:gap] ? "MipGap=#{options[:gap]}":"",
+      options[:node_limit] ? "NodeLimit=#{options[:node_limit]}":""
+    ]
     system(command)
   end
 
   def self.executable
-    :cbc
+    :gurobi_cl
   end
 
   def store_results(variables)

data/lib/solvers/scip.rb

@@ -3,8 +3,36 @@ class Scip < Solver
     :scip
   end
 
-  def solve(options)
-    system("rm #{@outfile}; #{executable} -f #{@filename} -l #{@outfile} -s ./scip.set")
+  def solve
+    settings = settings_file
+    if options[:parallel]
+      command = "touch /tmp/fscip_params; rm #{@outfile}; fscip /tmp/fscip_params #{@filename} -fsol #{@outfile} -s #{settings}"
+    else
+      command = "rm #{@outfile}; #{executable} -f #{@filename} -l #{@outfile} -s #{settings}"
+    end
+    system(command)
+  end
+
+  def settings_file
+    existing_settings = if File.exists?("./scip.set")
+       IO.read("./scip.set")
+    else
+      ""
+    end
+    if options[:node_limit]
+      existing_settings += "\nlimits/nodes = #{options[:node_limit]}"
+    end
+    if options[:gap]
+      existing_settings += "\nlimits/gap   = #{options[:gap]}"
+    end
+
+    settings_file = get_settings_filename
+    IO.write(settings_file, existing_settings)
+    return settings_file
+  end
+
+  def get_settings_filename
+    "/tmp/rulp-#{Random.rand(0..1000)}.set"
   end
 
   def store_results(variables)

data/lib/solvers/solvers.rb

@@ -33,6 +33,4 @@ end
 require_relative 'cbc'
 require_relative 'scip'
 require_relative 'glpk'
-require_relative 'pscip'
-require_relative 'pcbc'
 require_relative 'gurobi'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
 platform: ruby
 authors:
 - Wouter Coppieters
@@ -35,8 +35,6 @@ files:
 - lib/solvers/cbc.rb
 - lib/solvers/glpk.rb
 - lib/solvers/gurobi.rb
-- lib/solvers/pcbc.rb
-- lib/solvers/pscip.rb
 - lib/solvers/scip.rb
 - lib/solvers/solvers.rb
 - test/test_basic_suite.rb

data/lib/solvers/pcbc.rb

@@ -1,25 +0,0 @@
-class PCbc < Solver
-  def solve(options)
-    command =  "#{executable} #{@filename} %s threads 8 branch solution #{@outfile}"
-    command %= options[:gap] ? "ratio #{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[1].to_s] = cols[2].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/pscip.rb

@@ -1,30 +0,0 @@
-class PScip < Solver
-
-  def self.executable
-    :fscip
-  end
-
-  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)
-  end
-
-  def store_results(variables)
-    results  = IO.read(@outfile)
-    rows     = results.split("\n")
-
-    objective = rows[1].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