opl 0.1.0 → 0.1.1

data/lib/opl.rb

@@ -4,21 +4,27 @@ require "rglpk"
 #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])
+#data arrays
+#setting variable values in constraints
+	#and then using that variable value in further constraints
 #a matrix representation of the solution if using
 	#sub notation
+#summing of variables
+	#e.g. x1 + x1 <= 3
+#object structure
 
 #3.0
+#will have to figure out "<" and ">"
 #make sure extreme cases of foralls and sums
 	#are handled
 #multiple level sub notation e.g. x[1][[3]]
-#float coefficients and constants (does rglpk even handle this?)
-	#will have to figure out "<" and ">"
-	
+
+#4.0
+#absolute value: abs()
+#if --> then statements
+#or statements
+#piecewise statements
+
 #write as module
 
 def sides(equation)
@@ -233,9 +239,9 @@ end
 def coefficients(equation)#parameter is one side of the equation
 	equation = add_ones(equation)
 	if equation[0]=="-"
-		equation.scan(/[+-]\d+/)
+		equation.scan(/[+-][\d\.]+/)
 	else
-		("#"+equation).scan(/[#+-]\d+/).map{|e|e.gsub("#","+")}
+		("#"+equation).scan(/[#+-][\d\.]+/).map{|e|e.gsub("#","+")}
 	end
 end
 
@@ -249,6 +255,9 @@ class LinearProgram
 	attr_accessor :constraints
 	attr_accessor :rows
 	attr_accessor :solution
+	attr_accessor :formatted_constraints
+	attr_accessor :rglpk_object
+	attr_accessor :solver
 
 	def initialize(objective, constraints)
 		@objective = objective
@@ -287,10 +296,12 @@ end
 class VariableCoefficientPair
 	attr_accessor :variable
 	attr_accessor :coefficient
+	attr_accessor :variable_type
 
-	def initialize(variable, coefficient)
+	def initialize(variable, coefficient, variable_type=1)
 		@variable = variable
 		@coefficient = coefficient
+		@variable_type = variable_type
 	end
 end
 
@@ -310,18 +321,18 @@ def get_constants(text)
 	text = text.gsub(" ","")
 	text = text+"#"
 	cs = []
-	potential_constants = text.scan(/\d+[^a-z^\[^\]^\d^\.^\)]/)
+	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]
+		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]
+		cs << c.scan(/[\-\+][\d\.]+/)[0]
 	end
 	return({:formatted => cs, :unformatted => constants})
 end
@@ -332,9 +343,16 @@ def put_constants_on_rhs(text)
 	text = text.gsub(" ","")
 	s = sides(text)
 	constants_results = get_constants(s[:lhs])
-	constants = constants_results[:formatted]
+	constants = []
+	constants_results[:formatted].each_index do |i|
+		formatted_constant = constants_results[:formatted][i]
+		unformatted_constant = constants_results[:unformatted][i]
+		unless unformatted_constant.include?("*")
+			constants << formatted_constant
+		end
+	end
 	unless constants.empty?
-		sum = constants.map{|cc|cc.to_i}.inject("+").to_s
+		sum = constants.map{|cc|cc.to_f}.inject("+").to_s
 		if sum.include?("-")
 			sum = sum.gsub("-","+")
 		else
@@ -358,7 +376,12 @@ end
 def sum_constants(text)
 	#in: "100+ 10-3"
 	#out: "107"
-	get_constants(text)[:formatted].map{|c|c.to_i}.inject("+").to_s
+	constants = get_constants(text)[:formatted]
+	if constants.to_s.include?(".")
+		constants.map{|c|c.to_f}.inject("+").to_s
+	else
+		constants.map{|c|c.to_i}.inject("+").to_s
+	end
 end
 
 def sub_rhs_with_summed_constants(constraint)
@@ -370,11 +393,26 @@ def get_coefficient_variable_pairs(text)
 	text.scan(/\d*[\*]*[a-z]\[*\d*\]*/)
 end
 
+def operator(constraint)
+	if constraint.include?(">=")
+		">="
+	elsif constraint.include?("<=")
+		"<="
+	elsif constraint.include?(">")
+		">"
+	elsif constraint.include?("<")
+		"<"
+	elsif constraint.include?("=")
+		"="
+	end
+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(" ",""))
+	oper = operator(text)
 	rhs = s[:rhs]
 	lhs = s[:lhs]
 	coefficient_variable_pairs = get_coefficient_variable_pairs(rhs)
@@ -396,12 +434,13 @@ def put_variables_on_lhs(text)
 		end
 	end
 	new_lhs = lhs+add_to_left.join("")
-	text = text.gsub(lhs, new_lhs)
+	text = text.gsub(lhs+oper, new_lhs+oper)
 	new_rhs = rhs
 	remove_from_right.each do |rfr|
 		new_rhs = new_rhs.gsub(rfr, "")
 	end
-	text = text.gsub(rhs, new_rhs)
+	new_rhs = "0" if new_rhs == ""
+	text = text.gsub(oper+rhs, oper+new_rhs)
 	return(text)
 end
 
@@ -419,15 +458,54 @@ def split_equals_a(constraints)
 	end.flatten
 end
 
