rulp 0.0.29 → 0.0.32

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09720b9d7a5928c65f128a799c5bfd65a1f7faa1
-  data.tar.gz: f0a7e222e69add27ce719461ebbc95bac26f8061
+  metadata.gz: 7d2c9a6eeda7ec471a82cd94ec79672cb7e913f3
+  data.tar.gz: 2b829c2e34f3c3f570918032b3936aa54d9c8507
 SHA512:
-  metadata.gz: b850be5ea33feb7209b15a5b77af3dc53cd7a286936502178d747c3a906ef7aebf3a1c35949ec3cda9c9f9bc6b2461779b32c39e97cf732c7d5d547aad2165d7
-  data.tar.gz: a5314cb33474f9116733237c94887bb9d8d2aef3536e4f6a398d57ac1b39d3995d508e8840cd61c5c47aac670bad40d4d2378e8b3e8e636d235eb34deb245364
+  metadata.gz: d374b099370168788b3b667e29c30035d40b89d88dffd765fa77d337a6ae6af00002ec5340f5d308567aedd14680f1277db6144dea6c52babe658095244c7aad
+  data.tar.gz: 1661630baad3f122d45fc6e35bfc8cce755ae36b42b52f2f5dae444cd8e02d18caf5435857729ae5348de8cafc9bb93fd87c0ef40c9ddfff2701226eb9a12761

data/lib/extensions/kernel_extensions.rb

@@ -23,13 +23,13 @@ module Kernel
       case method_name[-1]
       when "b"
         method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)]
-        return BV.send(method_name, args)
+        return BV.definition(method_name, args)
       when "i"
         method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)]
-        return IV.send(method_name, args)
+        return IV.definition(method_name, args)
       when "f"
         method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)]
-        return LV.send(method_name, args)
+        return LV.definition(method_name, args)
       end
     end
     old_method_missing(value, *args)

data/lib/extensions/object_extensions.rb

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

data/lib/rulp/constraint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 # An LP Expression constraint. A mathematical expression of which the result
 # must be constrained in some way.

data/lib/rulp/expression.rb

@@ -8,10 +8,6 @@ class Expressions
     @expressions = expressions
   end
 
-  def +(other)
-    return Expressions.new(@expressions + [other])
-  end
-
   def to_s
     as_str = @expressions[0].to_s[3..-1]
     (@expressions.length - 1).times do |i|
@@ -45,9 +41,11 @@ class Expressions
   end
 
   def self.[](value)
-    return Expressions.new([Fragment.new(value, 1)]) if value.kind_of?(LV)
-    return Expressions.new([value]) if value.kind_of?(Fragment)
-    return value if value.kind_of?(Expressions)
+    case value
+    when LV then Expressions.new([Fragment.new(value, 1)])
+    when Fragment then Expressions.new([value])
+    when Expressions then value
+    end
   end
 
   def evaluate
@@ -104,12 +102,9 @@ class Fragment
   def to_s
     @as_str ||= begin
       case @operand
-      when -1
-        " - #{@lv}"
-      when 1
-        " + #{@lv}"
-      else
-      " + #{@operand} #{@lv}"
+      when -1 then " - #{@lv}"
+      when 1 then " + #{@lv}"
+      else " + #{@operand} #{@lv}"
       end
     end
   end

data/lib/rulp/lv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ##
 # An LP Variable. Used as arguments in LP Expressions.
 # The subtypes BV and IV represent Binary and Integer variables.
@@ -5,7 +7,9 @@
 ##
 class LV
   attr_reader :name, :args
-  attr_accessor :lt, :lte, :gt, :gte, :value
+  attr_writer :value
+  attr_accessor :lt, :lte, :gt, :gte
+
   include Rulp::Bounds
   include Rulp::Initializers
 
@@ -21,32 +25,15 @@ class LV
     "f"
   end
 
-  def self.method_missing(name, *args)
-    return self.definition(name, args)
-  end
-
-  def self.const_missing(name)
-    return self.definition(name)
-  end
-
-  def self.definition(name, args)
+  def self.definition(name, *args)
     identifier = "#{name}#{args.join("_")}"
