summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--log-fourier.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/log-fourier.cpp b/log-fourier.cpp
index e8404d7..afb7e55 100644
--- a/log-fourier.cpp
+++ b/log-fourier.cpp
@@ -184,8 +184,12 @@ Real estimateZ(LogarithmicFourierTransform& fft, const std::vector<Real>& C, con
}
Real energy(const LogarithmicFourierTransform& fft, std::vector<Real>& C, const std::vector<Real>& R, unsigned p, unsigned s, Real λ, Real β) {
- Real E = fft.t(0) * (df(λ, p, s, 1) + R[0] * df(λ, p, s, C[0])) / 2;
- for (unsigned n = 0; n < C.size()/2-1; n++) {
+ unsigned n₀;
+ for (unsigned n = 0; n < C.size(); n++) {
+ if (C[n] > 1) n₀ = n;
+ }
+ Real E = fft.t(n₀) * df(λ, p, s, 1);
+ for (unsigned n = n₀ / 2; n < C.size()/2-1; n++) {
if (C[2*n+2] < 0 || R[2*n+2] < 0) break;
Real h₂ₙ = fft.t(2*n+1) - fft.t(2*n);
Real h₂ₙ₊₁ = fft.t(2*n+2) - fft.t(2*n+1);