rulp 0.0.24 → 0.0.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9477cad891cf0cf2b700a5216742545d3fec329e
-  data.tar.gz: 605645b0a0059d31c7f7c61cd07661422dcd297e
+  metadata.gz: 29755e45e91f606add5cc434cc9dd4a1cb6fd57a
+  data.tar.gz: e2b000cfe7ffec6160fcdb445eb5a79040bfdbb9
 SHA512:
-  metadata.gz: 14a26446ed7a000c57514f2ab4e849820839f1f7a36ff077d90e67f2c6e12f015cbeea5d2f0ae1f24b435ab9c6f01c8db12a076851b45a7762aaa6a8ebb8dc65
-  data.tar.gz: 3e603319eeeaaa034e1a9a4daddc61437f78187b5ba553bafb5f0c55c8fe342cb5f24a20f96cd711a125c1441028d42d0d4730085cb679b4d9655f67366f2869
+  metadata.gz: 5be883579ca22e2b86d5106204b4cc2213205bf7b0a49147f956522ebd550fa8670e5fa0671bf3ffe1982edaf5eb6a1f690155d21b2e2c5b1427260f508db93b
+  data.tar.gz: 31011b0958fe5c4a3b9109db4463099472b905e468afe00d5355c9666b71e4e06ee69091d46858aa46b99227704c572f4b178624cf684d96be96bdb02f785bc1

data/lib/rulp/rulp.rb

@@ -21,7 +21,7 @@ module Rulp
   attr_accessor :expressions
   extend Rulp::Log
   self.print_solver_outputs = true
-
+  self.log_level = Logger::DEBUG
   MIN = "Minimize"
   MAX = "Maximize"
 
@@ -174,8 +174,19 @@ module Rulp
       Rulp.log(Logger::DEBUG, "Solver took #{time}")
 
       Rulp.log(Logger::INFO, "Parsing result")
+
+      unless solver.outfile
+        raise "No output file detected. Solver failed"
+        return
+      end
+
       solver.store_results(@variables)
 
+      if solver.unsuccessful
+        raise "Solve failed: solution infeasible" if IO.read(solver.outfile).downcase.include?("infeasible")
+        raise "Solve failed: all units undefined"
+      end
+
       solver.remove_lp_file  if options[:remove_lp_file]
       solver.remove_sol_file if options[:remove_sol_file]
 

data/lib/solvers/cbc.rb

@@ -19,7 +19,7 @@ class Cbc < Solver
 
   def store_results(variables)
     rows = IO.read(@outfile).split("\n")
-    objective = rows[0].split(/\s+/)[-1].to_f
+    objective_str = rows[0].split(/\s+/)[-1]
     vars_by_name = {}
     rows[1..-1].each do |row|
       cols = row.strip.split(/\s+/)
@@ -28,6 +28,7 @@ class Cbc < Solver
     variables.each do |var|
       var.value = vars_by_name[var.to_s].to_f
     end
-    return objective
+    self.unsuccessful = rows[0].start_with?('Infeasible')
+    return objective_str.to_f
   end
 end

data/lib/solvers/glpk.rb

@@ -1,6 +1,6 @@
 class Glpk < Solver
   def solve
-    command = "#{executable} --lp #{@filename} %s --cuts --write #{@outfile}"
+    command = "#{executable} --lp #{@filename} %s --cuts --output #{@outfile}"
     command %= options[:gap] ? "--mipgap #{options[:gap]}" : ""
     exec(command)
   end
@@ -11,10 +11,16 @@ class Glpk < Solver
 
   def store_results(variables)
     rows = IO.read(@outfile).split("\n")
-    variables.zip(rows[-variables.count..-1]).each do |var, row|
-      cols = row.split(" ")
-      var.value = cols[[1, cols.count - 1].min].to_f
+    objective_str = rows[5].split(/\s+/)[-2]
+    vars_by_name = {}
+    rows[1..-1].each do |row|
+      cols = row.strip.split(/\s+/)
+      vars_by_name[cols[1].to_s] = cols[3].to_f
     end
