From c1dc3850dde534860aac81ab25d5bd64b14f6490 Mon Sep 17 00:00:00 2001 From: kalmarek Date: Wed, 8 Nov 2017 09:56:28 +0100 Subject: [PATCH] rename AutS -> autS --- src/Orbit-wise.jl | 6 +++--- src/OrbitDecomposition.jl | 18 +++++++++--------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/Orbit-wise.jl b/src/Orbit-wise.jl index 19ee896..b4d3e9a 100644 --- a/src/Orbit-wise.jl +++ b/src/Orbit-wise.jl @@ -8,7 +8,7 @@ immutable Settings N::Int G::Group S::Vector - AutS::Group + autS::Group radius::Int solver::SCSSolver upper_bound::Float64 @@ -106,7 +106,7 @@ function init_orbit_data(logger, sett::Settings; radius=2) files_exists = ex.(["delta.jld", "pm.jld", "U_pis.jld", "orbits.jld", "preps.jld"]) if !all(files_exists) - compute_orbit_data(logger, prepath(sett), sett.G, sett.S, sett.AutS, radius=radius) + compute_orbit_data(logger, prepath(sett), sett.G, sett.S, sett.autS, radius=radius) end return 0 @@ -204,7 +204,7 @@ function λandP(m::JuMP.Model, data::OrbitData, sett::Settings) info(logger, "Reconstructing P...") - preps = load_preps(joinpath(prepath(sett), "preps.jld"), sett.AutS) + preps = load_preps(joinpath(prepath(sett), "preps.jld"), sett.autS) @logtime logger recP = reconstruct_sol(preps, data.Us, Ps, data.dims) diff --git a/src/OrbitDecomposition.jl b/src/OrbitDecomposition.jl index da1f28d..7e444e1 100644 --- a/src/OrbitDecomposition.jl +++ b/src/OrbitDecomposition.jl @@ -131,9 +131,9 @@ function perm_reps(G::Group, E::Vector, E_rdict=GroupRings.reverse_dict(E)) return Dict(elts[i]=>preps[i] for i in 1:l) end -function perm_reps(S::Vector, AutS::Group, radius::Int) +function perm_reps(S::Vector, autS::Group, radius::Int) E, _ = Groups.generate_balls(S, radius=radius) - return perm_reps(AutS, E) + return perm_reps(autS, E) end function reconstruct_sol{T<:GroupElem, S<:Nemo.perm}(preps::Dict{T, S}, @@ -171,7 +171,7 @@ function orthSVD{T}(M::AbstractMatrix{T}) return fact[:U][:,1:M_rank] end -function compute_orbit_data{T<:GroupElem}(logger, name::String, G::Nemo.Group, S::Vector{T}, AutS; radius=2) +function compute_orbit_data{T<:GroupElem}(logger, name::String, G::Nemo.Group, S::Vector{T}, autS::Nemo.Group; radius=2) isdir(name) || mkdir(name) info(logger, "Generating ball of radius $(2*radius)") @@ -192,27 +192,27 @@ function compute_orbit_data{T<:GroupElem}(logger, name::String, G::Nemo.Group, S save(joinpath(name, "delta.jld"), "Δ", Δ.coeffs) save(joinpath(name, "pm.jld"), "pm", pm) - info(logger, "Decomposing E into orbits of $(AutS)") - @logtime logger orbs = orbit_decomposition(AutS, E_2R, E_rdict) + info(logger, "Decomposing E into orbits of $(autS)") + @logtime logger orbs = orbit_decomposition(autS, E_2R, E_rdict) @assert sum(length(o) for o in orbs) == length(E_2R) save(joinpath(name, "orbits.jld"), "orbits", orbs) info(logger, "Action matrices") - @logtime logger reps = perm_reps(AutS, E_2R[1:sizes[radius]], E_rdict) + @logtime logger reps = perm_reps(autS, E_2R[1:sizes[radius]], E_rdict) save_preps(joinpath(name, "preps.jld"), reps) reps = matrix_reps(reps) info(logger, "Projections") - @logtime logger AutS_mps = rankOne_projections(AutS); + @logtime logger autS_mps = rankOne_projections(autS); - @logtime logger π_E_projections = [Cstar_repr(p, reps) for p in AutS_mps] + @logtime logger π_E_projections = [Cstar_repr(p, reps) for p in autS_mps] info(logger, "Uπs...") @logtime logger Uπs = orthSVD.(π_E_projections) multiplicities = size.(Uπs,2) info(logger, "multiplicities = $multiplicities") - dimensions = [Int(p[AutS()]*Int(order(AutS))) for p in AutS_mps]; + dimensions = [Int(p[autS()]*Int(order(autS))) for p in autS_mps]; info(logger, "dimensions = $dimensions") @assert dot(multiplicities, dimensions) == sizes[radius]