kalmar/PropertyT.jl
1
0
Fork 0
mirror of https://github.com/kalmarek/PropertyT.jl.git synced 2024-07-12 01:35:29 +02:00
Code Issues Releases Wiki Activity

replace @timed by @logtime

Browse Source
This commit is contained in:
kalmarek 2017-11-02 13:45:12 +01:00
parent 7fa49756ba
commit 3eab5b721a
4 changed files with 9 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/CheckSolution.jl
View File

@ -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, "------------------------------------------------------------")

12
src/Orbit-wise.jl
View File

@ -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)

6
src/PropertyT.jl
View File

@ -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)

3
src/SDPs.jl
View File

@ -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)