opl 2.2.0 → 2.3.0

data/lib/opl.rb

@@ -12,10 +12,14 @@ require "rglpk"
 #should return an error message
 
 #2.4
-#way more comprehensive test suite of functionality so far
+#catch this error for sum() in forall()
+	#"forall(i in (0..2), sum(j in (0..2), x[i][j] = 1))"
+	#should be:
+	#"forall(i in (0..2), sum(j in (0..2), x[i][j]) = 1)"
 
 #3.0
 #multiple level sub notation e.g. x[1][[3]]
+	#why would one use that notation rather than x[1][3]???
 
 #3.1
 #make sure extreme cases of foralls and sums
@@ -183,16 +187,25 @@ class OPL
 		def self.forall(text)
 			#in: "i in (0..2), x[i] <= 5"
 			#out: ["x[0] <= 5", "x[1] <= 5", "x[2] <= 5"]
+			helper = self
 			text = text.sub_paren_with_array
 			if ((text.gsub(" ","")).scan(/\]\,/).size) + ((text.gsub(" ","")).scan(/\)\,/).size) != text.gsub(" ","").scan(/in/).size
 				raise "The following forall() constraint is incorrectly formatted: #{text}. Please see the examples in test.rb for forall() constraints. I suspect you are missing a comma somewhere."
 			end
 			final_constraints = []
-			indices = text.scan(/[a-z] in/).map{|sc|sc[0]}
-			values = text.scan(/\s\[[\-\s\d+,]+\]/).map{|e|e.gsub(" ", "").scan(/[\-\d]+/)}
+			if text.include?("sum")
+				indices = text.split("sum")[0].scan(/[a-z] in/).map{|sc|sc[0]}
+				values = text.split("sum")[0].scan(/\s\[[\-\s\d+,]+\]/).map{|e|e.gsub(" ", "").scan(/[\-\d]+/)}
+			else
+				indices = text.scan(/[a-z] in/).map{|sc|sc[0]}
+				values = text.scan(/\s\[[\-\s\d+,]+\]/).map{|e|e.gsub(" ", "").scan(/[\-\d]+/)}
+			end
+			#TODO: the indices and values should only be those
+				#of the forall(), not of any sum() that is
+				#inside the forall()
 			index_value_pairs = indices.zip(values)
 			variable = text.scan(/[a-z]\[/)[0].gsub("[","")
-			value_combinations = self.mass_product(values)
+			value_combinations = helper.mass_product(values)
 			value_combinations.each_index do |vc_index|
 				value_combination = value_combinations[vc_index]
 				value_combination = [value_combination] unless value_combination.is_a?(Array)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opl
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-12 00:00:00.000000000 Z
+date: 2013-10-13 00:00:00.000000000 Z
 dependencies: []
 description: Built on top of the rglpk gem for linear programming, this gem is meant
   to give you a beautifully simple way to formulate your linear or mixed integer program.