diff --git a/main.jl b/main.jl index 8723b44..f28a95e 100644 --- a/main.jl +++ b/main.jl @@ -1,21 +1,5 @@ using PropertyT -using SCS.SCSSolver -# using Mosek -# using CSDP -# using SDPA - -scs_solver(tol, iterations) = SCSSolver(eps=tol, max_iters=iterations, linearsolver=SCS.Direct, alpha=1.95, acceleration_lookback=1) - -# solver = Mosek.MosekSolver( -# MSK_DPAR_INTPNT_CO_TOL_REL_GAP=tol, -# MSK_IPAR_INTPNT_MAX_ITERATIONS=iterations, -# QUIET=false) - -# solver = CSDP.CSDPSolver(axtol=tol, atytol=tol, objtol=tol, minstepp=tol*10.0^-1, minstepd=tol*10.0^-1) - -# solver = SDPA.SDPASolver(epsilonStar=tol, epsilonDash=tol) - include("FPGroups_GAP.jl") include("groups/Allgroups.jl") diff --git a/run.jl b/run.jl index 2a87f80..8544a35 100644 --- a/run.jl +++ b/run.jl @@ -78,6 +78,24 @@ include("CPUselect.jl") include("logging.jl") include("main.jl") +using SCS.SCSSolver +# using Mosek +# using CSDP +# using SDPA + +solver(tol, iterations) = + SCSSolver(linearsolver=SCS.Direct, + eps=tol, max_iters=iterations, + alpha=1.95, acceleration_lookback=1) + +# Mosek.MosekSolver( +# MSK_DPAR_INTPNT_CO_TOL_REL_GAP=tol, +# MSK_IPAR_INTPNT_MAX_ITERATIONS=iterations, +# QUIET=false) + +# CSDP.CSDPSolver(axtol=tol, atytol=tol, objtol=tol, minstepp=tol*10.0^-1, minstepd=tol*10.0^-1) + +# SDPA.SDPASolver(epsilonStar=tol, epsilonDash=tol) const Gr = PropertyTGroups.PropertyTGroup(PARSEDARGS) const sett = PropertyT.Settings(PARSEDARGS, Gr,