rulp 0.0.43 → 0.0.45

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d68bde7a38b8bf0a62ead7589727428da3ca212d
-  data.tar.gz: 19deb3f77fffeece80b35ca0ed00825fbe5fca4d
+SHA256:
+  metadata.gz: 58a47250456efb480a41ea21a923355242c38c27d1e9eb04d17782493a51b083
+  data.tar.gz: e7b05a98c43d57035049cd1b2537fd3ecb42792e08114d8dd0729229092e96ac
 SHA512:
-  metadata.gz: 76162b58a10cd20302f53f413b38c1e2795fc1b63f26fe5e1f6851efc79eefd5e3dd62b17db606e136290e7ade442dbadc596e5a69ebdb8f4be7d8cf8edfdd3f
-  data.tar.gz: 5c2341e5a8bdbab7f941b9e699e226b0db0ca2d90c7d891a447451a6928b0e068bbf9e69eee013a9d8bf25b55424e3bce98ab1910c812041b9a3aa9a1bef9db7
+  metadata.gz: d12655f339c1095d9bc5f3c4620829965e3375ae4025fceeaea0438d97e6f334bdc0b727e0ac975d03ef8b688da4775c6c34cc9b56c0885cfa6fe38cd757d2dc
+  data.tar.gz: 9a3bd500cabd00c9118ff81cd79da588d629f5ee5788eae993d986161cd2ce3da715965534491f3d088b202154e53f124f7053dea671df606b028db96e24cdb4

data/lib/extensions/extensions.rb

@@ -1,5 +1,4 @@
-require_relative './array_extensions'
 require_relative './kernel_extensions'
 require_relative './object_extensions'
 require_relative './file_extensions'
-require_relative './os_extensions'
+require_relative './os_extensions'

data/lib/extensions/kernel_extensions.rb

@@ -18,17 +18,15 @@ module Kernel
   alias_method :old_method_missing, :method_missing
   def method_missing(value, *args)
     method_name = "#{value}" rescue ""
-    start = method_name[0]
-    if (start <= "Z" && start >= "A")
-      case method_name[-1]
-      when "b"
-        method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)]
+    if ("A".."Z").cover?(method_name[0])
+      if method_name.end_with?(BV.suffix)
+        method_name = method_name.chomp(BV.suffix).chomp("_")
         return BV.definition(method_name, args)
-      when "i"
-        method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)]
+      elsif method_name.end_with?(IV.suffix)
+        method_name = method_name.chomp(IV.suffix).chomp("_")
         return IV.definition(method_name, args)
-      when "f"
-        method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)]
+      elsif method_name.end_with?(LV.suffix)
+        method_name = method_name.chomp(LV.suffix).chomp("_")
         return LV.definition(method_name, args)
       end
     end

data/lib/extensions/object_extensions.rb

@@ -14,13 +14,13 @@ class << Object
   alias_method :old_const_missing, :const_missing
   def const_missing(value)
     method_name = "#{value}".split("::")[-1] rescue ""
-    if (("A".."Z").include?(method_name[0]))
-      if(method_name.end_with?("b"))
-        return BV.definition(method_name[0..(method_name[-2] == "_" ? -3 : -2)])
-      elsif(method_name.end_with?("i"))
-        return IV.definition(method_name[0..(method_name[-2] == "_" ? -3 : -2)])
-      elsif(method_name.end_with?("f"))
-        return LV.definition(method_name[0..(method_name[-2] == "_" ? -3 : -2)])
+    if ("A".."Z").cover?(method_name[0])
+      if method_name.end_with?(BV.suffix)
+        return BV.definition(method_name.chomp(BV.suffix).chomp("_"))
+      elsif method_name.end_with?(IV.suffix)
+        return IV.definition(method_name.chomp(IV.suffix).chomp("_"))
+      elsif method_name.end_with?(LV.suffix)
+        return LV.definition(method_name.chomp(LV.suffix).chomp("_"))
       end
     end
     old_const_missing(value)

data/lib/rulp/lv.rb

@@ -21,8 +21,12 @@ class LV
     "#{self.name}_#{self.suffix}"
   end
 
+  def self.suffix
+    ENV['RULP_LV_SUFFIX'] || "f"
+  end
+
   def suffix
-    "f"
+    self.class.suffix
   end
 
   def self.definition(name, *args)
@@ -74,12 +78,13 @@ class LV
 end
 
 class BV < LV;
-  def suffix
-    "b"
+  def self.suffix
+    ENV['RULP_BV_SUFFIX'] || "b"
   end
 end
+
 class IV < LV;
-  def suffix
-    "i"
+  def self.suffix
+    ENV['RULP_IV_SUFFIX'] || "i"
   end
-end
+end

data/lib/rulp/version.rb

@@ -1,3 +1,3 @@
 module Rulp
-  VERSION = '0.0.43'
+  VERSION = '0.0.45'
 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)

data/test/test_boolean.rb

@@ -8,8 +8,8 @@ require_relative 'test_helper'
 class BooleanTest < 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
+    items_count = @items.inject(:+)
+    @items_costs = @items.map{|item| item * Random.rand(1.0...5.0)}.inject(:+)
 
     @problem =
     Rulp::Min( @items_costs ) [

data/test/test_infeasible.rb

@@ -8,8 +8,8 @@ require_relative 'test_helper'
 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
+    items_count = @items.inject(:+)
+    @items_costs = @items.map{|item| item * Random.rand(1.0...5.0)}.inject(:+)
 
     @problem =
     Rulp::Min( @items_costs ) [

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.43
+  version: 0.0.45
 platform: ruby
 authors:
 - Wouter Coppieters
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2016-11-27 00:00:00.000000000 Z
+date: 2024-03-03 00:00:00.000000000 Z
 dependencies: []
 description: A simple Ruby LP description DSL
 email: wc@pico.net.nz
@@ -18,7 +18,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/rulp
-- lib/extensions/array_extensions.rb
 - lib/extensions/extensions.rb
 - lib/extensions/file_extensions.rb
 - lib/extensions/kernel_extensions.rb
@@ -45,10 +44,10 @@ files:
 - test/test_infeasible.rb
 - test/test_save_to_file.rb
 - test/test_simple.rb
-homepage: 
+homepage:
 licenses: []
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -63,9 +62,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
-signing_key: 
+rubygems_version: 3.5.6
+signing_key:
 specification_version: 4
 summary: Ruby Linear Programming
 test_files:

data/lib/extensions/array_extensions.rb

@@ -1,5 +0,0 @@
-class Array
-  def sum
-    self.inject(:+)
-  end
-end