From 7cc0bff40dfe26a117da34493671719ac7cc1d30 Mon Sep 17 00:00:00 2001 From: kalmar Date: Thu, 8 Jun 2017 21:40:13 +0200 Subject: [PATCH] better logging --- Orb_AutFN.jl | 8 ++++---- OrbitDecomposition.jl | 7 ++++--- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/Orb_AutFN.jl b/Orb_AutFN.jl index f229c9a..82556f5 100644 --- a/Orb_AutFN.jl +++ b/Orb_AutFN.jl @@ -179,10 +179,10 @@ function orbit_check_propertyT(logger, sett::Settings) λ, P = λandP(SDP_problem, orb_data) end - info(PropertyT.logger, "λ = $λ") - info(PropertyT.logger, "sum(P) = $(sum(P))") - info(PropertyT.logger, "maximum(P) = $(maximum(P))") - info(PropertyT.logger, "minimum(P) = $(minimum(P))") + info(logger, "λ = $λ") + info(logger, "sum(P) = $(sum(P))") + info(logger, "maximum(P) = $(maximum(P))") + info(logger, "minimum(P) = $(minimum(P))") if λ > 0 sgap = PropertyT.check_distance_to_positive_cone(Δ, λ, P, tol=sett.tol, rational=false, len=2*sett.radius) diff --git a/OrbitDecomposition.jl b/OrbitDecomposition.jl index 35ecec8..c45e777 100644 --- a/OrbitDecomposition.jl +++ b/OrbitDecomposition.jl @@ -161,13 +161,14 @@ end function compute_orbit_data{T<:GroupElem}(logger, name::String, G::Group, S::Vector{T}, AutS; radius=2) isdir(name) || mkdir(name) - info(logger, "Generating ball of radius 4") - @time E4, sizes = Groups.generate_balls(S, G(), radius=2*radius); + info(logger, "Generating ball of radius $(2*radius)") if isa(G, Nemo.Ring) Id = one(G) else Id = G() end + @time E4, sizes = Groups.generate_balls(S, Id, radius=2*radius); + info(logger, "Balls of sizes $sizes.") info(logger, "Reverse dict") @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, "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) @assert sum(length(o) for o in orbs) == length(E4) save(joinpath(name, "orbits.jld"), "orbits", orbs)