rulp 0.0.5 → 0.0.6

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    Yzk4NWFlMmYwMGQ0ZDFjZTUxMmEwNzlkNDAwZmQ4MDU3YWY2Zjg5Mg==
+    YWVhZGY3OGVlMTcyMjUxOWJhMTdiN2FjOWJjMzRmYzBmYjFkZWU1MA==
   data.tar.gz: !binary |-
-    MDI3Y2E5MjdhNTY2M2FiZDBhZGMzZTg4MzU2ZDRiMzgyOGFmZTIzMA==
+    MmVkYjg0M2E4NzMxNTU2ZjM5OWUwYzBlOGVjZGNjNDE0MDJjYjBiZg==
 SHA512:
   metadata.gz: !binary |-
-    YTg0OTJlNjhiMGJkNjdlM2U1ZTQ0ZGMyMTkwMTc0ZmI5NjliZjIzM2M3NjE1
-    N2VlNTBiNDBjZmIwOTA5MWI2OGEzZjhkYzYyMmFkOTkzNWM5YTg5OWUzNTc3
-    ZmUwY2U0ODM0ZmJhNTdiNjY2M2JjZDNhNzI0MTJmZDllMDY4Y2Q=
+    OGY1MjkwYmExY2YwYzUwOTM0ZGI5NjM3NDNkZTAwYWRiOTk5MGMwYmE3YzU5
+    YTEyODRkMDVhMTM5YTFkODBhZDQyZjk4ODlmODFiZTliZjhkZWExMWE2ZTBh
+    N2IwMzVmZDMwNGM3OTJhZjQ1NmE3ODQ1ZjI4ODc4NjVmNDFkMWU=
   data.tar.gz: !binary |-
-    MzU4YjQxNzkzNTRlMmU0NzMyNTIyNGQ0NmE1ODM1YzU0NmYyYzFiZmM2YzI1
-    YmI2MTFkNWZmMzJjZWFmZjY0ZTAzODVmNTEwZTk5MDlkYjBhMmZhNzg1NzZm
-    NzFhNTllMTM1MTIwNmJmMDk3MGYyNTRmZGY5ZGMyM2U5YWI2ZjA=
+    MjJiOTA5N2NiNGJhOTY4ZmI0MTg2ZjY0MWMxOWQ4NDAzZGMyMWNhNWM3NmQ3
+    NjE4YjFkYjZiNmYzMmRlYzM5ZjhmZWNkOTM0ZWZjODYxZDFhMTViYWRmZDlm
+    ZDQ0NzM0MGYxNmRkNjVlOGVmODBmYjI3ZmMzNzdiZGI3NDhmZmM=

data/lib/extensions/kernel_extensions.rb

@@ -22,14 +22,14 @@ module Kernel
     if (start <= "Z" && start >= "A")
       case method_name[-1]
       when "b"
-        method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)] + args.join("_")
-        return BV.send(method_name)
+        method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)]
+        return BV.send(method_name, args)
       when "i"
-        method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)] + args.join("_")
-        return IV.send(method_name)
+        method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)]
+        return IV.send(method_name, args)
       when "f"
-        method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)] + args.join("_")
-        return LV.send(method_name)
+        method_name = method_name[0..(method_name[-2] == "_" ? -3 : -2)]
+        return LV.send(method_name, args)
       end
     end
     old_method_missing(value, *args)

data/lib/rulp/lv.rb

@@ -4,17 +4,17 @@
 # These are constructed dynamically by using the special Capitalised variable declaration syntax.
 ##
 class LV
-  attr_reader :name
+  attr_reader :name, :args
   attr_accessor :lt, :lte, :gt, :gte, :value
   include Rulp::Bounds
   include Rulp::Initializers
 
   def to_proc
-    ->(index){ send(self.meth(index)) }
+    ->(index){ send(self.meth, index) }
   end
 
-  def meth(*args)
-    "#{self.name}#{args.join("_")}_#{self.suffix}"
+  def meth
+    "#{self.name}_#{self.suffix}"
   end
 
   def suffix
@@ -22,26 +22,31 @@ class LV
   end
 
   def self.method_missing(name, *args)
-    return self.definition( "#{name}#{args.join("_")}" )
+    return self.definition(name, args)
   end
 
   def self.const_missing(name)
     return self.definition(name)
   end
 
-  def self.definition(name)
-    self.class.send(:define_method, name){
-      defined = LV::names_table["#{name}"]
-      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)
+  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
+        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(name) || self.new(name)
+    return self.send(identifier) || self.new(name, args)
   end
 
   def * (numeric)
@@ -73,7 +78,7 @@ class LV
   end
 
   def inspect
-    "#{name}(#{suffix})[#{value || 'undefined'}]"
+    "#{name}#{args.join("-")}(#{suffix})[#{value || 'undefined'}]"
   end
 end
 

data/lib/rulp/rulp_initializers.rb

@@ -1,9 +1,10 @@
 module Rulp
   module Initializers
-    def initialize(name)
-      raise StandardError.new("Variable with the name #{name} of a different type (#{LV::names_table[name].class}) already exists") if LV::names_table["#{name}"]
-      LV::names_table["#{name}"] = self
+    def initialize(name, args)
       @name = name
+      @args = args
+      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
     end
 
     def self.included(base)
@@ -21,7 +22,7 @@ module Rulp
     end
 
     def to_s
-      "#{self.name}"
+      "#{self.name}#{self.args.join("_")}"
     end
   end
 end

data/lib/solvers/cbc.rb

@@ -17,7 +17,7 @@ class Cbc < Solver
       vars_by_name[cols[1].to_s] = cols[2].to_f
     end
     variables.each do |var|
-      var.value = vars_by_name[var.name.to_s].to_f
+      var.value = vars_by_name[var.to_s].to_f
     end
     return objective
   end

data/lib/solvers/scip.rb

@@ -23,7 +23,7 @@ class Scip < Solver
       vars_by_name[cols[0].to_s] = cols[1].to_f
     end
     variables.each do |var|
-      var.value = vars_by_name[var.name.to_s].to_f
+      var.value = vars_by_name[var.to_s].to_f
     end
 
     return objective

metadata

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