kalmar/PropertyT.jl
1
0
Fork 0
mirror of https://github.com/kalmarek/PropertyT.jl.git synced 2024-11-19 15:25:29 +01:00
Code Issues Releases Wiki Activity

put rationalization and projection to augmentation in a separate function

Browse Source 
to have gc collect unused matrices of Rationals after this is finished
This commit is contained in:
kalmar 2017-08-04 20:36:25 +02:00
parent 845d7733a4
commit 7d42f28b29
1 changed files with 22 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/CheckSolution.jl
View File

@ -111,6 +111,23 @@ function distance_to_cone(λ, sqrt_matrix::AbstractArray, Δ::GroupRingElem, wle
return distance_to_cone return distance_to_cone
end 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; function check_distance_to_positive_cone(Δ::GroupRingElem, λ, Q, wlen;
tol=1e-14, rational=false) tol=1e-14, rational=false)
@ -127,16 +144,13 @@ function check_distance_to_positive_cone(Δ::GroupRingElem, λ, Q, wlen;
end end
info(logger, "") info(logger, "")
info(logger, "Projecting columns of rationalized Q to the augmentation ideal...") info(logger, "Projecting columns of the rationalized Q to the augmentation ideal...")
δ = tol Q_ℚω_int = rationalize_and_project(Q, tol, logger)
Q_ℚ = ℚ(Q, δ) λ_ℚ = ℚ(λ, tol)
t = @timed Q_ℚω = correct_to_augmentation_ideal(Q_ℚ) Δ_ℚ = ℚ(Δ, tol)
info(logger, timed_msg(t))
λ_ℚ = ℚ(λ, δ)
Δ_ℚ = ℚ(Δ, δ)
info(logger, "Checking in interval arithmetic") info(logger, "Checking in interval arithmetic")
Q_ℚω_int = Float64.(Q_ℚω) ± δ
t = @timed Interval_dist_to_ΣSq = distance_to_cone(λ_ℚ, Q_ℚω_int, Δ_ℚ, wlen) t = @timed Interval_dist_to_ΣSq = distance_to_cone(λ_ℚ, Q_ℚω_int, Δ_ℚ, wlen)
info(logger, timed_msg(t)) info(logger, timed_msg(t))
info(logger, "The Augmentation-projected actual distance (to positive cone) ∈ $(Interval_dist_to_ΣSq)") info(logger, "The Augmentation-projected actual distance (to positive cone) ∈ $(Interval_dist_to_ΣSq)")