kalmar/PropertyT.jl
1
0
Fork 0
mirror of https://github.com/kalmarek/PropertyT.jl.git synced 2024-07-17 10:55:30 +02:00
Code Issues Releases Wiki Activity

rework addconstraints! with progress printing

Browse Source
This commit is contained in:
kalmarek 2017-08-27 19:00:49 +02:00
parent db55927729
commit 8a6707eddd
1 changed files with 23 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/Orbit-wise.jl
View File

@ -130,21 +130,27 @@ end
function addconstraints!(m::JuMP.Model, data::OrbitData, l::Int=length(data.laplacian); var::Symbol=:λ) function addconstraints!(m::JuMP.Model, data::OrbitData, l::Int=length(data.laplacian); var::Symbol=:λ)
λ = m[var] λ = m[var]
Ust = [U' for U in data.Us] Ust = [U' for U in data.Us]
idx = [π for π in 1:endof(data.Us) if size(data.Us[π],2) != 0]
for t in 1:l for t in 1:l
if t % 100 == 0
print(t, ", ")
end
# lhs = constrLHS(m, data, t) # lhs = constrLHS(m, data, t)
lhs = constrLHS(m, data.cnstr[t], data.Us, Ust, data.dims, data.Ps) lhs = constrLHS(m, data.cnstr[t], data.Us[idx], Ust[idx], data.dims[idx], data.Ps[idx])
d, d² = data.laplacian[t], data.laplacianSq[t] d, d² = data.laplacian[t], data.laplacianSq[t]
if lhs == zero(lhs) # if lhs == zero(lhs)
if d == 0 && d² == 0 # if d == 0 && d² == 0
info("Detected empty constraint") # info("Detected empty constraint")
continue # continue
else # else
warn("Adding unsatisfiable constraint!") # warn("Adding unsatisfiable constraint!")
end # end
end # end
JuMP.@constraint(m, lhs == d² - λ*d) JuMP.@constraint(m, lhs == d² - λ*d)
end end
println("")
end end
function init_model(Uπs) function init_model(Uπs)