kalmar/GroupsWithPropertyT
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use indexing syntax to extract variables from JuMP.model

Browse Source
This commit is contained in:
kalmar 2017-06-09 11:57:56 +02:00
parent 01fbd037c3
commit c98e853268
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Orb_AutFN.jl
View File

@ -113,7 +113,7 @@ function constrLHS(m::JuMP.Model, data::OrbitData, t)
end end
function addconstraints!(m::JuMP.Model, data::OrbitData, l::Int=length(data.cnstr); var::Symbol = :λ) function addconstraints!(m::JuMP.Model, data::OrbitData, l::Int=length(data.cnstr); var::Symbol = :λ)
λ = getvariable(m, var) λ = m[var]
for t in 1:l for t in 1:l
d, d² = data.laplacian[t], data.laplacianSq[t] d, d² = data.laplacian[t], data.laplacianSq[t]
lhs = constrLHS(m, data, t) lhs = constrLHS(m, data, t)
@ -153,7 +153,7 @@ end
function λandP(m::JuMP.Model, data::OrbitData) function λandP(m::JuMP.Model, data::OrbitData)
info(PropertyT.logger, "Solving SDP problem...") info(PropertyT.logger, "Solving SDP problem...")
varλ = JuMP.getvariable(m, :λ) varλ = m[:λ]
varP = data.Ps varP = data.Ps
λ, P = PropertyT.λandP(data.name, m, varλ, varP) λ, P = PropertyT.λandP(data.name, m, varλ, varP)