diff --git a/AutFN_orbit.jl b/AutFN_orbit.jl index 39c9b6e..071847b 100644 --- a/AutFN_orbit.jl +++ b/AutFN_orbit.jl @@ -84,22 +84,26 @@ function main() parsed_args = parse_commandline() N = parsed_args["N"] - dirname = "SOutF$(N)_E_r=$radius" + dirname = "oSOutF$(N)_r=$radius" radius = parsed_args["radius"] + tol = parsed_args["tol"] + iterations = parsed_args["iterations"] + upper_bound = parsed_args["upper-bound"] isdir(dirname) || mkdir(dirname) logger = PropertyT.setup_logging(dirname) + info(logger, "Group: $dirname") + info(logger, "Iterations: $iterations") + info(logger, "Precision: $tol") + info(logger, "Upper bound: $upper_bound") + G, S = SOutFN_generating_set(logger, dirname, N) info(logger, G) info(logger, "Symmetric generating set of size $(length(S))") info(logger, S) AutS = WreathProduct(Nemo.FiniteField(2,1, "a")[1], PermutationGroup(N)) - tol = parsed_args["tol"] - iterations = parsed_args["iterations"] - upper_bound = parsed_args["upper-bound"] - solver = SCS.SCSSolver(eps=tol, max_iters=iterations, verbose=true, linearsolver=SCS.Indirect) sett = Settings(dirname, N, G, S, AutS, radius, solver, upper_bound, tol) diff --git a/SL_orbit.jl b/SL_orbit.jl index d9f5fef..aca9997 100644 --- a/SL_orbit.jl +++ b/SL_orbit.jl @@ -125,20 +125,24 @@ function main() radius = parsed_args["radius"] dirname = "$(dirname)_r=$radius" + tol = parsed_args["tol"] + iterations = parsed_args["iterations"] + upper_bound = parsed_args["upper-bound"] isdir(dirname) || mkdir(dirname) logger = PropertyT.setup_logging(dirname) + info(logger, "Group: $dirname") + info(logger, "Iterations: $iterations") + info(logger, "Precision: $tol") + info(logger, "Upper bound: $upper_bound") + G, S = SL_generatingset(N, p) info(logger, G) info(logger, "Symmetric generating set of size $(length(S))") info(logger, S) AutS = WreathProduct(Nemo.FiniteField(2,1, "a")[1], PermutationGroup(N)) - tol = parsed_args["tol"] - iterations = parsed_args["iterations"] - upper_bound = parsed_args["upper-bound"] - solver = SCS.SCSSolver(eps=tol, max_iters=iterations, verbose=true, linearsolver=SCS.Indirect) sett = Settings(dirname, N, G, S, AutS, radius, solver, upper_bound, tol)