diff options
Diffstat (limited to 'log-fourier.cpp')
| -rw-r--r-- | log-fourier.cpp | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/log-fourier.cpp b/log-fourier.cpp index 57a8613..9ae70be 100644 --- a/log-fourier.cpp +++ b/log-fourier.cpp @@ -182,17 +182,11 @@ 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₂ₙ * df(λ, p, s, C₂ₙ); - Real f₂ₙ₊₁ = R₂ₙ₊₁ * df(λ, p, s, C₂ₙ₊₁); - Real f₂ₙ₊₂ = R₂ₙ₊₂ * df(λ, p, s, C₂ₙ₊₂); + 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]); E += (h₂ₙ + h₂ₙ₊₁) / 6 * ( (2 - h₂ₙ₊₁ / h₂ₙ) * f₂ₙ + std::pow(h₂ₙ + h₂ₙ₊₁, 2) / (h₂ₙ * h₂ₙ₊₁) * f₂ₙ₊₁ |