separate solver selection
This commit is contained in:
parent
3d59ecc874
commit
87658ea46e
8
main.jl
8
main.jl
@ -45,6 +45,8 @@ 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)
|
||||
|
||||
main(G::SymmetricGroup) = main(Symmetrize, G)
|
||||
|
||||
function main(::Type{Symmetrize}, Gr::SymmetricGroup)
|
||||
@ -63,7 +65,7 @@ function main(::Type{Symmetrize}, Gr::SymmetricGroup)
|
||||
autS = PropertyTGroups.autS(Gr)
|
||||
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(
|
||||
# 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)
|
||||
|
||||
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(),
|
||||
solver, upper_bound, tol, radius, warm)
|
||||
@ -118,7 +120,7 @@ function main(Gr::GAPGroup)
|
||||
|
||||
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(),
|
||||
solver, upper_bound, tol, radius, warm)
|
||||
|
Loading…
Reference in New Issue
Block a user