From 75d6077bdbd7a45c59a163c01f04b32bd19a0ebf Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Thu, 15 May 2025 13:56:21 -0300 Subject: Change to way γ is adjusted MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- log-fourier_integrator.cpp | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/log-fourier_integrator.cpp b/log-fourier_integrator.cpp index b819456..fe0751f 100644 --- a/log-fourier_integrator.cpp +++ b/log-fourier_integrator.cpp @@ -184,12 +184,9 @@ int main(int argc, char* argv[]) { Ȓₜ[i] += γ * (Ȓₜ₊₁[i] - Ȓₜ[i]); } - if (ΔCₜ > ΔCₜ₋₁ * 5) { + if (ΔCₜ > ΔCₜ₋₁ * 5 && ΔCₜ < 1e-9) { γ = std::max(γ / 2, (Real)1e-2); } - if (ΔCₜ < ΔCₜ₋₁) { - γ = std::min(1.001 * γ, (Real)1); - } ΔCₜ₋₁ = ΔCₜ; -- cgit v1.2.3-70-g09d2 From e9b5f2c6e25423fa492d3c5648be9db9ed4f6b2e Mon Sep 17 00:00:00 2001 From: Jaron Kent-Dobias Date: Thu, 15 May 2025 14:26:11 -0300 Subject: Fail gracefully if attempt to load files fails --- log-fourier_integrator.cpp | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/log-fourier_integrator.cpp b/log-fourier_integrator.cpp index fe0751f..0a181d0 100644 --- a/log-fourier_integrator.cpp +++ b/log-fourier_integrator.cpp @@ -118,7 +118,9 @@ int main(int argc, char* argv[]) { Ȓₜ₋₁[n] = (Real)1.0 / (μ₀ + II * fft.ν(n)); } } else { - logFourierLoad(Cₜ₋₁, Rₜ₋₁, Ĉₜ₋₁, Ȓₜ₋₁, p, s, λ, τ₀, β₀, log2n, Δτ, logShift); + if (!logFourierLoad(Cₜ₋₁, Rₜ₋₁, Ĉₜ₋₁, Ȓₜ₋₁, p, s, λ, τ₀, β₀, log2n, Δτ, logShift)) { + return 1; + } μₜ₋₁ = estimateZ(fft, Cₜ₋₁, Ĉₜ₋₁, Rₜ₋₁, Ȓₜ₋₁, p, s, λ, τ₀, β₀); } -- cgit v1.2.3-70-g09d2