rulp 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51fa526dd152f836d5b5e6f4658352847828fa8e
-  data.tar.gz: 0858e2314d40ee7d7ac6e085634bfeb064d1d9f2
+  metadata.gz: 94d1b4aeebe550905d47cc889f958df9b241242f
+  data.tar.gz: 2d32d06eac07ad13c4f9efccd4fe7231c7fca44d
 SHA512:
-  metadata.gz: 5c0fdb11528ae4ce52edf332902b0941fc4c298c2a06d21f41b11da96d8d8216e7f495a96a47587dd0588563981ed656af74468dcc06b9cd7be5f27682fc5363
-  data.tar.gz: 6603c3523a9a755eef88ad563d71ab27282a37cc539edcb733a765cefdf0c4f57e81c74308d57af5b2f7d099e662a95523ed9a511b77e0a15a5495b197b72d6a
+  metadata.gz: bbd24354398f8ab0ddedea6340a833f3c5cc3b4c9171e18b98dffa050ac5b4482c93067ad5295efd1416ea662ec5d700b97573977d8616e82651448466116a86
+  data.tar.gz: 61e76aea75b4f67f2a2aa76f8b3c7c21bcfc63af3d7966919386f3cff41d1d1a6f2eac7cd1d2bacf32b2abe49ee2e70489d3e471c779437f5010dd52b173d6c9

data/lib/helpers/log.rb

@@ -34,6 +34,14 @@ module Rulp
       @@level || :info
     end
 
+    def self.print_solver_outputs
+      @@solver_level
+    end
+
+    def self.print_solver_outputs=(value)
+      @@solver_level = value
+    end
+
     def self.log(level, message)
       if(LEVELS[level].to_i <= LEVELS[self.level])
         puts("[#{colorize(level)}] #{message}")
@@ -58,6 +66,7 @@ module Rulp
     end
 
     self.level = :info
+    self.print_solver_outputs = true
 
     class ::String
       def log(level)

data/lib/rulp/rulp.rb

@@ -64,6 +64,11 @@ module Rulp
     solver_class.exists? if(solver_class)
   end
 
+
+  def self.exec(command)
+    system("#{command} #{Rulp::Logger.print_solver_outputs ? "" : "&> /dev/null"}")
+  end
+
   class Problem
     def initialize(objective, objective_expression)
       @objective = objective
@@ -142,12 +147,12 @@ module Rulp
       "Writing problem".log(:info)
       IO.write(filename, self)
 
-      `open #{filename}` if options[:open_definition]
+      Rulp.exec("open #{filename}") if options[:open_definition]
 
       "Solving problem".log(:info)
       _, time = _profile{ solver.solve }
 
-      `open #{solver.outfile}` if options[:open_solution]
+      Rulp.exec("open #{solver.outfile}") if options[:open_solution]
 
       "Solver took #{time}".log(:debug)
 

data/lib/solvers/cbc.rb

@@ -10,7 +10,7 @@ class Cbc < Solver
       options[:node_limit] ? "maxN #{options[:node_limit]}":""
     ]
 
-    system(command)
+    exec(command)
   end
 
   def self.executable

data/lib/solvers/glpk.rb

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

data/lib/solvers/gurobi.rb

@@ -5,7 +5,7 @@ class Gurobi < Solver
       options[:gap] ? "MipGap=#{options[:gap]}":"",
       options[:node_limit] ? "NodeLimit=#{options[:node_limit]}":""
     ]
-    system(command)
+    exec(command)
   end
 
   def self.executable

data/lib/solvers/scip.rb

@@ -6,11 +6,14 @@ class Scip < Solver
   def solve
     settings = settings_file
     if options[:parallel]
-      command = "touch /tmp/fscip_params; rm #{@outfile}; fscip /tmp/fscip_params #{@filename} -fsol #{@outfile} -s #{settings}"
+      exec("touch /tmp/fscip_params")
+      exec("rm #{@outfile}")
+      command = "fscip /tmp/fscip_params #{@filename} -fsol #{@outfile} -s #{settings}"
     else
-      command = "rm #{@outfile}; #{executable} -f #{@filename} -l #{@outfile} -s #{settings}"
+      exec("rm #{@outfile}")
+      command = "#{executable} -f #{@filename} -l #{@outfile} -s #{settings}"
     end
-    system(command)
+    exec(command)
   end
 
   def settings_file

data/lib/solvers/solver.rb

@@ -21,6 +21,10 @@ class Solver
     self.class.executable
   end
 
+  def exec(command)
+    Rulp.exec(command)
+  end
+
   def solver_exists?
     @solver_exists || false
   end

data/test/test_helper.rb

@@ -4,7 +4,7 @@ gem "minitest"
 require "minitest/autorun"
 
 Rulp::Logger::level = :off
-
+Rulp::Logger::print_solver_outputs = false
 
 def each_solver
   [:scip, :cbc, :glpk, :gurobi].each do |solver|
@@ -12,7 +12,7 @@ def each_solver
     if Rulp::solver_exists?(solver)
       yield(solver)
     else
-      puts "Couldn't find solver #{solver}"
+      "Couldn't find solver #{solver}".log(:info)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-07 00:00:00.000000000 Z
+date: 2015-11-02 00:00:00.000000000 Z
 dependencies: []
 description: A simple Ruby LP description DSL
 email: wc@pico.net.nz