-    self.class.send(:define_method, identifier){|index=nil|
-      if index
-        self.definition(name, index)
-      else
-        defined = LV::names_table["#{identifier}"]
-        if defined && defined.class != self
-          raise StandardError.new("ERROR:\n#{name} was already defined as a variable of type #{defined.class}."+
-                                  "You are trying to redefine it as a variable of type #{self}")
-        elsif(!defined)
-          self.new(name, args)
-        else
-          defined
-        end
-      end
-    }
-    return self.send(identifier) || self.new(name, args)
+    defined = LV::names_table["#{identifier}"]
+    case defined
+    when self then defined
+    when nil then self.new(name, args)
+    else raise StandardError.new("ERROR:\n#{name} was already defined as a variable of type #{defined.class}."+
+                              "You are trying to redefine it as a variable of type #{self}")
+    end
   end
 
   def * (numeric)
@@ -68,12 +55,10 @@ class LV
 
   def value
     return nil unless @value
-    if self.class == BV
-      return @value.round(2) == 1
-    elsif self.class == IV
-      return @value
-    else
-      @value
+    case self
+    when BV then @value.round(2) == 1
+    when IV then @value
+    else @value
     end
   end
 
@@ -81,10 +66,6 @@ class LV
     value ? value : false
   end
 
-  def selected?
-    value?
-  end
-
   def inspect
     "#{name}#{args.join("-")}(#{suffix})[#{value.nil? ? 'undefined' : value }]"
   end

data/lib/rulp/rulp.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "rulp_bounds"
 require_relative "rulp_initializers"
 require_relative "lv"
@@ -84,13 +86,14 @@ module Rulp
 
   class Problem
 
-    attr_accessor :result, :trace
+    attr_accessor :result, :trace, :lp_file
 
     def initialize(objective, objective_expression)
       @objective = objective
       @variables = Set.new
       @objective_expression = objective_expression.kind_of?(LV) ? 1 * objective_expression : objective_expression
       @variables.merge(@objective_expression.variables)
+      @lp_file = nil
       @constraints = []
     end
 
@@ -124,11 +127,9 @@ module Rulp
 
     def constraints
       return  "0 #{@variables.first} = 0" if @constraints.length == 0
-      constraints_str = " "
-      @constraints.each.with_index{|constraint, i|
-        constraints_str << " c#{i}: #{constraint}\n"
-      }
-      constraints_str
+      @constraints.each.with_index.map{|constraint, i|
+        " c#{i}: #{constraint}\n"
+      }.join
     end
 
     def integers
@@ -187,7 +188,11 @@ module Rulp
         raise "Solve failed: all units undefined"
       end
 
-      solver.remove_lp_file  if options[:remove_lp_file]
+      if options[:remove_lp_file]
+        solver.remove_lp_file
+      else
+        self.lp_file = solver.filename
+      end
       solver.remove_sol_file if options[:remove_sol_file]
 
       self.result = @objective_expression.evaluate

data/lib/rulp/rulp_bounds.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Rulp
   module Bounds
 

data/lib/rulp/rulp_initializers.rb

@@ -3,6 +3,7 @@ module Rulp
     def initialize(name, args)
       @name = name
       @args = args
+      @value = nil
       @identifier = "#{self.name}#{self.args.join("_")}"
       raise StandardError.new("Variable with the name #{self} of a different type (#{LV::names_table[self.to_s].class}) already exists") if LV::names_table[self.to_s]
       LV::names_table[self.to_s] = self

data/lib/solvers/scip.rb

@@ -17,7 +17,7 @@ class Scip < Solver
   end
 
   def settings_file
-    existing_settings = if File.exists?("./scip.set")
+    existing_settings = if File.exist?("./scip.set")
        IO.read("./scip.set")
     else
       ""

data/lib/solvers/solver.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rulp
 version: !ruby/object:Gem::Version
-  version: 0.0.29
+  version: 0.0.32
 platform: ruby
 authors:
 - Wouter Coppieters
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-01 00:00:00.000000000 Z
+date: 2016-07-14 00:00:00.000000000 Z
 dependencies: []
 description: A simple Ruby LP description DSL
 email: wc@pico.net.nz