better logging

This commit is contained in:
kalmar 2017-06-08 21:40:13 +02:00
parent 529564439f
commit 7cc0bff40d
2 changed files with 8 additions and 7 deletions

View File

@ -179,10 +179,10 @@ function orbit_check_propertyT(logger, sett::Settings)
λ, P = λandP(SDP_problem, orb_data) λ, P = λandP(SDP_problem, orb_data)
end end
info(PropertyT.logger, "λ = ") info(logger, "λ = ")
info(PropertyT.logger, "sum(P) = $(sum(P))") info(logger, "sum(P) = $(sum(P))")
info(PropertyT.logger, "maximum(P) = $(maximum(P))") info(logger, "maximum(P) = $(maximum(P))")
info(PropertyT.logger, "minimum(P) = $(minimum(P))") info(logger, "minimum(P) = $(minimum(P))")
if λ > 0 if λ > 0
sgap = PropertyT.check_distance_to_positive_cone(Δ, λ, P, tol=sett.tol, rational=false, len=2*sett.radius) sgap = PropertyT.check_distance_to_positive_cone(Δ, λ, P, tol=sett.tol, rational=false, len=2*sett.radius)

View File

@ -161,13 +161,14 @@ end
function compute_orbit_data{T<:GroupElem}(logger, name::String, G::Group, S::Vector{T}, AutS; radius=2) function compute_orbit_data{T<:GroupElem}(logger, name::String, G::Group, S::Vector{T}, AutS; radius=2)
isdir(name) || mkdir(name) isdir(name) || mkdir(name)
info(logger, "Generating ball of radius 4") info(logger, "Generating ball of radius $(2*radius)")
@time E4, sizes = Groups.generate_balls(S, G(), radius=2*radius);
if isa(G, Nemo.Ring) if isa(G, Nemo.Ring)
Id = one(G) Id = one(G)
else else
Id = G() Id = G()
end end
@time E4, sizes = Groups.generate_balls(S, Id, radius=2*radius);
info(logger, "Balls of sizes $sizes.")
info(logger, "Reverse dict") info(logger, "Reverse dict")
@time E_dict = GroupRings.reverse_dict(E4) @time E_dict = GroupRings.reverse_dict(E4)
@ -179,7 +180,7 @@ function compute_orbit_data{T<:GroupElem}(logger, name::String, G::Group, S::Vec
save(joinpath(name, "delta.jld"), "Δ", Δ.coeffs) save(joinpath(name, "delta.jld"), "Δ", Δ.coeffs)
save(joinpath(name, "pm.jld"), "pm", pm) save(joinpath(name, "pm.jld"), "pm", pm)
info(logger, "Decomposing E into orbits of $(Aut_S)") info(logger, "Decomposing E into orbits of $(AutS)")
@time orbs = orbit_decomposition(AutS, E4, E_dict) @time orbs = orbit_decomposition(AutS, E4, E_dict)
@assert sum(length(o) for o in orbs) == length(E4) @assert sum(length(o) for o in orbs) == length(E4)
save(joinpath(name, "orbits.jld"), "orbits", orbs) save(joinpath(name, "orbits.jld"), "orbits", orbs)