use args values provided by Settings

This commit is contained in:
kalmar 2017-06-08 21:39:45 +02:00
parent 2f2118a011
commit 529564439f

View File

@ -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