From 529564439ffe2ba418b2da09fd68ff897d535693 Mon Sep 17 00:00:00 2001 From: kalmar Date: Thu, 8 Jun 2017 21:39:45 +0200 Subject: [PATCH] use args values provided by Settings --- Orb_AutFN.jl | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/Orb_AutFN.jl b/Orb_AutFN.jl index 97676c2..f229c9a 100644 --- a/Orb_AutFN.jl +++ b/Orb_AutFN.jl @@ -149,15 +149,14 @@ function λandP(m::JuMP.Model, data::OrbitData) return λ, recP end -function init_orbit_data{T<:Nemo.GroupElem}(logger, name::String, G::Nemo.Group, - S::Vector{T}, AutS::Nemo.Group; radius=2) +function init_orbit_data(logger, sett::Settings; radius=2) - ex(fname) = isfile(joinpath(name, fname)) + ex(fname) = isfile(joinpath(sett.name, fname)) files_exists = ex.(["delta.jld", "pm.jld", "U_pis.jld", "orbits.jld"]) if !all(files_exists) - compute_orbit_data(logger, name, SOutFN, S, AutS, radius=radius) + compute_orbit_data(logger, sett.name, sett.G, sett.S, sett.AutS, radius=radius) end return 0