Skip to content

Commit bca06cd

Browse files
Harsh SinghHarsh Singh
authored andcommitted
Fix Ralston4 test imports, inference.jl typo and formatting
- Replace isdefined guards with direct imports of Ralston4 - Replace conditional splat with plain Ralston4() calls - step_limiter_test.jl: remove redundant explicit import - Fix inferrable -> inferable typo in inference.jl - Runic formatted inference.jl
1 parent b52246b commit bca06cd

File tree

3 files changed

+5
-8
lines changed

3 files changed

+5
-8
lines changed

test/integrators/step_limiter_test.jl

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
using OrdinaryDiffEq, Test
22
using OrdinaryDiffEqFIRK: AdaptiveRadau, RadauIIA9, RadauIIA5, RadauIIA3
33
using OrdinaryDiffEqLowOrderRK
4-
const _has_Ralston4 = isdefined(OrdinaryDiffEqLowOrderRK, :Ralston4)
54

65
# define the counting variable
76
const STEP_LIMITER_VAR = Ref(0)
@@ -31,7 +30,7 @@ end
3130
Rosenbrock23, Rosenbrock32, ROS3P, Rodas3, Rodas23W, Rodas3P, Rodas4, Rodas42,
3231
Rodas4P, Rodas4P2, Rodas5, Rodas5P, Rodas5Pe, Rodas5Pr,
3332
AdaptiveRadau, RadauIIA9, RadauIIA5, RadauIIA3, SIR54,
34-
Alshina2, Alshina3, Heun, Ralston, (_has_Ralston4 ? (OrdinaryDiffEqLowOrderRK.Ralston4,) : ())..., Midpoint, RK4,
33+
Alshina2, Alshina3, Heun, Ralston, Ralston4, Midpoint, RK4,
3534
OwrenZen3, OwrenZen4, OwrenZen5,
3635
BS3, DP5, Tsit5, DP8, TanYam7, TsitPap8, FRK65, PFRK87, BS5, Vern6, Vern7,
3736
Vern8, Vern9, QPRK98, SSPRKMSVS43, SSPRKMSVS32, SSPRK432, SSPRK43,

test/interface/float32.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
using OrdinaryDiffEq, Test
2-
using OrdinaryDiffEqLowOrderRK
3-
const _has_Ralston4 = isdefined(OrdinaryDiffEqLowOrderRK, :Ralston4)
2+
using OrdinaryDiffEqLowOrderRK: Ralston4
43
function some_arbitrary_function!(du, u, p, τ)
54
du = u / 100
65
return nothing #function returns nothing
@@ -13,7 +12,7 @@ tspan = (zero(NF), NF(1.0e3)) #integrate from t=0 to t = 1000
1312
ode_prob = ODEProblem(some_arbitrary_function!, u, tspan, params)
1413

1514
for alg in [
16-
Euler(), Midpoint(), Heun(), Ralston(), (_has_Ralston4 ? (OrdinaryDiffEqLowOrderRK.Ralston4(),) : ())..., RK4(), SSPRK104(), SSPRK22(), SSPRK33(),
15+
Euler(), Midpoint(), Heun(), Ralston(), Ralston4(), RK4(), SSPRK104(), SSPRK22(), SSPRK33(),
1716
SSPRK43(), SSPRK432(), BS3(), BS5(), DP5(), DP8(), Feagin10(), Feagin12(),
1817
Feagin14(), TanYam7(), Tsit5(), TsitPap8(), Vern6(), Vern7(), Vern8(), Vern9(),
1918
]

test/interface/units_tests.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,10 @@
11
using OrdinaryDiffEq, RecursiveArrayTools, Unitful
2-
using OrdinaryDiffEqLowOrderRK
3-
const _has_Ralston4 = isdefined(OrdinaryDiffEqLowOrderRK, :Ralston4)
2+
using OrdinaryDiffEqLowOrderRK: Ralston4
43
using LinearAlgebra, Test, ADTypes
54

65
@testset "Algorithms" begin
76
algs = [
8-
Euler(), Midpoint(), Heun(), Ralston(), (_has_Ralston4 ? (OrdinaryDiffEqLowOrderRK.Ralston4(),) : ())..., RK4(), SSPRK104(), SSPRK22(), SSPRK33(),
7+
Euler(), Midpoint(), Heun(), Ralston(), Ralston4(), RK4(), SSPRK104(), SSPRK22(), SSPRK33(),
98
SSPRK43(), SSPRK432(), BS3(), BS5(), DP5(), DP8(), Feagin10(), Feagin12(),
109
Feagin14(), TanYam7(), Tsit5(), TsitPap8(), Vern6(), Vern7(), Vern8(), Vern9(),
1110
]

0 commit comments

Comments
 (0)