diff options
Diffstat (limited to 'log-fourier.cpp')
| -rw-r--r-- | log-fourier.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/log-fourier.cpp b/log-fourier.cpp index afb7e55..be50260 100644 --- a/log-fourier.cpp +++ b/log-fourier.cpp @@ -64,6 +64,8 @@ std::vector<Complex> LogarithmicFourierTransform::fourier(const std::vector<Real for (unsigned n = 0; n < pad*N; n++) { if (n < N) { a[n] = c[n] * exp((1 - k) * τ(n)); + } else if (n >= (pad - 1) * N) { + a[n] = c[pad*N-n-1] * exp((1 - k) * τ(pad*N-n-1)); } else { a[n] = 0; } @@ -92,6 +94,8 @@ std::vector<Real> LogarithmicFourierTransform::inverse(const std::vector<Complex for (unsigned n = 0; n < pad * N; n++) { if (n < N) { a[n] = (ĉ[n].real() + II * σ * ĉ[n].imag()) * std::exp((1 - k) * ω(n)); + } else if (n >= (pad - 1) * N) { + a[n] = (ĉ[pad*N-n-1].real() + II * σ * ĉ[pad*N-n-1].imag()) * std::exp((1 - k) * ω(pad*N-n-1)); } else { a[n] = 0; } @@ -189,13 +193,22 @@ Real energy(const LogarithmicFourierTransform& fft, std::vector<Real>& C, const 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; + for (unsigned n = 0; n < C.size()/2-1; n++) { + Real R₂ₙ = R[2*n]; + Real R₂ₙ₊₁ = R[2*n+1]; + Real R₂ₙ₊₂ = R[2*n+2]; + Real C₂ₙ = C[2*n]; + Real C₂ₙ₊₁ = C[2*n+1]; + Real C₂ₙ₊₂ = C[2*n+2]; + + if (C₂ₙ₊₂ < 0 || R₂ₙ₊₂ < 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); - 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₂ₙ₊₁ |