rulp 0.0.44 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: b02471f804f1086c6193730ce602be9cf03d3ab4
-  data.tar.gz: a9f7197bb1aeb4a1a707333244b6600fed798322
+SHA256:
+  metadata.gz: 79e259317b851f96717dc4e0e66b07f08cf035efc420eeef915db1f40d7b5389
+  data.tar.gz: 68cfcdf7d345b9e1ee0c66b70b822a3edcac50af649a906902ef08db4f673f87
 SHA512:
-  metadata.gz: 5268c02947e586c5ad74630a9d9aadbca40c29f9ea5078f0f2a31563fdc81016a0664fc8d1f5b0406a7a5fe5d63d4e0ddfbd526a555f6b02525b509271a7707f
-  data.tar.gz: 280a4f73804264683b9f65cfe42244934f12cf5a585a62e13f6d7cd8823466d1fc1fb43ff83d694fdf6d3e0a1e7cc0c29fbd373a53885f3b3b1f318435b6c283
+  metadata.gz: 0fe7414a15de24cd86043956491056cda383ce81ab21a7010add8715fbb2d2a376ff284faade9f7e66a512b1ae3c62926dcceb9dcf9a2dfe3e497eb11f558b8e
+  data.tar.gz: 3596934464b9aa30a43467fdc08e69a935f8d53219d2edf1b8110ca1806e71d5507802bd79d770df4d17be1d35f905e5b1b2a6554f3cbb4b5e78548864ebe9ee

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/expression.rb

@@ -21,15 +21,14 @@ class Expressions
     @expressions.map(&:variable)
   end
 
-  [:==, :<, :<=, :>, :>=].each do |constraint_type|
-    define_method(constraint_type){|value|
+  %i[== < <= > >=].each do |constraint_type|
+    define_method(constraint_type) do |value|
       Constraint.new(self, constraint_type, value)
-    }
+    end
   end
 
   def -@
-    -self.expressions[0]
-    self
+    self.class.new(expressions.map(&:-@))
   end
 
   def -(other)
@@ -38,7 +37,7 @@ class Expressions
   end
 
   def +(other)
-    Expressions.new(self.expressions + Expressions[other].expressions)
+    Expressions.new(expressions + Expressions[other].expressions)
   end
 
   def self.[](value)
@@ -50,7 +49,7 @@ class Expressions
   end
 
   def evaluate
-    self.expressions.map(&:evaluate).inject(:+)
+    expressions.map(&:evaluate).inject(:+)
   end
 end
 
@@ -66,19 +65,19 @@ class Fragment
   end
 
   def +(other)
-    return Expressions.new([self] + Expressions[other].expressions)
+    Expressions.new([self] + Expressions[other].expressions)
   end
 
   def -(other)
     self.+(-other)
   end
 
-  def *(value)
-    Fragment.new(@lv, @operand * value)
+  def *(other)
+    Fragment.new(@lv, @operand * other)
   end
 
   def evaluate
-    if [TrueClass,FalseClass].include? @lv.value.class
+    if [TrueClass, FalseClass].include? @lv.value.class
       @operand * (@lv.value ? 1 : 0)
     else
       @operand * @lv.value
@@ -94,20 +93,18 @@ class Fragment
     @lv
   end
 
-  [:==, :<, :<=, :>, :>=].each do |constraint_type|
-    define_method(constraint_type){|value|
+  %i[== < <= > >=].each do |constraint_type|
+    define_method(constraint_type) do |value|
       Constraint.new(Expressions.new(self), constraint_type, value)
-    }
+    end
   end
 
   def to_s
-    @as_str ||= begin
-      case @operand
-      when -1 then " - #{@lv}"
-      when 1 then " + #{@lv}"
-      when ->(op){ op < 0} then " - #{@operand.abs} #{@lv}"
-      else " + #{@operand} #{@lv}"
-      end
-    end
+    @as_str ||= case @operand
+                when -1 then " - #{@lv}"
+                when 1 then " + #{@lv}"
+                when ->(op) { op < 0 } then " - #{@operand.abs} #{@lv}"
+                else " + #{@operand} #{@lv}"
+                end
   end
-end
+end

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.44'
-end
+  VERSION = '0.0.46'
+end

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 ) [

data/test/test_negate_expression.rb

@@ -0,0 +1,30 @@
+require_relative 'test_helper'
+
+class NegateExpressionTest < Minitest::Test
+
+  def test_negate_expression
+    @problem = Rulp::Max(- (X1_i + 2 * X2_i))
+    @problem[
+       X1_i + X2_i == 10,
+       X1_i >= 0,
+       X2_i >= 0
+    ]
+
+    @problem.solve
+    assert X1_i.value == 10
+    assert X2_i.value == 0
+  end
+
+  def test_double_negate_expression
+    @problem = Rulp::Max(-(-(X1_i + 2 * X2_i)))
+    @problem[
+       X1_i + X2_i == 10,
+       X1_i >= 0,
+       X2_i >= 0
+    ]
+
+    @problem.solve
+    assert X1_i.value == 0
+    assert X2_i.value == 10
+  end
+end

data/test/test_negate_term.rb

@@ -0,0 +1,19 @@
+require_relative 'test_helper'
+
+class NegateTerm < Minitest::Test
+  def setup
+    @problem = Rulp::Max(-X1_i + 2 * X2_i)
+    @problem[
+      X1_i + X2_i == 10,
+      X1_i >= 0,
+      X2_i >= 0
+    ]
+
+    @problem.solve
+  end
+
+  def test_negate_term
+    assert X1_i.value == 0
+    assert X2_i.value == 10
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.44
+  version: 0.0.46
 platform: ruby
 authors:
 - Wouter Coppieters
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-08-01 00:00:00.000000000 Z
+date: 2024-04-25 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
@@ -43,12 +42,14 @@ files:
 - test/test_boolean.rb
 - test/test_helper.rb
 - test/test_infeasible.rb
+- test/test_negate_expression.rb
+- test/test_negate_term.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 +64,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:
@@ -73,5 +73,7 @@ test_files:
 - test/test_boolean.rb
 - test/test_helper.rb
 - test/test_infeasible.rb
+- test/test_negate_expression.rb
+- test/test_negate_term.rb
 - test/test_save_to_file.rb
 - test/test_simple.rb

data/lib/extensions/array_extensions.rb

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