From 278a62da2f3a174423c542315b7dab7d3f040b52 Mon Sep 17 00:00:00 2001 From: kalmarek Date: Wed, 5 Sep 2018 08:56:55 +0200 Subject: [PATCH] move filename, etc to its section --- src/PropertyT.jl | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) diff --git a/src/PropertyT.jl b/src/PropertyT.jl index 47db1cb..eec314f 100644 --- a/src/PropertyT.jl +++ b/src/PropertyT.jl @@ -10,29 +10,8 @@ import AbstractAlgebra: Group, GroupElem, Ring, perm using JLD using JuMP -exists(fname::String) = isfile(fname) || islink(fname) - -filename(prefix, s::Symbol) = filename(prefix, Val{s}) import MathProgBase.SolverInterface.AbstractMathProgSolver -@eval begin - for (s,n) in [ - [:fulllog, "full_$(string(now())).log"], - [:solverlog, "solver_$(string(now())).log"], - [:pm, "pm.jld"], - [:Δ, "delta.jld"], - [:λ, "lambda.jld"], - [:P, "SDPmatrix.jld"], - [:warm, "warmstart.jld"], - [:Uπs, "U_pis.jld"], - [:orbits,"orbits.jld"], - [:preps, "preps.jld"], - ] - - filename(prefix::String, ::Type{Val{$:(s)}}) = joinpath(prefix, :($n)) - end -end - function loadLaplacian(name::String, G::Group) if exists(filename(name, :Δ)) && exists(filename(name, :pm)) info("Loading precomputed Δ...") @@ -137,7 +116,25 @@ function check_property_T(name::String, S, solver, upper_bound, tol, radius, war Δ = computeLaplacian(S, radius) save(filename(name, :pm), "pm", parent(Δ).pm) save(filename(name, :Δ), "Δ", Δ.coeffs) +filename(prefix, s::Symbol) = filename(prefix, Val{s}) + +@eval begin + for (s,n) in [ + [:fulllog, "full_$(string(now())).log"], + [:solverlog, "solver_$(string(now())).log"], + [:pm, "pm.jld"], + [:Δ, "delta.jld"], + [:λ, "lambda.jld"], + [:P, "SDPmatrix.jld"], + [:warm, "warmstart.jld"], + [:Uπs, "U_pis.jld"], + [:orbits, "orbits.jld"], + [:preps, "preps.jld"], + ] + + filename(prefix::String, ::Type{Val{$:(s)}}) = joinpath(prefix, :($n)) end +end fullpath = joinpath(name, string(upper_bound)) isdir(fullpath) || mkdir(fullpath)