rulp 0.0.9 → 0.0.10

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2VlZmMyNTdmZDIxNThjYWJkMjYyZjBjZGI0Yjc3NWY4NjgwODBmMw==
+    ZTI0NWU3NTcxYTg3MzczYWE4MzI0NDRkNTNlMWQ3NTllNGU4ZjdkYg==
   data.tar.gz: !binary |-
-    ZjkxM2RmYTc0ZThjZjNhOTcxZjMxYzU0ZmY5OTBlOTcyNzhkOWIyOQ==
+    MWYzNDhlYzI1MTM2ZjM1M2E0NTcyMGY4YmE2Y2E4MzM1YTRkZmZmZQ==
 SHA512:
   metadata.gz: !binary |-
-    OWY0YWFkNmVmN2E1NGRiMzg1NmExYWJkZGRiNDc5ZDBjNzMyNDMwYjdjYTAw
-    NzFmN2RlNjY4OGY5ZjgyMTZmY2Q4Nzk3NmM3Zjg3YmVmOGUwOWUxMTk2Mzhi
-    NWJhNzk2ZWM3ZDdkYTZjY2JmODBkMzg5N2JkYjk2YzE1MDMxZGE=
+    ZjMzMGVjNWI5YWJmNWQxY2Q2MjZkYTMzZmQ2NWJjZmJlMmMyODA0N2ZiYTQz
+    MjRlYzY1MmY4NTQxNWU0OWRkNGNkZTU1ODQ0YjU3NGRhMWJkMTIzM2U5Y2Zj
+    NDU4YWY5YTViNDQ1NTNiNGVmZTYyNjlkZDhiYzA0ZDM2YTA2ZmM=
   data.tar.gz: !binary |-
-    MDY2ZGRjNDExYjk2MmQyMzNjNjI3NjA3MWY1NjRmMWUxMTE3ODM1NDFlODhi
-    NjRhYWNkN2Y4MjY5ZDllZmQ0YmQ2NjVjOTRjNjkyMDhhNTZmZGRiY2M4MzJm
-    YTBiMDQyYjVlNjA1OTY5ODBhOWYxOWMzZTFhYzNiNGFmY2NiYjQ=
+    ZjY2NjJiNDgzNWUzYzk1MmJlMGYyZTUxMGYxOTVlMDdhNjVkYzM3OWYzMjcz
+    OWU0ZDQ0MmU3Y2QyMjdmMTYyNzQ2MmVkMzAxZjEzNWJlOGMwZWIxMDRlYTNk
+    OGI5MGJlN2NiZjkzMjQ5NjA1OGIwMGQyMDdjZDA5ODY3YmFhMGI=

data/lib/rulp/rulp.rb

@@ -13,6 +13,8 @@ require 'set'
 GLPK  = "glpsol"
 SCIP  = "scip"
 CBC   = "cbc"
+PSCIP = "pscip"
+PCBC  = "pcbc"
 
 module Rulp
   attr_accessor :expressions
@@ -22,11 +24,15 @@ module Rulp
   GLPK  = ::GLPK
   SCIP  = ::SCIP
   CBC   = ::CBC
+  PSCIP = ::PSCIP
+  PCBC  = ::PCBC
 
   SOLVERS = {
-    GLPK => Glpk,
-    SCIP => Scip,
-    CBC  => Cbc
+    GLPK  => Glpk,
+    SCIP  => Scip,
+    PSCIP => PScip,
+    PCBC  => PCbc,
+    CBC   => Cbc
   }
 
   def self.Glpk(lp)
@@ -41,6 +47,14 @@ module Rulp
     lp.solve_with(SCIP) rescue nil
   end
 
+  def self.Pcbc(lp)
+    lp.solve_with(PCBC) rescue nil
+  end
+
+  def self.Pscip(lp)
+    lp.solve_with(PSCIP) rescue nil
+  end
+
   def self.Max(objective_expression)
     "Creating maximization problem".log :info
     Problem.new(Rulp::MAX, objective_expression)

data/lib/solvers/pcbc.rb

@@ -0,0 +1,24 @@
+class PCbc < Solver
+  def solve(open_solution=false)
+    system("#{executable} #{@filename} threads 8 branch solution #{@outfile}")
+    `open #{@outfile}` if open_solution
+  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

@@ -0,0 +1,31 @@
+class PScip < Solver
+
+  def self.executable
+    :fscip
+  end
+
+  def solve(open_solution=false)
+    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)
+    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

data/lib/solvers/solvers.rb

@@ -26,3 +26,5 @@ end
 require_relative 'cbc'
 require_relative 'scip'
 require_relative 'glpk'
+require_relative 'pscip'
+require_relative 'pcbc'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-24 00:00:00.000000000 Z
+date: 2015-03-27 00:00:00.000000000 Z
 dependencies: []
 description: A simple Ruby LP description DSL
 email: wc@pico.net.nz
@@ -34,6 +34,8 @@ files:
 - lib/rulp/rulp_initializers.rb
 - lib/solvers/cbc.rb
 - lib/solvers/glpk.rb
+- lib/solvers/pcbc.rb
+- lib/solvers/pscip.rb
 - lib/solvers/scip.rb
 - lib/solvers/solvers.rb
 - test/test_basic_suite.rb