rulp 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e2294411951f1ca37ef2ffe418a7b28ee3af92a9
-  data.tar.gz: 800d2fb52a1f6dba2f671bf026b0696eeada97e2
+  metadata.gz: 51fa526dd152f836d5b5e6f4658352847828fa8e
+  data.tar.gz: 0858e2314d40ee7d7ac6e085634bfeb064d1d9f2
 SHA512:
-  metadata.gz: c34eb327344222dbde5e0184aeda3dd35c0f809666c80641e787859821085c8a7d0d5f6d33065c700d86ff989713d651c3f2b4273e089e8878aa2f06b20009c0
-  data.tar.gz: a947a74465255076740c4c8ea459a12546c5bacc7f5234410f6bf516bfcc42d640f9fbbfd2b6d6e5c6c3e9450009fa0dd0950212c9736108f5bdd3b2ede44ad5
+  metadata.gz: 5c0fdb11528ae4ce52edf332902b0941fc4c298c2a06d21f41b11da96d8d8216e7f495a96a47587dd0588563981ed656af74468dcc06b9cd7be5f27682fc5363
+  data.tar.gz: 6603c3523a9a755eef88ad563d71ab27282a37cc539edcb733a765cefdf0c4f57e81c74308d57af5b2f7d099e662a95523ed9a511b77e0a15a5495b197b72d6a

data/lib/rulp/expression.rb

@@ -13,9 +13,11 @@ class Expressions
   end
 
   def to_s
-    @expressions.map{|expression|
-      [expression.operand < 0 ? " " : " + ", expression.to_s]
-    }.flatten[1..-1].join("")
+    as_str = @expressions[0].to_s[3..-1]
+    (@expressions.length - 1).times do |i|
+      as_str << @expressions[i + 1].to_s
+    end
+    as_str
   end
 
   def variables
@@ -100,13 +102,15 @@ class Fragment
   end
 
   def to_s
-    case @operand
-    when -1
-      "-#{@lv}"
-    when 1
-      "#{@lv}"
-    else
-    "#{@operand} #{@lv}"
+    @as_str ||= begin
+      case @operand
+      when -1
+        " - #{@lv}"
+      when 1
+        " + #{@lv}"
+      else
+      " + #{@operand} #{@lv}"
+      end
     end
   end
 end

data/lib/rulp/rulp.rb

@@ -74,9 +74,13 @@ module Rulp
     end
 
     def [](*constraints)
+      "Got constraints".log(:info)
       constraints.flatten!
+      "Flattened constraints".log(:info)
       @constraints.concat(constraints)
-      @variables.merge(constraints.map(&:variables).flatten)
+      "Joint constraints".log(:info)
+      @variables.merge(constraints.flat_map(&:variables).uniq)
+      "Extracted variables".log(:info)
       self
     end
 
@@ -98,14 +102,12 @@ module Rulp
     end
 
     def constraints
-      constraints_str = @constraints.map.with_index{|constraint, i|
-        " c#{i}: #{constraint}"
-      }.join("\n").strip
-      if constraints_str.empty?
-        "0 #{@variables.first} = 0"
-      else
-        "  #{constraints_str}"
-      end
+      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
     end
 
     def integers
@@ -137,10 +139,10 @@ module Rulp
       filename = get_output_filename
       solver = SOLVERS[type].new(filename, options)
 
-        "Writing problem".log(:info)
-        IO.write(filename, self)
+      "Writing problem".log(:info)
+      IO.write(filename, self)
 
-        `open #{filename}` if options[:open_definition]
+      `open #{filename}` if options[:open_definition]
 
       "Solving problem".log(:info)
       _, time = _profile{ solver.solve }

data/lib/rulp/rulp_initializers.rb

@@ -3,6 +3,7 @@ module Rulp
     def initialize(name, args)
       @name = name
       @args = args
+      @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
     end
@@ -22,7 +23,7 @@ module Rulp
     end
 
     def to_s
-      "#{self.name}#{self.args.join("_")}"
+      @identifier
     end
   end
 end

metadata

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