From 87658ea46e674f47abeb6cba5691cb9b3a6b1e07 Mon Sep 17 00:00:00 2001 From: kalmarek Date: Wed, 8 Aug 2018 19:37:57 +0200 Subject: [PATCH] separate solver selection --- main.jl | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/main.jl b/main.jl index ba086a4..2e8bbc5 100644 --- a/main.jl +++ b/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)