opl 2.3.0 → 2.4.0

data/lib/opl.rb

@@ -1,46 +1,29 @@
 require "rglpk"
 
-#TODO
-#unbounded or conflicting bounds messages
-#	e.g.
-#		lp = maximize(
-#			"x",
-#		subject_to([
-#			"x >= 0"
-#		]))
-#
-#should return an error message
-
-#2.4
-#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
+#Implement more advanced TSPs in order to
+	#make sure extreme cases of foralls and sums
 	#are handled
 
-#4.0
+#3.1
 #absolute value: abs()
 
-#4.1
+#3.2
 #if --> then statements
 
-#4.2
+#3.3
 #or statements
 
-#4.3
+#3.4
 #piecewise statements
 
-#4.4
+#3.5
 #duals, sensitivity, etc. - I could simply allow
 	#access to the rglpk object wrapper
 
+#4.0
+#import excel sheets as data
+
 $default_epsilon = 0.01
 
 class String
@@ -293,6 +276,8 @@ class OPL
 			text = text.sub_paren_with_array
 			if (text.gsub(" ","")).scan(/\]\,/).size != text.scan(/in/).size
 				raise "The following sum() constraint is incorrectly formatted: #{text}. Please see the examples in test.rb for sum() constraints. I suspect you are missing a comma somewhere."
+			elsif (text.gsub(" ","").include?("=") || text.gsub(" ","").include?("<") || text.gsub(" ","").include?(">"))
+				raise "The following sum() constraint cannot have a equalities in it (a.k.a. =, <, >): #{text}"
 			end
 			final_text = ""
 			element = text.split(",")[-1].gsub(" ","")
@@ -764,6 +749,7 @@ class OPL
 		attr_accessor :matrix_solution
 		attr_accessor :error_message
 		attr_accessor :stop_processing
+		attr_accessor :solution_type
 
 		def keys
 			[:objective, :constraints, :rows, :solution, :formatted_constraints, :rglpk_object, :solver, :matrix, :simplex_message, :mip_message, :data]
@@ -1093,5 +1079,12 @@ def optimize(optimization, objective, lp)
 		lp.rglpk_object = lp.error_message
 		lp.objective = lp.error_message
 	end
+	if lp.rglpk_object.status.to_s == "4"
+		raise "There is no feasible solution."
+	elsif lp.rglpk_object.status.to_s == "6"
+		raise "The solution is unbounded."
+	elsif lp.rglpk_object.status.to_s == "1"
+		raise "The solution is undefined."
+	end
 	lp
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opl
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 2.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-13 00:00:00.000000000 Z
+date: 2013-10-21 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.