rulp 0.0.45 → 0.0.46

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 58a47250456efb480a41ea21a923355242c38c27d1e9eb04d17782493a51b083
-  data.tar.gz: e7b05a98c43d57035049cd1b2537fd3ecb42792e08114d8dd0729229092e96ac
+  metadata.gz: 79e259317b851f96717dc4e0e66b07f08cf035efc420eeef915db1f40d7b5389
+  data.tar.gz: 68cfcdf7d345b9e1ee0c66b70b822a3edcac50af649a906902ef08db4f673f87
 SHA512:
-  metadata.gz: d12655f339c1095d9bc5f3c4620829965e3375ae4025fceeaea0438d97e6f334bdc0b727e0ac975d03ef8b688da4775c6c34cc9b56c0885cfa6fe38cd757d2dc
-  data.tar.gz: 9a3bd500cabd00c9118ff81cd79da588d629f5ee5788eae993d986161cd2ce3da715965534491f3d088b202154e53f124f7053dea671df606b028db96e24cdb4
+  metadata.gz: 0fe7414a15de24cd86043956491056cda383ce81ab21a7010add8715fbb2d2a376ff284faade9f7e66a512b1ae3c62926dcceb9dcf9a2dfe3e497eb11f558b8e
+  data.tar.gz: 3596934464b9aa30a43467fdc08e69a935f8d53219d2edf1b8110ca1806e71d5507802bd79d770df4d17be1d35f905e5b1b2a6554f3cbb4b5e78548864ebe9ee

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

@@ -1,3 +1,3 @@
 module Rulp
-  VERSION = '0.0.45'
-end
+  VERSION = '0.0.46'
+end

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.45
+  version: 0.0.46
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-03-03 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
@@ -42,6 +42,8 @@ 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:
@@ -71,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