Skip to content

Comment out @debug statements #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Apr 20, 2025
Merged

Comment out @debug statements #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 7 additions & 7 deletions src/eigenGeneral.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ function _schur!(

@inbounds while true
i += 1
@debug "iteration" i
# @debug "iteration" i
if i > maxiter
throw(ArgumentError("iteration limit $maxiter reached"))
end
Expand All @@ -118,7 +118,7 @@ function _schur!(
# Set istart to the beginning of the second block
istart = _istart + 1

@debug "Split!" HH[istart, istart-1] istart
# @debug "Split!" HH[istart, istart-1] istart

# Set the subdiagonal element to zero to signal that a split has taken place
HH[istart, istart-1] = 0
Expand All @@ -131,12 +131,12 @@ function _schur!(

# if block size is one we deflate
if istart >= iend
@debug "Bottom deflation! Block size is one. New iend is" iend - 1
# @debug "Bottom deflation! Block size is one. New iend is" iend - 1
iend -= 1

# and the same for a 2x2 block
elseif istart + 1 == iend
@debug "Bottom deflation! Block size is two. New iend is" iend - 2
# @debug "Bottom deflation! Block size is two. New iend is" iend - 2
iend -= 2

# run a QR iteration
Expand All @@ -153,14 +153,14 @@ function _schur!(
d = Hm1m1 * Hmm - HH[iend, iend-1] * HH[iend-1, iend]
t = Hm1m1 + Hmm
end
@debug "block start is, block end, d, and t" istart iend d t
# @debug "block start is, block end, d, and t" istart iend d t

if shiftmethod == :Francis
@debug "Francis double shift!" HH[iend, iend-1] HH[iend-1, iend-2]
# @debug "Francis double shift!" HH[iend, iend-1] HH[iend-1, iend-2]

doubleShiftQR!(HH, τ, t, d, istart, iend)
elseif shiftmethod == :Rayleigh
@debug "Single shift with Rayleigh shift!" HH[iend, iend-1]
# @debug "Single shift with Rayleigh shift!" HH[iend, iend-1]

# Run a bulge chase
singleShiftQR!(HH, τ, Hmm, istart, iend)
Expand Down
36 changes: 18 additions & 18 deletions src/eigenSelfAdjoint.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,33 +183,33 @@ function eigvalsPWK!(S::SymTridiagonal{T}; tol = eps(T), sortby::Union{Function,
blockend = n
end

@debug "submatrix" blockstart blockend
# @debug "submatrix" blockstart blockend

# Deflate?
if blockstart == blockend
@debug "Deflate? Yes!"
# @debug "Deflate? Yes!"
blockstart += 1
elseif blockstart + 1 == blockend
@debug "Defalte? Yes, but after solving 2x2 block!"
# @debug "Defalte? Yes, but after solving 2x2 block!"
d[blockstart], d[blockend] =
eigvals2x2(d[blockstart], d[blockend], sqrt(e[blockstart]))
e[blockstart] = zero(T)
blockstart += 1
else
@debug "Deflate? No!"
# @debug "Deflate? No!"
# Calculate shift
sqrte = sqrt(e[blockstart])
μ = (d[blockstart+1] - d[blockstart]) / (2 * sqrte)
r = hypot(μ, one(T))
μ = d[blockstart] - sqrte / (μ + copysign(r, μ))

# QL bulk chase
@debug "Values before PWK QL bulge chase" e[blockstart] e[blockend-1] μ
# @debug "Values before PWK QL bulge chase" e[blockstart] e[blockend-1] μ
singleShiftQLPWK!(S, μ, blockstart, blockend)

rotations = blockend - blockstart
iter += rotations
@debug "Values after PWK QL bulge chase" e[blockstart] e[blockend-1] rotations
# @debug "Values after PWK QL bulge chase" e[blockstart] e[blockend-1] rotations
end
if blockstart >= n
break
Expand Down Expand Up @@ -259,27 +259,27 @@ function eigQL!(
blockend = n
end

@debug "submatrix" blockstart blockend
# @debug "submatrix" blockstart blockend

# Deflate?
if blockstart == blockend
@debug "Deflate? Yes!"
# @debug "Deflate? Yes!"
blockstart += 1
elseif blockstart + 1 == blockend
@debug "Deflate? Yes, but after solving 2x2 block"
# @debug "Deflate? Yes, but after solving 2x2 block"
eig2x2!(d, e, blockstart, vectors)
blockstart += 2
else
@debug "Deflate? No!"
# @debug "Deflate? No!"
# Calculate shift
μ = (d[blockstart + 1] - d[blockstart]) / (2 * e[blockstart])
r = hypot(μ, one(T))
μ = d[blockstart] - (e[blockstart] / (μ + copysign(r, μ)))

# QL bulk chase
@debug "Values before bulge chase" e[blockstart] e[blockend - 1] d[blockstart] μ
# @debug "Values before bulge chase" e[blockstart] e[blockend - 1] d[blockstart] μ
singleShiftQL!(S, μ, blockstart, blockend, vectors)
@debug "Values after bulge chase" e[blockstart] e[blockend - 1] d[blockstart]
# @debug "Values after bulge chase" e[blockstart] e[blockend - 1] d[blockstart]
end

if blockstart >= n
Expand Down Expand Up @@ -312,27 +312,27 @@ function eigQR!(
blockend = n
end

@debug "submatrix" blockstart blockend
# @debug "submatrix" blockstart blockend

# Deflate?
if blockstart == blockend
@debug "Deflate? Yes!"
# @debug "Deflate? Yes!"
blockstart += 1
elseif blockstart + 1 == blockend
@debug "Deflate? Yes, but after solving 2x2 block!"
# @debug "Deflate? Yes, but after solving 2x2 block!"
eig2x2!(d, e, blockstart, vectors)
blockstart += 2
else
@debug "Deflate? No!"
# @debug "Deflate? No!"
# Calculate shift
μ = (d[blockend - 1] - d[blockend]) / (2 * e[blockend - 1])
r = hypot(μ, one(T))
μ = d[blockend] - (e[blockend - 1] / (μ + copysign(r, μ)))

# QR bulk chase
@debug "Values before QR bulge chase" e[blockstart] e[blockend - 1] d[blockend] μ
# @debug "Values before QR bulge chase" e[blockstart] e[blockend - 1] d[blockend] μ
singleShiftQR!(S, μ, blockstart, blockend, vectors)
@debug "Values after QR bulge chase" e[blockstart] e[blockend - 1] d[blockend]
# @debug "Values after QR bulge chase" e[blockstart] e[blockend - 1] d[blockend]
end
if blockstart >= n
break
Expand Down
6 changes: 3 additions & 3 deletions src/svd.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,14 +200,14 @@ function __svd!(
break
end
end
@debug "Active submatrix" iteration n1 n2 d[n1] d[n2] e[n1] e[n2 - 1]
# @debug "Active submatrix" iteration n1 n2 d[n1] d[n2] e[n1] e[n2 - 1]

# Deflation check. See LAWN3 p21
# The Demmel-Kahan iteration moves the zero to the end and produces a
# zero super diagonal element as well
for i = n1:n2
if d[i] == 0
@debug "Deflation! Exact zero in diagonal element" i
# @debug "Deflation! Exact zero in diagonal element" i
svdDemmelKahan!(B, n1, n2, U, Vᴴ)

# We have now moved a zero to the end so the problem is one smaller
Expand All @@ -230,7 +230,7 @@ function __svd!(
fudge = n2 - n1 + 1
thresh = tol * σ⁻

@debug "estimated quantities" σ⁻ σ⁺ fudge thresh
# @debug "estimated quantities" σ⁻ σ⁺ fudge thresh

if fudge * tol * σ⁻ <= eps(σ⁺)
svdDemmelKahan!(B, n1, n2, U, Vᴴ)
Expand Down
Loading