From 7257c028205ab43b6404793cdf95d0849a124306 Mon Sep 17 00:00:00 2001 From: kalmarek Date: Wed, 15 Aug 2018 17:19:28 +0200 Subject: [PATCH] =?UTF-8?q?rename=20SymmetricGroup=20=E2=86=92=20Symmetriz?= =?UTF-8?q?edGroup?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- groups/Allgroups.jl | 4 ++-- groups/autfreegroup.jl | 2 +- groups/speciallinear.jl | 2 +- main.jl | 10 +++++----- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/groups/Allgroups.jl b/groups/Allgroups.jl index dcce668..4cb8762 100644 --- a/groups/Allgroups.jl +++ b/groups/Allgroups.jl @@ -4,11 +4,11 @@ using AbstractAlgebra using Nemo using Groups -export PropertyTGroup, SymmetricGroup, GAPGroup +export PropertyTGroup, SymmetrizedGroup, GAPGroup abstract type PropertyTGroup end -abstract type SymmetricGroup <: PropertyTGroup end +abstract type SymmetrizedGroup <: PropertyTGroup end abstract type GAPGroup <: PropertyTGroup end diff --git a/groups/autfreegroup.jl b/groups/autfreegroup.jl index 6570d28..3db3ea7 100644 --- a/groups/autfreegroup.jl +++ b/groups/autfreegroup.jl @@ -1,4 +1,4 @@ -struct SpecialAutomorphismGroup <: SymmetricGroup +struct SpecialAutomorphismGroup <: SymmetrizedGroup args::Dict{String,Any} group::AutGroup diff --git a/groups/speciallinear.jl b/groups/speciallinear.jl index 81393e4..5a444c1 100644 --- a/groups/speciallinear.jl +++ b/groups/speciallinear.jl @@ -1,4 +1,4 @@ -struct SpecialLinearGroup <: SymmetricGroup +struct SpecialLinearGroup <: SymmetrizedGroup args::Dict{String,Any} group::AbstractAlgebra.Group diff --git a/main.jl b/main.jl index b7ffc8d..5881735 100644 --- a/main.jl +++ b/main.jl @@ -26,7 +26,7 @@ function summarize(logger, groupdir, iterations, tol, upper_bound, radius, G, S) info(logger, "with generating set of size $(length(S))") end -function params(Gr::SymmetricGroup) +function params(Gr::SymmetrizedGroup) radius = Gr.args["radius"] tol = Gr.args["tol"] iterations = Gr.args["iterations"] @@ -45,11 +45,11 @@ function params(Gr::PropertyTGroup) return radius, tol, iterations, upper_bound, warm end -scs_solver(tol, iterations) = SCSSolver(eps=tol, max_iters=iterations, linearsolver=SCS.Direct, alpha=1.95, acceleration_lookback=10) +scs_solver(tol, iterations) = SCSSolver(eps=tol, max_iters=iterations, linearsolver=SCS.Direct, alpha=1.5, acceleration_lookback=10) -main(G::SymmetricGroup) = main(Symmetrize, G) +main(G::SymmetrizedGroup) = main(Symmetrize, G) -function main(::Type{Symmetrize}, Gr::SymmetricGroup) +function main(::Type{Symmetrize}, Gr::SymmetrizedGroup) radius, tol, iterations, upper_bound, warm, N = params(Gr) @@ -81,7 +81,7 @@ function main(::Type{Symmetrize}, Gr::SymmetricGroup) return PropertyT.check_property_T(sett) end -function main(::Type{Standard}, Gr::SymmetricGroup) +function main(::Type{Standard}, Gr::SymmetrizedGroup) radius, tol, iterations, upper_bound, warm, _ = params(Gr)