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

alternative (commented) problem formulation

Browse Source 
orbit variables, but non-orbit constraints;
closer in iterations/s to the original;
much faster convergence;
This commit is contained in:
kalmar 2017-06-21 16:49:30 +02:00
parent 3d99c0aff9
commit 05ee9989b3
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Orb_AutFN.jl
View File

@ -92,6 +92,8 @@ function init_OrbitData(name::String)
orbData = OrbitData(name, Uπs, P, orb_spcnstrm, orb_splap, orb_splap², dims); orbData = OrbitData(name, Uπs, P, orb_spcnstrm, orb_splap, orb_splap², dims);
# orbData = OrbitData(name, Uπs, P, orb_spcnstrm, splap, splap², dims);
return m, orbData return m, orbData
end end
@ -111,8 +113,11 @@ 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]
# orbits = load(joinpath(data.name, "orbits.jld"), "orbits");
# locate(t, orb=orbits) = findfirst(x->t in x, orb)
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, locate(t))
lhs = constrLHS(m, data, t) lhs = constrLHS(m, data, t)
if lhs == zero(lhs) if lhs == zero(lhs)
if d == 0 && d² == 0 if d == 0 && d² == 0