From aaba1a056a6dec7569ec79fa1b20a439222ffd1d Mon Sep 17 00:00:00 2001 From: kalmar Date: Thu, 8 Jun 2017 16:47:50 +0200 Subject: [PATCH] decouple init_orbit_data from Group, S generation --- Orb_AutFN.jl | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Orb_AutFN.jl b/Orb_AutFN.jl index 9144b48..8eb6f43 100644 --- a/Orb_AutFN.jl +++ b/Orb_AutFN.jl @@ -213,14 +213,18 @@ function init_data(name::String, N::Int, logger; radius=2) info(logger, "Symmetric generating set of size $(length(S))") info(logger, S) +function init_orbit_data{T<:Nemo.GroupElem}(logger, name::String, G::Nemo.Group, + S::Vector{T}; radius=2) + ex(fname) = isfile(joinpath(name, fname)) - conditions = ex.(["delta.jld", "pm.jld", "U_pis.jld", "orbits.jld"]) - if !all(conditions) + files_exists = ex.(["delta.jld", "pm.jld", "U_pis.jld", "orbits.jld"]) + + if !all(files_exists) compute_orbit_data(logger, name, SOutFN, S, radius=radius) end - return SOutFN, S, PropertyT.ΔandSDPconstraints(name, SOutFN)[1] + return 0 end function main() @@ -243,6 +247,8 @@ function main() G, S, Δ = init_data(dirname, N, logger, radius=radius) + init_orbit_data(logger, dirname, G, S; radius=2) + tol = parsed_args["tol"] iterations = parsed_args["iterations"] upper_bound = parsed_args["upper-bound"]