1
0
mirror of https://github.com/kalmarek/PropertyT.jl.git synced 2024-07-17 10:55:30 +02:00

Allow for AbstractMathProfSolver in Settings

This commit is contained in:
kalmarek 2017-10-27 14:27:26 +02:00
parent bc2a827342
commit 6cbf5e6944

View File

@ -10,7 +10,7 @@ immutable Settings
S::Vector S::Vector
AutS::Group AutS::Group
radius::Int radius::Int
solver::SCSSolver solver::AbstractMathProgSolver
upper_bound::Float64 upper_bound::Float64
tol::Float64 tol::Float64
end end
@ -166,9 +166,11 @@ function init_model(Uπs)
for k in 1:l for k in 1:l
s = size(Uπs[k],2) s = size(Uπs[k],2)
if s > 0
P[k] = JuMP.@variable(m, [i=1:s, j=1:s]) P[k] = JuMP.@variable(m, [i=1:s, j=1:s])
JuMP.@SDconstraint(m, P[k] >= 0.0) JuMP.@SDconstraint(m, P[k] >= 0.0)
end end
end
JuMP.@variable(m, λ >= 0.0) JuMP.@variable(m, λ >= 0.0)
JuMP.@objective(m, Max, λ) JuMP.@objective(m, Max, λ)