rulp 0.0.43 → 0.0.44

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d68bde7a38b8bf0a62ead7589727428da3ca212d
-  data.tar.gz: 19deb3f77fffeece80b35ca0ed00825fbe5fca4d
+  metadata.gz: b02471f804f1086c6193730ce602be9cf03d3ab4
+  data.tar.gz: a9f7197bb1aeb4a1a707333244b6600fed798322
 SHA512:
-  metadata.gz: 76162b58a10cd20302f53f413b38c1e2795fc1b63f26fe5e1f6851efc79eefd5e3dd62b17db606e136290e7ade442dbadc596e5a69ebdb8f4be7d8cf8edfdd3f
-  data.tar.gz: 5c2341e5a8bdbab7f941b9e699e226b0db0ca2d90c7d891a447451a6928b0e068bbf9e69eee013a9d8bf25b55424e3bce98ab1910c812041b9a3aa9a1bef9db7
+  metadata.gz: 5268c02947e586c5ad74630a9d9aadbca40c29f9ea5078f0f2a31563fdc81016a0664fc8d1f5b0406a7a5fe5d63d4e0ddfbd526a555f6b02525b509271a7707f
+  data.tar.gz: 280a4f73804264683b9f65cfe42244934f12cf5a585a62e13f6d7cd8823466d1fc1fb43ff83d694fdf6d3e0a1e7cc0c29fbd373a53885f3b3b1f318435b6c283

data/lib/rulp/version.rb

@@ -1,3 +1,3 @@
 module Rulp
-  VERSION = '0.0.43'
+  VERSION = '0.0.44'
 end

data/lib/solvers/cbc.rb

@@ -7,7 +7,8 @@ class Cbc < Solver
     end
     command %= [
       options[:gap] ? "ratio #{options[:gap]}":"",
-      options[:node_limit] ? "maxN #{options[:node_limit]}":""
+      options[:node_limit] ? "maxN #{options[:node_limit]}":"",
+      options[:time_limit] ? "seconds #{options[:time_limit]}":""
     ]
 
     exec(command)

data/lib/solvers/glpk.rb

@@ -1,7 +1,10 @@
 class Glpk < Solver
   def solve
     command = "#{executable} --lp #{@filename} %s --cuts --output #{@outfile}"
-    command %= options[:gap] ? "--mipgap #{options[:gap]}" : ""
+    command %= [
+      options[:gap] ? "--mipgap #{options[:gap]}" : "",
+      options[:time_limit] ? "--tmlim #{options[:time_limit]}" : ""
+    ]
     exec(command)
   end
 

data/lib/solvers/gurobi.rb

@@ -4,6 +4,7 @@ class Gurobi < Solver
     command %= [
       options[:gap] ? "MipGap=#{options[:gap]}":"",
       options[:node_limit] ? "NodeLimit=#{options[:node_limit]}":"",
+      options[:time_limit] ? "TimeLimit=#{options[:time_limit]}":"",
       ENV['RULP_GUROBI_CMD_ARGS'] ? ENV['RULP_GUROBI_CMD_ARGS'] : ''
     ]
     exec(command)

data/lib/solvers/scip.rb

@@ -28,6 +28,9 @@ class Scip < Solver
     if options[:gap]
       existing_settings += "\nlimits/gap   = #{options[:gap]}"
     end
+    if options[:time_limit]
+      existing_settings += "\nlimits/time   = #{options[:time_limit]}"
+    end
 
     settings_file = get_settings_filename
     IO.write(settings_file, existing_settings)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.44
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies: []
 description: A simple Ruby LP description DSL
 email: wc@pico.net.nz