From 5cce5673249490ea3cbeb304d8817649bafb499f Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 5 Jan 2025 10:59:23 -0500 Subject: [PATCH] Format .jl files [skip ci] (#456) Co-authored-by: jverzani <421708+jverzani@users.noreply.github.com> --- src/Bracketing/alefeld_potra_shi.jl | 8 ++++---- test/test_composable.jl | 11 +++++------ 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/src/Bracketing/alefeld_potra_shi.jl b/src/Bracketing/alefeld_potra_shi.jl index 533ffc2..302ad14 100644 --- a/src/Bracketing/alefeld_potra_shi.jl +++ b/src/Bracketing/alefeld_potra_shi.jl @@ -107,7 +107,6 @@ function update_state( options, l=NullTracks(), ) where {T,S} - atol, rtol = options.xabstol, options.xreltol μ, λ = oftype(rtol, 0.5), oftype(rtol, 0.7) tols = (; λ=λ, atol=atol, rtol=rtol) @@ -145,10 +144,11 @@ function update_state( ā, b̄, d, fā, fb̄, fd = bracket(a, b, x, fa, fb, fx) - - if ((b̄ - ā) <= tolₑ(ā, b̄, fā, fb̄, atol, rtol) || + if ( + (b̄ - ā) <= tolₑ(ā, b̄, fā, fb̄, atol, rtol) || iszero(fx) || # exact zero - !isbracket(fā,fb̄)) # catch non bracket?, issue #453 + !isbracket(fā, fb̄) + ) # catch non bracket?, issue #453 @reset o.xn0 = ā @reset o.xn1 = b̄ @reset o.fxn0 = fā diff --git a/test/test_composable.jl b/test/test_composable.jl index 0df5f66..326e0e3 100644 --- a/test/test_composable.jl +++ b/test/test_composable.jl @@ -84,16 +84,15 @@ using Measurements @test h(α) ≤ h(α + 0.1) @test h(α) ≤ h(α - 0.1) - # Measurements # issue #453 @testset "Measurements.jl" begin - a = measurement(1.0 , 0.1) - b = measurement(-3.0 , 0.1) + a = measurement(1.0, 0.1) + b = measurement(-3.0, 0.1) c = measurement(-10.0, 0.1) - f(x) = a*x^2 + b*x + c + f(x) = a * x^2 + b * x + c x₀ = (measurement(-3.0, 0.1), measurement(0.0, 0.1)) - for M ∈ (A42(), AlefeldPotraShi(), Bisection()) - @test find_zero(f,x₀, M) ≈ -2.0 + for M in (A42(), AlefeldPotraShi(), Bisection()) + @test find_zero(f, x₀, M) ≈ -2.0 end @test find_zero(f, measurement(0.0, 0.1)) ≈ -2.0 end