Skip to content
Snippets Groups Projects
Verified Commit 9e7c0529 authored by Michiel Cottaar's avatar Michiel Cottaar
Browse files

Add qval_square for better constrains

parent ae9997fb
No related branches found
No related tags found
No related merge requests found
......@@ -46,7 +46,7 @@ end
function build_sequence(f::Function)
ipopt_opt = optimizer_with_attributes(Ipopt.Optimizer, "print_level" => 0)
juniper_opt = optimizer_with_attributes(Juniper.Optimizer, "nl_solver" => ipopt_opt)
model = Model(juniper_opt)
model = Model(Ipopt.Optimizer)
build_sequence(f, model)
end
......
......@@ -53,10 +53,11 @@ variables() = [values(symbol_to_func)...]
# Some universal truths
function qval(bb; kwargs...)
function qval_square(bb; kwargs...)
vec = qvec(bb; kwargs...)
return sqrt(vec[1]^2 + vec[2]^2 + vec[3]^2)
return vec[1]^2 + vec[2]^2 + vec[3]^2
end
qval(bb; kwargs...) = sqrt(qval_square(qvec))
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment