kalmar/PropertyT.jl
1
0
Fork 0
mirror of https://github.com/kalmarek/PropertyT.jl.git synced 2024-11-14 06:10:28 +01:00
Code Issues Releases Wiki Activity

rework λandP: sets loggers and solves SDP

Browse Source
This commit is contained in:
kalmar 2017-06-04 20:37:02 +02:00
parent 6b20e37c74
commit f87e484d83
1 changed files with 15 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/PropertyT.jl
View File

@ -90,39 +90,27 @@ function λandP(name::String)
return λ, P
end
function λandP(name::String, SDP_problem::JuMP.Model, varλ, varP)
if isfile(joinpath(name, "solver.log"))
rm(joinpath(name, "solver.log"))
end
function λandP(name::String, opts...)
try
return λandP(name)
catch err
if isa(err, ArgumentError)
if isfile(joinpath(name, "solver.log"))
rm(joinpath(name, "solver.log"))
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")
λ, P = compute_λandP(SDP_problem, varλ, varP)
info(logger, "Creating SDP problem...")
remove_handler(solver_logger, "solver_log")
λ, P = compute_λandP(opts...)
λ_fname, P_fname = λSDPfilenames(name)
remove_handler(solver_logger, "solver_log")
if λ > 0
save(λ_fname, "λ", λ)
save(P_fname, "P", P)
else
throw(ErrorException("Solver $solver did not produce a valid solution!: λ = $λ"))
end
return λ, P
λ_fname, P_fname = λSDPfilenames(name)
if λ > 0
save(λ_fname, "λ", λ)
save(P_fname, "P", P)
else
throw(ErrorException("Solver $solver did not produce a valid solution!: λ = $λ"))
end
return λ, P
else
# throw(err)
error(logger, err)
end
end
end
function compute_λandP(m, varλ, varP)