From 7332c03a462bf426f113110e00d9b28d306c4af0 Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Wed, 7 May 2025 22:56:34 -0300 Subject: Undo change to μ adjustement, calculate energy differently MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- log-fourier.cpp | 12 +++++++++--- log-fourier_integrator.cpp | 3 +-- 2 files changed, 10 insertions(+), 5 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& C, con Real energy(const LogarithmicFourierTransform& fft, std::vector& C, const std::vector& 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₂ₙ₊₁ diff --git a/log-fourier_integrator.cpp b/log-fourier_integrator.cpp index 017def7..55f358a 100644 --- a/log-fourier_integrator.cpp +++ b/log-fourier_integrator.cpp @@ -140,8 +140,7 @@ int main(int argc, char* argv[]) { std::vector Rₜ₊₁ = fft.inverse(Ȓₜ₊₁); std::vector Cₜ₊₁ = fft.inverse(Ĉₜ₊₁); - Real C₀ = (Cₜ₊₁[0] + Cₜ₊₁[1]) / 2; - μₜ *= pow(tanh(C₀-1)+1, x); + μₜ *= pow(tanh(Cₜ₊₁[0]-1)+1, x); ΔCₜ = 0; for (unsigned i = 0; i < N; i++) { -- cgit v1.2.3-70-g09d2