From 7dd061cdb71d96b10806484e33f0a4a1a3dfed17 Mon Sep 17 00:00:00 2001 From: kalmarek Date: Sun, 16 Sep 2018 17:53:40 +0200 Subject: [PATCH] fix typos --- main.jl | 8 ++++---- run.jl | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/main.jl b/main.jl index f28a95e..bab0761 100644 --- a/main.jl +++ b/main.jl @@ -20,7 +20,7 @@ function summarize(sett::PropertyT.Settings) info("Solver: $(sett.solver)") end -function Settings(Gr::PropertyTGroup, args, solver): +function Settings(Gr::PropertyTGroup, args, solver) r = get(args, "radius", 2) gr_name = PropertyTGroups.name(Gr)*"_r$r" G = PropertyTGroups.group(Gr) @@ -32,14 +32,14 @@ function Settings(Gr::PropertyTGroup, args, solver): ws = get(args, "warmstart", false) if get(args, "nosymmetry", false) + return PropertyT.Settings(gr_name, G, S, r, sol, ub, tol, ws) + else autS = PropertyTGroups.autS(Gr) return PropertyT.Settings(gr_name, G, S, r, sol, ub, tol, ws, autS) - else - return PropertyT.Settings(gr_name, G, S, r, sol, ub, tol, ws) end end -function main(::PropertyTGroup, sett::Property.Settings) +function main(::PropertyTGroup, sett::PropertyT.Settings) isdir(PropertyT.fullpath(sett)) || mkpath(PropertyT.fullpath(sett)) summarize(sett) diff --git a/run.jl b/run.jl index 41bf8be..644382d 100644 --- a/run.jl +++ b/run.jl @@ -98,8 +98,8 @@ solver(tol, iterations) = # SDPA.SDPASolver(epsilonStar=tol, epsilonDash=tol) const Gr = PropertyTGroups.PropertyTGroup(PARSEDARGS) -const sett = PropertyT.Settings(PARSEDARGS, Gr, - solver(args["tol"], args["iterations"])) +const sett = PropertyT.Settings(Gr, PARSEDARGS, + solver(PARSEDARGS["tol"], PARSEDARGS["iterations"])) fullpath = PropertyT.fullpath(sett) isdir(fullpath) || mkpath(fullpath)