update FPgroup.jl to PropertyTGroup interface

This commit is contained in:
kalmarek 2018-08-08 00:37:08 +02:00
parent 5ea5093f42
commit 16bc76e950
1 changed files with 12 additions and 20 deletions

View File

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