opl 0.1.1 → 0.2.0

data/lib/opl.rb

@@ -2,24 +2,29 @@ require "rglpk"
 
 #TODO
 #1.0
+#object structure
 
-#2.0
-#data arrays
+#2.1
 #setting variable values in constraints
 	#and then using that variable value in further constraints
-#a matrix representation of the solution if using
-	#sub notation
+		#Look into fixed variables in the glp documentation
+#2.2
 #summing of variables
 	#e.g. x1 + x1 <= 3
-#object structure
+#2.3
+#allow a POSITIVE: x option or NEGATIVE: x
 
 #3.0
-#will have to figure out "<" and ">"
+#a matrix representation of the solution if using
+	#sub notation
+#data arrays
+
+#4.0
 #make sure extreme cases of foralls and sums
 	#are handled
 #multiple level sub notation e.g. x[1][[3]]
 
-#4.0
+#5.0
 #absolute value: abs()
 #if --> then statements
 #or statements
@@ -27,6 +32,8 @@ require "rglpk"
 
 #write as module
 
+$default_epsilon = 0.01
+
 def sides(equation)
 	if equation.include?("<=")
 		char = "<="
@@ -284,12 +291,14 @@ class Row
 	attr_accessor :lower_bound
 	attr_accessor :upper_bound
 	attr_accessor :variable_coefficient_pairs
+	attr_accessor :epsilon
 
-	def initialize(name, lower_bound, upper_bound)
+	def initialize(name, lower_bound, upper_bound, epsilon)
 		@name = name
 		@lower_bound = lower_bound
 		@upper_bound = upper_bound
 		@variable_coefficient_pairs = []
+		@epsilon = epsilon
 	end
 end
 
@@ -475,9 +484,9 @@ def produce_variable_type_hash(variable_types, all_variables)
 	variable_type_hash = {}
 	variable_types.each do |vt|
 		type = vt.gsub(" ","").split(":")[0]
-		if type == "BOOLEAN"
+		if type.downcase == "boolean"
 			type_number = 3
-		elsif type == "INTEGER"
+		elsif type.downcase == "integer"
 			type_number = 2
 		end
 		variables = vt.split(":")[1].gsub(" ","").split(",")
@@ -491,7 +500,9 @@ def produce_variable_type_hash(variable_types, all_variables)
 	variable_type_hash
 end
 
-def subject_to(constraints, variable_types=[])
+def subject_to(constraints, options=[])
+	variable_types = options.find_all{|option|option.downcase.include?("boolean") || option.downcase.include?("integer")} || []
+	epsilon = options.find_all{|option|option.downcase.include?("epsilon")}.first.gsub(" ","").split(":")[1].to_f rescue $default_epsilon
 	constraints = constraints.flatten
 	constraints = split_equals_a(constraints)
 	constraints = constraints.map do |constraint|
@@ -531,10 +542,10 @@ def subject_to(constraints, variable_types=[])
 			bound = value.split(">=")[1].to_f
 			upper_bound = (bound*-1).to_s
 		elsif value.include?("<")
-			upper_bound = (value.split("<")[1]).to_f - 1
+			upper_bound = (value.split("<")[1]).to_f - epsilon
 		elsif value.include?(">")
 			negate = true
-			bound = (value.split(">")[1]).to_f + 1
+			bound = (value.split(">")[1]).to_f + epsilon
 			upper_bound = (bound*-1).to_s
 		end
 		coefs = coefficients(sides(value)[:lhs])
@@ -549,7 +560,7 @@ def subject_to(constraints, variable_types=[])
 		end
 		vars = variables(sides(value)[:lhs])
 		zero_coef_vars = all_vars - vars
-		row = Row.new(name, lower_bound, upper_bound)
+		row = Row.new(name, lower_bound, upper_bound, epsilon)
 		row.constraint = constraint
 		coefs = coefs + zero_coef_vars.map{|z|0}
 		vars = vars + zero_coef_vars

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opl
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors: