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

check_distance_to... -> distance_to_...

Browse Source 
and a lot of old code removal
This commit is contained in:
kalmarek 2017-10-27 18:34:07 +02:00
parent 4ae2c617cb
commit 098a7ce948
1 changed files with 10 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/CheckSolution.jl
View File

@ -106,13 +106,12 @@ function augIdproj{T}(Q::AbstractArray{T,2}, logger)
return Q return Q
end end
function check_distance_to_positive_cone(Δ::GroupRingElem, λ, Q, wlen; function distance_to_positive_cone(Δ::GroupRingElem, λ, Q, wlen::Int)
tol=1e-14, rational=false)
info(logger, "------------------------------------------------------------") info(logger, "------------------------------------------------------------")
info(logger, "") info(logger, "λ = $λ")
info(logger, "Checking in floating-point arithmetic...") info(logger, "Checking in floating-point arithmetic...")
t = @timed fp_distance = distance_to_cone(λ, Q, Δ, wlen) Δ²_λΔ = EOI(Δ, λ)
t = @timed fp_distance = λ - distance_to_cone(Δ²_λΔ, Q, wlen)
info(logger, timed_msg(t)) info(logger, timed_msg(t))
info(logger, "Floating point distance (to positive cone) ≈ $(@sprintf("%.10f", fp_distance))") info(logger, "Floating point distance (to positive cone) ≈ $(@sprintf("%.10f", fp_distance))")
info(logger, "------------------------------------------------------------") info(logger, "------------------------------------------------------------")
@ -122,26 +121,17 @@ function check_distance_to_positive_cone(Δ::GroupRingElem, λ, Q, wlen;
end end
info(logger, "") info(logger, "")
Q_ℚω_int = rationalize_and_project(Q, tol, logger) Q = augIdproj(Q, logger)
λ_ℚ = ℚ(λ, tol)
Δ_ℚ = ℚ(Δ, tol)
info(logger, "Checking in interval arithmetic") info(logger, "Checking in interval arithmetic")
λ = @interval(λ)
Δ = GroupRingElem([@interval(c) for c in Δ.coeffs], parent(Δ))
Δ²_λΔ = EOI(Δ, λ)
t = @timed Interval_dist_to_ΣSq = distance_to_cone(λ_ℚ, Q_ℚω_int, Δ_ℚ, wlen) t = @timed Interval_dist_to_ΣSq = λ - distance_to_cone(Δ²_λΔ, Q, 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)")
info(logger, "------------------------------------------------------------") info(logger, "------------------------------------------------------------")
if Interval_dist_to_ΣSq.lo ≤ 0 || !rational return Interval_dist_to_ΣSq
return Interval_dist_to_ΣSq
else
info(logger, "Checking Projected SOS decomposition in exact rational arithmetic...")
t = @timed ℚ_dist_to_ΣSq = distance_to_cone(λ_ℚ, Q_ℚω, Δ_ℚ, wlen)
info(logger, timed_msg(t))
@assert isa(ℚ_dist_to_ΣSq, Rational)
info(logger, "Augmentation-projected rational distance (to positive cone) ≥ $(Float64(trunc(ℚ_dist_to_ΣSq,8)))")
info(logger, "------------------------------------------------------------")
return ℚ_dist_to_ΣSq
end
end end