1
0
mirror of https://github.com/kalmarek/PropertyT.jl.git synced 2024-07-17 10:55:30 +02:00

rework λandP: sets loggers and solves SDP

This commit is contained in:
kalmar 2017-06-04 20:37:02 +02:00
parent 6b20e37c74
commit f87e484d83

View File

@ -90,21 +90,14 @@ function λandP(name::String)
return λ, P return λ, P
end end
function λandP(name::String, SDP_problem::JuMP.Model, varλ, varP)
function λandP(name::String, opts...)
try
return λandP(name)
catch err
if isa(err, ArgumentError)
if isfile(joinpath(name, "solver.log")) if isfile(joinpath(name, "solver.log"))
rm(joinpath(name, "solver.log")) rm(joinpath(name, "solver.log"))
end end
add_handler(solver_logger, DefaultHandler(joinpath(name, "solver.log"), DefaultFormatter("{date}| {msg}")), "solver_log") add_handler(solver_logger, DefaultHandler(joinpath(name, "solver.log"), DefaultFormatter("{date}| {msg}")), "solver_log")
info(logger, "Creating SDP problem...") λ, P = compute_λandP(SDP_problem, varλ, varP)
λ, P = compute_λandP(opts...)
remove_handler(solver_logger, "solver_log") remove_handler(solver_logger, "solver_log")
@ -118,11 +111,6 @@ function λandP(name::String, opts...)
end end
return λ, P return λ, P
else
# throw(err)
error(logger, err)
end
end
end end
function compute_λandP(m, varλ, varP) function compute_λandP(m, varλ, varP)