diff options
| author | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2025-05-07 22:56:34 -0300 |
|---|---|---|
| committer | Jaron Kent-Dobias <jaron@kent-dobias.com> | 2025-05-07 22:56:34 -0300 |
| commit | 7332c03a462bf426f113110e00d9b28d306c4af0 (patch) | |
| tree | 508fbf758840cf6d1129de00f961251b8329c92a /log-fourier.cpp | |
| parent | b9e5a1f2448aeaca8aa807f3baccbe66f5dc49d2 (diff) | |
| download | code-7332c03a462bf426f113110e00d9b28d306c4af0.tar.gz code-7332c03a462bf426f113110e00d9b28d306c4af0.tar.bz2 code-7332c03a462bf426f113110e00d9b28d306c4af0.zip | |
Undo change to μ adjustement, calculate energy differently
Diffstat (limited to 'log-fourier.cpp')
| -rw-r--r-- | log-fourier.cpp | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/log-fourier.cpp b/log-fourier.cpp index 9ae70be..57a8613 100644 --- a/log-fourier.cpp +++ b/log-fourier.cpp @@ -182,11 +182,17 @@ 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 = 0; for (unsigned n = 0; n < C.size()/2-1; n++) { + Real C₂ₙ = std::min(std::max(C[2*n], (Real)0), (Real)1); + Real C₂ₙ₊₁ = std::min(std::max(C[2*n+1], (Real)0), (Real)1); + Real C₂ₙ₊₂ = std::min(std::max(C[2*n+2], (Real)0), (Real)1); + Real R₂ₙ = std::min(std::max(R[2*n], (Real)0), (Real)1); + Real R₂ₙ₊₁ = std::min(std::max(R[2*n+1], (Real)0), (Real)1); + Real R₂ₙ₊₂ = std::min(std::max(R[2*n+2], (Real)0), (Real)1); Real h₂ₙ = fft.t(2*n+1) - fft.t(2*n); Real h₂ₙ₊₁ = fft.t(2*n+2) - fft.t(2*n+1); - Real f₂ₙ = R[2*n] * df(λ, p, s, C[2*n]); - Real f₂ₙ₊₁ = R[2*n+1] * df(λ, p, s, C[2*n+1]); - Real f₂ₙ₊₂ = R[2*n+2] * df(λ, p, s, C[2*n+2]); + Real f₂ₙ = R₂ₙ * df(λ, p, s, C₂ₙ); + Real f₂ₙ₊₁ = R₂ₙ₊₁ * df(λ, p, s, C₂ₙ₊₁); + Real f₂ₙ₊₂ = R₂ₙ₊₂ * df(λ, p, s, C₂ₙ₊₂); E += (h₂ₙ + h₂ₙ₊₁) / 6 * ( (2 - h₂ₙ₊₁ / h₂ₙ) * f₂ₙ + std::pow(h₂ₙ + h₂ₙ₊₁, 2) / (h₂ₙ * h₂ₙ₊₁) * f₂ₙ₊₁ |