-def subject_to(constraints)
+def sum_indices(constraint)
+	pieces_to_sub = constraint.scan(/[a-z]\[\d[\d\+\-]+\]/)
+	pieces_to_sub.each do |piece|
+		characters_to_sum = piece.scan(/[\d\+\-]+/)[0]
+		index_sum = sum_constants(characters_to_sum)
+		new_piece = piece.gsub(characters_to_sum, index_sum)
+		constraint = constraint.gsub(piece, new_piece)
+	end
+	return(constraint)
+end
+
+def produce_variable_type_hash(variable_types, all_variables)
+	#in: ["BOOLEAN: x, y", "INTEGER: z"]
+	#out: {:x => 3, :y => 3, :z => 2}
+	variable_type_hash = {}
+	variable_types.each do |vt|
+		type = vt.gsub(" ","").split(":")[0]
+		if type == "BOOLEAN"
+			type_number = 3
+		elsif type == "INTEGER"
+			type_number = 2
+		end
+		variables = vt.split(":")[1].gsub(" ","").split(",")
+		variables.each do |root_var|
+			all_variables_with_root = all_variables.find_all{|var|var.include?("[") && var.split("[")[0]==root_var}+[root_var]
+			all_variables_with_root.each do |var|
+				variable_type_hash[var.to_sym] = type_number
+			end
+		end
+	end
+	variable_type_hash
+end
+
+def subject_to(constraints, variable_types=[])
 	constraints = constraints.flatten
 	constraints = split_equals_a(constraints)
 	constraints = constraints.map do |constraint|
 		sub_forall(constraint)
 	end.flatten
+	constraints = constraints.map do |constraint|
+		sum_indices(constraint)
+	end
 	constraints = constraints.map do |constraint|
 		sub_sum(constraint)
 	end
+	constraints = constraints.map do |constraint|
+		sum_indices(constraint)
+	end
 	constraints = constraints.map do |constraint|
 		put_constants_on_rhs(constraint)
 	end
@@ -438,6 +516,7 @@ def subject_to(constraints)
 		sub_rhs_with_summed_constants(constraint)
 	end
 	all_vars = get_all_vars(constraints)
+	variable_type_hash = produce_variable_type_hash(variable_types, all_vars)
 	rows = []
 	constraints.each do |constraint|
 		negate = false
@@ -449,13 +528,13 @@ def subject_to(constraints)
 			upper_bound = value.split("<=")[1]
 		elsif value.include?(">=")
 			negate = true
-			bound = value.split(">=")[1].to_i
+			bound = value.split(">=")[1].to_f
 			upper_bound = (bound*-1).to_s
 		elsif value.include?("<")
-			upper_bound = (value.split("<")[1]).to_i - 1
+			upper_bound = (value.split("<")[1]).to_f - 1
 		elsif value.include?(">")
 			negate = true
-			bound = (value.split(">")[1].to_i).to_i + 1
+			bound = (value.split(">")[1]).to_f + 1
 			upper_bound = (bound*-1).to_s
 		end
 		coefs = coefficients(sides(value)[:lhs])
@@ -478,7 +557,8 @@ def subject_to(constraints)
 		pairs = []
 		all_vars.each do |var|
 			coef = coefs[vars.index(var)]
-			pairs << VariableCoefficientPair.new(var, coef)
+			variable_type = variable_type_hash[var.to_sym] || 1
+			pairs << VariableCoefficientPair.new(var, coef, variable_type)
 		end
 		row.variable_coefficient_pairs = pairs
 		rows << row
@@ -519,15 +599,20 @@ def optimize(optimization, objective, rows_c)
 		rows[i].set_bounds(Rglpk::GLP_UP, 0.0, row.upper_bound) unless row.upper_bound.nil?
 		rows[i].set_bounds(Rglpk::GLP_LO, 0.0, row.lower_bound) unless row.lower_bound.nil?
 	end
-	vars = rows_c.first.variable_coefficient_pairs.map{|vcp|vcp.variable}
+	vars = rows_c.first.variable_coefficient_pairs
 	cols = p.add_cols(vars.size)
+	solver = "simplex"
 	vars.each_index do |i|
-		column_name = vars[i]
+		column_name = vars[i].variable
 		cols[i].name = column_name
 		cols[i].set_bounds(Rglpk::GLP_LO, 0.0, 0.0)
+		cols[i].kind = vars[i].variable_type#boolean, integer, etc.
+		if vars[i].variable_type != 1
+			solver = "mip"
+		end
 	end
 	all_vars = rows_c.first.variable_coefficient_pairs.map{|vcp|vcp.variable}
-	obj_coefficients = coefficients(objective.gsub(" ","")).map{|c|c.to_i}
+	obj_coefficients = coefficients(objective.gsub(" ","")).map{|c|c.to_f}
 	obj_vars = variables(objective.gsub(" ",""))
 	all_obj_coefficients = []
 	all_vars.each do |var|
@@ -536,13 +621,22 @@ def optimize(optimization, objective, rows_c)
 		all_obj_coefficients << coef
 	end
 	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
-	lp.objective.optimized_value = p.obj.get + objective_addition.to_f
+	p.set_matrix(rows_c.map{|row|row.variable_coefficient_pairs.map{|vcp|vcp.coefficient.to_f}}.flatten)
 	answer = Hash.new()
-	cols.each do |c|
-		answer[c.name] = c.get_prim.to_s
+	p.simplex
+	if solver == "simplex"
+		lp.objective.optimized_value = p.obj.get + objective_addition.to_f
+		cols.each do |c|
+			answer[c.name] = c.get_prim.to_s
+		end
+	elsif solver == "mip"
+		p.mip
+		lp.objective.optimized_value = p.obj.mip + objective_addition.to_f
+		cols.each do |c|
+			answer[c.name] = c.mip_val.to_s
+		end
 	end
 	lp.solution = answer
+	lp.rglpk_object = p
 	lp
 end

metadata

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