From f2f941862e4f07d5435ce167b1d235c317f47132 Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sat, 21 Jul 2018 22:47:33 -0700 Subject: [PATCH] fix deps in tests --- src/algorithms.jl | 2 +- test/ode/ode_initdt_tests.jl | 4 ++-- test/ode/ode_rosenbrock_tests.jl | 12 ++++++------ test/owrenzen_tests.jl | 2 +- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/algorithms.jl b/src/algorithms.jl index 837336967e..24ea55bdec 100644 --- a/src/algorithms.jl +++ b/src/algorithms.jl @@ -29,7 +29,7 @@ Base.@pure FunctionMap(;scale_by_time=false) = FunctionMap{scale_by_time}() struct ExplicitRK{TabType} <: OrdinaryDiffEqAdaptiveAlgorithm tableau::TabType end -ExplicitRK() = ExplicitRK(ODE_DEFAULT_TABLEAU) +ExplicitRK(;tableau=ODE_DEFAULT_TABLEAU) = ExplicitRK(ODE_DEFAULT_TABLEAU) @inline trivial_limiter!(u, f, t) = nothing diff --git a/test/ode/ode_initdt_tests.jl b/test/ode/ode_initdt_tests.jl index 54afd95277..52c9798bcc 100644 --- a/test/ode/ode_initdt_tests.jl +++ b/test/ode/ode_initdt_tests.jl @@ -8,14 +8,14 @@ import DiffEqProblemLibrary.ODEProblemLibrary: prob_ode_linear, prob_ode_2Dlinea dt₀ = sol.t[2] prob = prob_ode_2Dlinear - sol =solve(prob,ExplicitRK(constructBogakiShampine3())) + sol =solve(prob,ExplicitRK(tableau=constructBogakiShampine3())) dt₀ = sol.t[2] @test 1e-7 < dt₀ < .1 @test_throws ErrorException sol = solve(prob,Euler()) #dt₀ = sol.t[2] - sol3 =solve(prob,ExplicitRK(constructDormandPrince8_64bit())) + sol3 =solve(prob,ExplicitRK(tableau=constructDormandPrince8_64bit())) dt₀ = sol3.t[2] @test 1e-7 < dt₀ < .3 diff --git a/test/ode/ode_rosenbrock_tests.jl b/test/ode/ode_rosenbrock_tests.jl index b8111267a4..54403ede3b 100644 --- a/test/ode/ode_rosenbrock_tests.jl +++ b/test/ode/ode_rosenbrock_tests.jl @@ -5,7 +5,7 @@ using DiffEqProblemLibrary.ODEProblemLibrary: importodeproblems; importodeproble import DiffEqProblemLibrary.ODEProblemLibrary: prob_ode_linear, prob_ode_2Dlinear, prob_ode_bigfloatlinear, prob_ode_bigfloat2Dlinear -dts = 1.//2.^(6:-1:3) +dts = (1/2) .^ (6:-1:3) testTol = 0.2 ### Rosenbrock23() @@ -28,10 +28,10 @@ sol = solve(prob,Rosenbrock23()) prob = prob_ode_bigfloat2Dlinear -sim = test_convergence(dts,prob,Rosenbrock23(linsolve=LinSolveFactorize(qrfact!))) +sim = test_convergence(dts,prob,Rosenbrock23(linsolve=LinSolveFactorize(qr!))) @test abs(sim.𝒪est[:final]-2) < testTol -sol = solve(prob,Rosenbrock23(linsolve=LinSolveFactorize(qrfact!))) +sol = solve(prob,Rosenbrock23(linsolve=LinSolveFactorize(qr!))) @test length(sol) < 20 ### Rosenbrock32() @@ -163,7 +163,7 @@ sol = solve(prob,GRK4T()) @test length(sol) < 20 ### GRK4A -dts = 1.//2.^(7:-1:4) +dts = (1/2) .^ (7:-1:4) prob = prob_ode_linear @@ -203,7 +203,7 @@ sol = solve(prob,Ros4LStab()) println("RODAS") -dts = 1.//2.^(7:-1:4) +dts = (1/2) .^ (7:-1:4) prob = prob_ode_linear @@ -288,7 +288,7 @@ println("Rodas5") prob = prob_ode_linear -dts = 1.//2.^(7:-1:3) +dts = (1/2) .^ (7:-1:3) sim = test_convergence(dts,prob,Rodas5(),dense_errors=true) @test abs(sim.𝒪est[:final]-5) < testTol @test abs(sim.𝒪est[:L2]-4) < testTol diff --git a/test/owrenzen_tests.jl b/test/owrenzen_tests.jl index 16d496ebec..b7b7796649 100644 --- a/test/owrenzen_tests.jl +++ b/test/owrenzen_tests.jl @@ -4,7 +4,7 @@ import DiffEqProblemLibrary.ODEProblemLibrary: prob_ode_2Dlinear, prob_ode_linea srand(100) ## Convergence Testing -dts = 1.//2.^(7:-1:4) +dts = (1/2) .^ (7:-1:4) testTol = 0.2