diff --git a/src/CheckSolution.jl b/src/CheckSolution.jl index df0bb3f..b38f838 100644 --- a/src/CheckSolution.jl +++ b/src/CheckSolution.jl @@ -111,8 +111,7 @@ function distance_to_positive_cone(Δ::GroupRingElem, λ, Q, wlen::Int) info(logger, "λ = $λ") info(logger, "Checking in floating-point arithmetic...") Δ²_λΔ = EOI(Δ, λ) - t = @timed fp_distance = λ - distance_to_cone(Δ²_λΔ, Q, wlen) - info(logger, timed_msg(t)) + @logtime logger fp_distance = λ - distance_to_cone(Δ²_λΔ, Q, wlen) info(logger, "Floating point distance (to positive cone) ≈ $(@sprintf("%.10f", fp_distance))") info(logger, "------------------------------------------------------------") @@ -128,8 +127,7 @@ function distance_to_positive_cone(Δ::GroupRingElem, λ, Q, wlen::Int) Δ = GroupRingElem([@interval(c) for c in Δ.coeffs], parent(Δ)) Δ²_λΔ = EOI(Δ, λ) - t = @timed Interval_dist_to_ΣSq = λ - distance_to_cone(Δ²_λΔ, Q, wlen) - info(logger, timed_msg(t)) + @logtime logger Interval_dist_to_ΣSq = λ - distance_to_cone(Δ²_λΔ, Q, wlen) info(logger, "The Augmentation-projected actual distance (to positive cone) ∈ $(Interval_dist_to_ΣSq)") info(logger, "------------------------------------------------------------") diff --git a/src/Orbit-wise.jl b/src/Orbit-wise.jl index 670c329..3846310 100644 --- a/src/Orbit-wise.jl +++ b/src/Orbit-wise.jl @@ -177,8 +177,7 @@ end function create_SDP_problem(sett::Settings) info(logger, "Loading orbit data....") - t = @timed SDP_problem, orb_data = OrbitData(sett); - info(logger, PropertyT.timed_msg(t)) + @logtime logger SDP_problem, orb_data = OrbitData(sett); if sett.upper_bound < Inf λ = JuMP.getvariable(SDP_problem, :λ) @@ -187,8 +186,7 @@ function create_SDP_problem(sett::Settings) t = length(orb_data.laplacian) info(logger, "Adding $t constraints ... ") - t = @timed addconstraints!(SDP_problem, orb_data) - info(logger, PropertyT.timed_msg(t)) + @logtime logger addconstraints!(SDP_problem, orb_data) return SDP_problem, orb_data end @@ -206,11 +204,9 @@ function λandP(m::JuMP.Model, data::OrbitData, sett::Settings) info(logger, "Reconstructing P...") - t = @timed preps = perm_reps(sett.G, sett.S, sett.AutS, sett.radius) - info(logger, PropertyT.timed_msg(t)) + @logtime logger preps = perm_reps(sett.G, sett.S, sett.AutS, sett.radius) - t = @timed recP = reconstruct_sol(preps, data.Us, Ps, data.dims) - info(logger, PropertyT.timed_msg(t)) + @logtime logger recP = reconstruct_sol(preps, data.Us, Ps, data.dims) fname = PropertyT.λSDPfilenames(fullpath(sett))[2] save(fname, "origP", Ps, "P", recP) diff --git a/src/PropertyT.jl b/src/PropertyT.jl index 0fee9f0..4e04287 100644 --- a/src/PropertyT.jl +++ b/src/PropertyT.jl @@ -110,12 +110,10 @@ function ΔandSDPconstraints{T<:GroupElem}(S::Vector{T}, Id::T; radius::Int=2) info(logger, "Generated balls of sizes $sizes") info(logger, "Creating product matrix...") - t = @timed pm = GroupRings.create_pm(B, GroupRings.reverse_dict(B), sizes[radius]; twisted=true) - info(logger, timed_msg(t)) + @logtime logger pm = GroupRings.create_pm(B, GroupRings.reverse_dict(B), sizes[radius]; twisted=true) info(logger, "Creating sdp_constratints...") - t = @timed sdp_constraints = PropertyT.constraints_from_pm(pm) - info(logger, timed_msg(t)) + @logtime logger sdp_constraints = PropertyT.constraints_from_pm(pm) RG = GroupRing(parent(Id), B, pm) diff --git a/src/SDPs.jl b/src/SDPs.jl index 7a41479..972f3b5 100644 --- a/src/SDPs.jl +++ b/src/SDPs.jl @@ -61,8 +61,7 @@ function solve_SDP(SDP_problem) o = redirect_stdout(solver_logger.handlers["solver_log"].io) Base.Libc.flush_cstdio() - t = @timed solution_status = JuMP.solve(SDP_problem) - info(logger, timed_msg(t)) + @logtime logger solution_status = JuMP.solve(SDP_problem) Base.Libc.flush_cstdio() redirect_stdout(o)