opl 0.0.1 → 0.1.0

data/lib/opl.rb

@@ -1,31 +1,34 @@
 require "rglpk"
 
 #TODO
-#my next goal should be handling all basic constraints
-	#forget foralls and sums for a second
-	#just allow the user to write a linear
-		#model in a pleasant syntax
-#make sure extreme cases of foralls and sums
-	#are handled
+#1.0
+
+#2.0
+#summing of variables
+	#e.g. x1 + x1 <= 3
 #need to be able to handle arithmetic operations
 	#within a constraint or index
 		#e.g. sum(i in (1..3), x[i-1])
 #a matrix representation of the solution if using
 	#sub notation
+
+#3.0
+#make sure extreme cases of foralls and sums
+	#are handled
 #multiple level sub notation e.g. x[1][[3]]
-#all relationships (<, >, =, <=, >=)
-#constants in constraints and objectives
-#float coefficients and constants
+#float coefficients and constants (does rglpk even handle this?)
+	#will have to figure out "<" and ">"
+	
 #write as module
 
 def sides(equation)
-	if equation.include?("<")
+	if equation.include?("<=")
 		char = "<="
-	elsif equation.include?(">")
+	elsif equation.include?(">=")
 		char = ">="
-	elsif equation.include?("<=")
+	elsif equation.include?("<")
 		char = "<"
-	elsif equation.include?("<=")
+	elsif equation.include?(">")
 		char = ">"
 	elsif equation.include?("=")
 		char = "="
@@ -258,6 +261,7 @@ class Objective
 	attr_accessor :function
 	attr_accessor :optimization#minimize, maximize, equals
 	attr_accessor :variable_coefficient_pairs
+	attr_accessor :optimized_value
 
 	def initialize(function, optimization)
 		@function = function
@@ -300,14 +304,139 @@ def get_all_vars(constraints)
 	all_vars.flatten.uniq
 end
 