-    return rows[1].split(" ")[-1]
+    variables.each do |var|
+      var.value = vars_by_name[var.to_s].to_f
+    end
+    self.unsuccessful = rows[-3].downcase.include?('infeasible')
+    return objective_str.to_f
   end
 end

data/lib/solvers/gurobi.rb

@@ -14,7 +14,7 @@ class Gurobi < Solver
 
   def store_results(variables)
     rows = IO.read(@outfile).split("\n")
-    objective = rows[0].split(/\s+/)[-1].to_f
+    objective_str = rows[0].split(/\s+/)[-1]
     vars_by_name = {}
     rows[1..-1].each do |row|
       cols = row.strip.split(/\s+/)
@@ -23,6 +23,7 @@ class Gurobi < Solver
     variables.each do |var|
       var.value = vars_by_name[var.to_s].to_f
     end
-    return objective
+    self.unsuccessful = rows.length.zero?
+    return objective_str.to_f
   end
 end

data/lib/solvers/scip.rb

@@ -44,7 +44,7 @@ class Scip < Solver
     stripped = start.sub(/Statistics.+/m, "").strip
     rows     = stripped.split("\n")
 
-    objective = rows[0].split(/\s+/)[-1].to_f
+    objective_str = rows[0].split(/\s+/)[-1]
 
     vars_by_name = {}
     rows[1..-1].each do |row|
@@ -54,7 +54,7 @@ class Scip < Solver
     variables.each do |var|
       var.value = vars_by_name[var.to_s].to_f
     end
-
-    return objective
+    self.unsuccessful = !(Float(objective_str) rescue false)
+    return objective_str.to_f
   end
 end

data/lib/solvers/solver.rb

@@ -1,5 +1,6 @@
 class Solver
   attr_reader :options, :outfile
+  attr_accessor :unsuccessful
 
   def initialize(filename, options)
     @options = options

data/test/test_basic_suite.rb

@@ -48,11 +48,11 @@ class BasicSuite < Minitest::Test
 
       # Integer variables respect integer bounds
       Rulp::Min(X_f).(solver)
-      assert_equal X_f.value, -345.4321
+      assert_in_delta X_f.value, -345.4321, 0.001
 
       # Integer variables respect integer bounds
       Rulp::Max(X_f).(solver)
-      assert_equal X_f.value, 345.4321
+      assert_in_delta X_f.value, 345.4321, 0.001
     end
   end
 end

data/test/test_infeasible.rb

@@ -0,0 +1,28 @@
+require_relative 'test_helper'
+##
+#
+# Given 50 items of varying prices
+# Get the minimal sum of 10 items that equals at least $15 dollars
+#
+##
+class InfeasibleTest < Minitest::Test
+  def setup
+    @items       = 30.times.map(&Shop_Item_b)
+    items_count = @items.sum
+    @items_costs = @items.map{|item| item * Random.rand(1.0...5.0)}.sum
+
+    @problem =
+    Rulp::Min( @items_costs ) [
+      items_count  >= 10,
+      @items_costs  >= 150_000
+    ]
+  end
+
+  def test_simple
+    each_solver do |solver|
+      assert_raises RuntimeError do
+        @problem.send(solver)
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.24
+  version: 0.0.25
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-03 00:00:00.000000000 Z
+date: 2016-02-29 00:00:00.000000000 Z
 dependencies: []
 description: A simple Ruby LP description DSL
 email: wc@pico.net.nz
@@ -40,6 +40,7 @@ files:
 - test/test_basic_suite.rb
 - test/test_boolean.rb
 - test/test_helper.rb
+- test/test_infeasible.rb
 - test/test_save_to_file.rb
 - test/test_simple.rb
 homepage: 
@@ -61,7 +62,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Ruby Linear Programming
@@ -69,6 +70,7 @@ test_files:
 - test/test_basic_suite.rb
 - test/test_boolean.rb
 - test/test_helper.rb
+- test/test_infeasible.rb
 - test/test_save_to_file.rb
 - test/test_simple.rb
 has_rdoc: