From 7d42f28b2956262b3f791b5c596231fc82fe536a Mon Sep 17 00:00:00 2001 From: kalmar Date: Fri, 4 Aug 2017 20:36:25 +0200 Subject: [PATCH] put rationalization and projection to augmentation in a separate function to have gc collect unused matrices of Rationals after this is finished --- src/CheckSolution.jl | 30 ++++++++++++++++++++++-------- 1 file changed, 22 insertions(+), 8 deletions(-) diff --git a/src/CheckSolution.jl b/src/CheckSolution.jl index 0ddbd45..a7d94f5 100644 --- a/src/CheckSolution.jl +++ b/src/CheckSolution.jl @@ -111,6 +111,23 @@ function distance_to_cone(λ, sqrt_matrix::AbstractArray, Δ::GroupRingElem, wle return distance_to_cone end +function rationalize_and_project{T}(Q::AbstractArray{T}, δ::T, logger) + info(logger, "") + info(logger, "Rationalizing") + t = @timed Q_ℚ = ℚ(Q, δ) + info(logger, timed_msg(t)) + + info(logger, "Projecting columns of the rationalized Q to the augmentation ideal...") + t = @timed Q_ℚω = correct_to_augmentation_ideal!(Q_ℚ) + info(logger, timed_msg(t)) + + info(logger, "Intervalizing Q") + t = @timed Q_ℚω_int = Float64.(Q_ℚω) ± 10*eps(δ) + info(logger, timed_msg(t)) + + return Q_ℚω_int +end + function check_distance_to_positive_cone(Δ::GroupRingElem, λ, Q, wlen; tol=1e-14, rational=false) @@ -127,16 +144,13 @@ function check_distance_to_positive_cone(Δ::GroupRingElem, λ, Q, wlen; end info(logger, "") - info(logger, "Projecting columns of rationalized Q to the augmentation ideal...") - δ = tol - Q_ℚ = ℚ(Q, δ) - t = @timed Q_ℚω = correct_to_augmentation_ideal(Q_ℚ) - info(logger, timed_msg(t)) - λ_ℚ = ℚ(λ, δ) - Δ_ℚ = ℚ(Δ, δ) + info(logger, "Projecting columns of the rationalized Q to the augmentation ideal...") + Q_ℚω_int = rationalize_and_project(Q, tol, logger) + λ_ℚ = ℚ(λ, tol) + Δ_ℚ = ℚ(Δ, tol) info(logger, "Checking in interval arithmetic") - Q_ℚω_int = Float64.(Q_ℚω) ± δ + t = @timed Interval_dist_to_ΣSq = distance_to_cone(λ_ℚ, Q_ℚω_int, Δ_ℚ, wlen) info(logger, timed_msg(t)) info(logger, "The Augmentation-projected actual distance (to positive cone) ∈ $(Interval_dist_to_ΣSq)")