+def get_constants(text)
+	#in: "-8 + x + y + 3"
+	#out: "[-8, +3]"
+	text = text.gsub(" ","")
+	text = text+"#"
+	cs = []
+	potential_constants = text.scan(/\d+[^a-z^\[^\]^\d^\.^\)]/)
+	#potential_constants = text.scan(/\d+[^a-z^\[^\]^\d]/)
+	constants = potential_constants.find_all{|c|![*('a'..'z'),*('A'..'Z')].include?(text[text.index(c)-1])}
+	constants.each do |constant|
+		c = constant.scan(/\d+/)[0]
+		index = text.index(constant)
+		if index == 0
+			c = "+"+c
+		else
+			c = text.scan(/[\-\+]#{constant}/)[0]
+		end
+		cs << c.scan(/[\-\+]\d+/)[0]
+	end
+	return({:formatted => cs, :unformatted => constants})
+end
+
+def put_constants_on_rhs(text)
+	#in: "-8 + x + y + 3 <= 100"
+	#out: "x + y <= 100 + 5"
+	text = text.gsub(" ","")
+	s = sides(text)
+	constants_results = get_constants(s[:lhs])
+	constants = constants_results[:formatted]
+	unless constants.empty?
+		sum = constants.map{|cc|cc.to_i}.inject("+").to_s
+		if sum.include?("-")
+			sum = sum.gsub("-","+")
+		else
+			sum = "-"+sum
+		end
+		lhs = s[:lhs].gsub(" ","")+"#"
+		constants_results[:unformatted].each do |constant|
+			index = lhs.index(constant)
+			if index == 0
+				lhs = lhs[(constant.size-1)..(lhs.size-1)]
+			else
+				lhs = lhs[0..(index-2)]+lhs[(index+(constant.size-1))..(lhs.size-1)]
+			end
+		end
+		text = text.gsub(s[:lhs], lhs[0..-2])
+		text += sum
+	end
+	return(text)
+end
+
+def sum_constants(text)
+	#in: "100+ 10-3"
+	#out: "107"
+	get_constants(text)[:formatted].map{|c|c.to_i}.inject("+").to_s
+end
+
+def sub_rhs_with_summed_constants(constraint)
+	rhs = sides(constraint)[:rhs]
+	constraint.gsub(rhs, sum_constants(rhs))
+end
+
+def get_coefficient_variable_pairs(text)
+	text.scan(/\d*[\*]*[a-z]\[*\d*\]*/)
+end
+
+def put_variables_on_lhs(text)
+	#in: "x + y - x[3] <= 3z + 2x[2] - 10"
+	#out: "x + y - x[3] - 3z - 2x[2] <= -10"
+	text = text.gsub(" ", "")
+	s = sides(text.gsub(" ",""))
+	rhs = s[:rhs]
+	lhs = s[:lhs]
+	coefficient_variable_pairs = get_coefficient_variable_pairs(rhs)
+	add_to_left = []
+	remove_from_right = []
+	coefficient_variable_pairs.each do |cvp|
+		index = rhs.index(cvp)
+		if index == 0
+			add_to_left << "-"+cvp
+			remove_from_right << cvp
+		else
+			if rhs[index-1] == "+"
+				add_to_left << "-"+cvp
+				remove_from_right << "+"+cvp
+			else
+				add_to_left << "+"+cvp
+				remove_from_right << "-"+cvp
+			end
+		end
+	end
+	new_lhs = lhs+add_to_left.join("")
+	text = text.gsub(lhs, new_lhs)
+	new_rhs = rhs
+	remove_from_right.each do |rfr|
+		new_rhs = new_rhs.gsub(rfr, "")
+	end
+	text = text.gsub(rhs, new_rhs)
+	return(text)
+end
+
+def split_equals(constraint)
+	[constraint.gsub("=", "<="), constraint.gsub("=", ">=")]
+end
+
+def split_equals_a(constraints)
+	constraints.map do |constraint|
+		if (constraint.split("") & ["<=",">=","<",">"]).empty?
+			split_equals(constraint)
+		else
+			constraint
+		end
+	end.flatten
+end
+
 def subject_to(constraints)
 	constraints = constraints.flatten
+	constraints = split_equals_a(constraints)
 	constraints = constraints.map do |constraint|
 		sub_forall(constraint)
 	end.flatten
 	constraints = constraints.map do |constraint|
 		sub_sum(constraint)
 	end
+	constraints = constraints.map do |constraint|
+		put_constants_on_rhs(constraint)
+	end
+	constraints = constraints.map do |constraint|
+		put_variables_on_lhs(constraint)
+	end
+	constraints = constraints.map do |constraint|
+		sub_rhs_with_summed_constants(constraint)
+	end
 	all_vars = get_all_vars(constraints)
 	rows = []
 	constraints.each do |constraint|
@@ -315,12 +444,19 @@ def subject_to(constraints)
 		constraint = constraint.gsub(" ", "")
 		name = constraint.split(":")[0]
 		value = constraint.split(":")[1] || constraint
+		lower_bound = nil
 		if value.include?("<=")
 			upper_bound = value.split("<=")[1]
 		elsif value.include?(">=")
 			negate = true
 			bound = value.split(">=")[1].to_i
 			upper_bound = (bound*-1).to_s
+		elsif value.include?("<")
+			upper_bound = (value.split("<")[1]).to_i - 1
+		elsif value.include?(">")
+			negate = true
+			bound = (value.split(">")[1].to_i).to_i + 1
+			upper_bound = (bound*-1).to_s
 		end
 		coefs = coefficients(sides(value)[:lhs])
 		if negate
@@ -334,7 +470,7 @@ def subject_to(constraints)
 		end
 		vars = variables(sides(value)[:lhs])
 		zero_coef_vars = all_vars - vars
-		row = Row.new(name, nil, upper_bound)
+		row = Row.new(name, lower_bound, upper_bound)
 		row.constraint = constraint
 		coefs = coefs + zero_coef_vars.map{|z|0}
 		vars = vars + zero_coef_vars
@@ -359,8 +495,15 @@ def minimize(objective, rows_c)#objective function has no = in it
 end
 
 def optimize(optimization, objective, rows_c)
-	lp = LinearProgram.new(objective, rows_c.map{|row|row.constraint})
+	o = Objective.new(objective, optimization)
+	lp = LinearProgram.new(o, rows_c.map{|row|row.constraint})
 	objective = sub_sum(objective)
+	objective_constants = get_constants(objective)
+	if objective_constants[:formatted].empty?
+		objective_addition = 0
+	else
+		objective_addition = sum_constants(objective_constants[:formatted].inject("+"))
+	end
 	lp.rows = rows_c
 	p = Rglpk::Problem.new
 	p.name = "sample"
@@ -395,7 +538,7 @@ def optimize(optimization, objective, rows_c)
 	p.obj.coefs = all_obj_coefficients
 	p.set_matrix(rows_c.map{|row|row.variable_coefficient_pairs.map{|vcp|vcp.coefficient.to_i}}.flatten)
 	p.simplex
-	z = p.obj.get
+	lp.objective.optimized_value = p.obj.get + objective_addition.to_f
 	answer = Hash.new()
 	cols.each do |c|
 		answer[c.name] = c.get_prim.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opl
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-18 00:00:00.000000000 Z
+date: 2013-09-03 00:00:00.000000000 Z
 dependencies: []
 description: Built on top of the glpk gem for linear programming. The syntax is copied
   from OPL Studio, which remains my favorite linear programming software, but the