rulp 0.0.41 → 0.0.42

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 99f1c57e4bef966b71aa7e9a02e37a9e4a124660
-  data.tar.gz: ac1527cd28e1fb3218569b76d35ebd65c8dd62be
+  metadata.gz: 5bdd34b931ba0a9773f84bdf86fd6c46f5ac16d1
+  data.tar.gz: ff6d23c6984b6a54f8e0c92bbe8ca872118ecccd
 SHA512:
-  metadata.gz: 39dc348c6558ea3bc0d6f931ba0e88b08ab4e6a3cb94fd30b9f9a55c2e548fbe9c34fd57dfab248228fbdf9a96443787edaf2fcc0d33afddbee306c162cc9ef3
-  data.tar.gz: bec99ca0718e4b038811d5a24eb6f67933ef877571038861c6b30a1b03ca55d37e69d38fa55763b1ae64e96c8899c36f73c3e7330a6c44508385cc5bac531246
+  metadata.gz: e0cae88a9211e35c545e8efb570b269c626b72455b50fabcf770e6fcdb289f556d631ec89aa12c20f49e5c11c85f360b9b1ff02d61cc5e50ead9354b19c7175d
+  data.tar.gz: 9f50d5f41b946dd90f00c71eacf6b6b66775c1a01b5be7466b3c424fe23de163507b147109d6fec0c88832b8f259c33b1394b6170b45852557daab71d9bf8952

data/lib/rulp/rulp.rb

@@ -185,7 +185,8 @@ module Rulp
       solver.store_results(@variables)
 
       if solver.unsuccessful
-        raise "Solve failed: solution infeasible" if IO.read(solver.outfile).downcase.include?("infeasible")
+        outfile_contents = IO.read(solver.outfile)
+        raise "Solve failed: solution infeasible" if outfile_contents.downcase.include?("infeasible") || outfile_contents.strip.length.zero?
         raise "Solve failed: all units undefined"
       end
 

data/lib/solvers/gurobi.rb

@@ -14,17 +14,20 @@ class Gurobi < Solver
   end
 
   def store_results(variables)
-    rows = IO.read(@outfile).split("\n")
-    objective_str = rows[0].split(/\s+/)[-1]
-    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
+    text = IO.read(@outfile)
+    self.unsuccessful = text.strip.length.zero? || text.downcase.include?('infeasible')
+    unless self.unsuccessful
+     rows = text.split("\n")
+      objective_str = rows[0].split(/\s+/)[-1]
+      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
     end
-    variables.each do |var|
-      var.value = vars_by_name[var.to_s].to_f
-    end
-    self.unsuccessful = rows.length.zero?
     return objective_str.to_f
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.41
+  version: 0.0.42
 platform: ruby
 authors:
 - Wouter Coppieters