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

separate solver selection

Browse Source
This commit is contained in:
kalmarek 2018-08-08 19:37:57 +02:00
parent 3d59ecc874
commit 87658ea46e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
main.jl
View File

@ -45,6 +45,8 @@ function params(Gr::PropertyTGroup)
return radius, tol, iterations, upper_bound, warm return radius, tol, iterations, upper_bound, warm
end end
scs_solver(tol, iterations) = SCSSolver(eps=tol, max_iters=iterations, linearsolver=SCS.Direct, alpha=1.95, acceleration_lookback=10)
main(G::SymmetricGroup) = main(Symmetrize, G) main(G::SymmetricGroup) = main(Symmetrize, G)
function main(::Type{Symmetrize}, Gr::SymmetricGroup) function main(::Type{Symmetrize}, Gr::SymmetricGroup)
@ -63,7 +65,7 @@ function main(::Type{Symmetrize}, Gr::SymmetricGroup)
autS = PropertyTGroups.autS(Gr) autS = PropertyTGroups.autS(Gr)
info(logger, "Symmetrising with $(autS)") info(logger, "Symmetrising with $(autS)")
solver = SCSSolver(eps=tol, max_iters=iterations, linearsolver=SCS.Direct, alpha=1.95, acceleration_lookback=1) solver = scs_solver(tol, iterations)
# solver = Mosek.MosekSolver( # solver = Mosek.MosekSolver(
# MSK_DPAR_INTPNT_CO_TOL_REL_GAP=tol, # MSK_DPAR_INTPNT_CO_TOL_REL_GAP=tol,
@ -92,7 +94,7 @@ function main(::Type{Standard}, Gr::SymmetricGroup)
summarize(logger, groupdir, iterations, tol, upper_bound, radius, G, S) summarize(logger, groupdir, iterations, tol, upper_bound, radius, G, S)
solver = SCSSolver(eps=tol, max_iters=iterations, linearsolver=SCS.Direct, alpha=1.95, acceleration_lookback=1) solver = scs_solver(tol, iterations)
return PropertyT.check_property_T(groupdir, S, G(), return PropertyT.check_property_T(groupdir, S, G(),
solver, upper_bound, tol, radius, warm) solver, upper_bound, tol, radius, warm)
@ -118,7 +120,7 @@ function main(Gr::GAPGroup)
summarize(logger, groupdir, iterations, tol, upper_bound, radius, G, S) summarize(logger, groupdir, iterations, tol, upper_bound, radius, G, S)
solver = SCSSolver(eps=tol, max_iters=iterations, linearsolver=SCS.Direct, alpha=1.95, acceleration_lookback=1) solver = scs_solver(tol, iterations)
return PropertyT.check_property_T(groupdir, S, G(), return PropertyT.check_property_T(groupdir, S, G(),
solver, upper_bound, tol, radius, warm) solver, upper_bound, tol, radius, warm)