From f87e484d833df8a23587bd68d49177386a6d814d Mon Sep 17 00:00:00 2001
From: kalmar <kalmar@amu.edu.pl>
Date: Sun, 4 Jun 2017 20:37:02 +0200
Subject: [PATCH] =?UTF-8?q?rework=20=CE=BBandP:=20sets=20loggers=20and=20s?=
 =?UTF-8?q?olves=20SDP?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/PropertyT.jl | 42 +++++++++++++++---------------------------
 1 file changed, 15 insertions(+), 27 deletions(-)

diff --git a/src/PropertyT.jl b/src/PropertyT.jl
index 5e92983..ca46347 100644
--- a/src/PropertyT.jl
+++ b/src/PropertyT.jl
@@ -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)