kalmar
/
GroupsWithPropertyT
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

update FPgroup.jl to PropertyTGroup interface

This commit is contained in:
kalmarek 2018-08-08 19:37:28 +02:00
parent 5ea5093f42
commit 3d59ecc874
2 changed files with 13 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
FPgroup.jl
View File

@ -7,11 +7,11 @@ function parse_commandline()
"--tol" "--tol"
help = "set numerical tolerance for the SDP solver" help = "set numerical tolerance for the SDP solver"
arg_type = Float64 arg_type = Float64
default = 1e-14 default = 1e-6
"--iterations" "--iterations"
help = "set maximal number of iterations for the SDP solver (default: 20000)" help = "set maximal number of iterations for the SDP solver"
arg_type = Int arg_type = Int
default = 60000 default = 50000
"--upper-bound" "--upper-bound"
help = "Set an upper bound for the spectral gap" help = "Set an upper bound for the spectral gap"
arg_type = Float64 arg_type = Float64
@ -27,7 +27,7 @@ function parse_commandline()
"--warmstart" "--warmstart"
help = "Use warmstart.jl as the initial guess for SCS" help = "Use warmstart.jl as the initial guess for SCS"
action = :store_true action = :store_true
"-MCG" "--MCG"
help = "Compute for mapping class group of surface of genus N" help = "Compute for mapping class group of surface of genus N"
arg_type = Int arg_type = Int
required = false required = false
@ -43,27 +43,20 @@ function parse_commandline()
end end
const PARSEDARGS = parse_commandline() const PARSEDARGS = parse_commandline()
using AbstractAlgebra
using PropertyT
using Groups
include("CPUselect.jl") include("CPUselect.jl")
set_parallel_mthread(PARSEDARGS, workers=false) set_parallel_mthread(PARSEDARGS, workers=false)
include("main_gapgroup.jl") include("main.jl")
include("FPGroups_GAP.jl")
if PARSEDARGS["Caprace"] if PARSEDARGS["Caprace"]
include("groups/caprace.jl") G = PropertyTGroups.CapraceGroup(PARSEDARGS)
main(CapraceGroup, PARSEDARGS)
elseif PARSEDARGS["Higman"] elseif PARSEDARGS["Higman"]
include("groups/higman.jl") G = PropertyTGroups.HigmanGroup(PARSEDARGS)
main(HigmanGroup, PARSEDARGS) elseif PARSEDARGS["MCG"] != nothing
G = PropertyTGroups.MappingClassGroup(PARSEDARGS)
elseif PARSEDARGS["N"] != nothing
include("groups/mappingclassgroup.jl")
main(MappingClassGroups, PARSEDARGS)
else else
warn("You need to specify one of the --Higman, --Caprace, -MCG N") throw("You need to specify one of the --Higman, --Caprace, --MCG N")
end end
main(G)

2
main.jl
View File

@ -102,8 +102,6 @@ end
function main(Gr::GAPGroup) function main(Gr::GAPGroup)
include("FPGroups_GAP.jl")
radius, tol, iterations, upper_bound, warm = params(Gr) radius, tol, iterations, upper_bound, warm = params(Gr)
groupdir = groupname(Gr) groupdir = groupname(Gr)