From c849ead0ace27404d020e9679abb5c7be8222c82 Mon Sep 17 00:00:00 2001 From: kalmarek Date: Fri, 1 Dec 2017 17:27:18 +0100 Subject: [PATCH] look for warmstart in the solutions dir --- src/PropertyT.jl | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/PropertyT.jl b/src/PropertyT.jl index 813283a..42a5d42 100644 --- a/src/PropertyT.jl +++ b/src/PropertyT.jl @@ -137,13 +137,18 @@ function λandP(name::String) return λ, P end -function λandP(name::String, SDP_problem::JuMP.Model, varλ, varP) +function λandP(name::String, SDP_problem::JuMP.Model, varλ, varP, warmstart=false) add_handler(solver_logger, DefaultHandler(joinpath(name, "solver_$(string(now())).log"), DefaultFormatter("{date}| {msg}")), "solver_log") + if warmstart && isfile(joinpath(name, "warmstart.jld")) + ws = load(joinpath(name, "warmstart.jld"), "warmstart") + else + ws = nothing + end - λ, P, warmstart = compute_λandP(SDP_problem, varλ, varP) + λ, P, warmstart = compute_λandP(SDP_problem, varλ, varP, warmstart=ws) remove_handler(solver_logger, "solver_log") @@ -152,7 +157,6 @@ function λandP(name::String, SDP_problem::JuMP.Model, varλ, varP) if λ > 0 save(λ_fname, "λ", λ) save(P_fname, "P", P) - @show warmstart[1] save(joinpath(name, "warmstart.jld"), "warmstart", warmstart) else throw(ErrorException("Solver did not produce a valid solution!: λ = $λ"))