make solver a runtime choice

This commit is contained in:
kalmarek 2018-09-09 13:13:21 +02:00
parent c7b8776e2d
commit b84b23d486
2 changed files with 18 additions and 16 deletions

16
main.jl
View File

@ -1,21 +1,5 @@
using PropertyT 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("FPGroups_GAP.jl")
include("groups/Allgroups.jl") include("groups/Allgroups.jl")

18
run.jl
View File

@ -78,6 +78,24 @@ include("CPUselect.jl")
include("logging.jl") include("logging.jl")
include("main.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 Gr = PropertyTGroups.PropertyTGroup(PARSEDARGS)
const sett = PropertyT.Settings(PARSEDARGS, Gr, const sett = PropertyT.Settings(PARSEDARGS, Gr,