mirror of
https://github.com/kalmarek/PropertyT.jl.git
synced 2024-10-19 01:00:36 +02:00
Allow for AbstractMathProfSolver in Settings
This commit is contained in:
parent
bc2a827342
commit
6cbf5e6944
@ -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,8 +166,10 @@ 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)
|
||||||
P[k] = JuMP.@variable(m, [i=1:s, j=1:s])
|
if s > 0
|
||||||
JuMP.@SDconstraint(m, P[k] >= 0.0)
|
P[k] = JuMP.@variable(m, [i=1:s, j=1:s])
|
||||||
|
JuMP.@SDconstraint(m, P[k] >= 0.0)
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
JuMP.@variable(m, λ >= 0.0)
|
JuMP.@variable(m, λ >= 0.0)
|
||||||
|
Loading…
Reference in New Issue
Block a user