diff --git a/docs/make.jl b/docs/make.jl index 9bda4a5..3057fc9 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -47,7 +47,7 @@ makedocs(; Base.get_extension(CriticalTransitions, :ChaosToolsExt), Base.get_extension(CriticalTransitions, :CoupledSDEsBaisin), DynamicalSystemsBase, - Base.get_extension(DynamicalSystemsBase, :StochasticSystemsBase) + Base.get_extension(DynamicalSystemsBase, :StochasticSystemsBase), ], doctest=false, format=Documenter.HTML(; html_options...), @@ -56,4 +56,4 @@ makedocs(; plugins=[bib, links], ) -deploydocs(; repo="github.com/JuliaDynamics/CriticalTransitions.jl.git", push_preview=false) \ No newline at end of file +deploydocs(; repo="github.com/JuliaDynamics/CriticalTransitions.jl.git", push_preview=false) diff --git a/src/CriticalTransitions.jl b/src/CriticalTransitions.jl index 9b4d70f..cab1d33 100644 --- a/src/CriticalTransitions.jl +++ b/src/CriticalTransitions.jl @@ -20,8 +20,13 @@ using StochasticDiffEq: terminate!, u_modified! using DynamicalSystemsBase: - DynamicalSystemsBase, CoupledSDEs, CoupledODEs, - dynamic_rule, current_state, set_state!, trajectory + DynamicalSystemsBase, + CoupledSDEs, + CoupledODEs, + dynamic_rule, + current_state, + set_state!, + trajectory using ForwardDiff: ForwardDiff using IntervalArithmetic: IntervalArithmetic, interval diff --git a/src/trajectories/transition.jl b/src/trajectories/transition.jl index 4a490ff..d0e95cd 100644 --- a/src/trajectories/transition.jl +++ b/src/trajectories/transition.jl @@ -55,7 +55,7 @@ function transition( condition(u, t, integrator) = subnorm(u - x_f; directions=rad_dims) < rad_f affect!(integrator) = terminate!(integrator) cb_ball = DiscreteCallback(condition, affect!) - + prob = remake(sys.integ.sol.prob; u0=x_i, tspan=(0, tmax)) sim = solve(prob, sys.integ.alg; callback=cb_ball, kwargs...) success = sim.retcode == SciMLBase.ReturnCode.Terminated diff --git a/src/utils.jl b/src/utils.jl index e62dd15..502bc92 100644 --- a/src/utils.jl +++ b/src/utils.jl @@ -113,7 +113,7 @@ Normalizes the covariance matrix ``Q`` (in-place) by dividing it by function normalize_covariance!(covariance) l1norm = norm(covariance, 1) dim = size(covariance)[1] - return covariance * dim/l1norm + return covariance * dim / l1norm end # Central finite difference, second derivative diff --git a/test/largedeviations/action_fhn.jl b/test/largedeviations/action_fhn.jl index 7f0682e..65f9079 100644 --- a/test/largedeviations/action_fhn.jl +++ b/test/largedeviations/action_fhn.jl @@ -48,4 +48,4 @@ end @testset "div_drift" begin @test CT.div_drift(sys, zeros(2)) == -2.0 @test CT.div_drift(sys, x_i) == -4.0 -end \ No newline at end of file +end diff --git a/test/runtests.jl b/test/runtests.jl index a6b4e38..42e7572 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -64,7 +64,7 @@ end @testset "Trajectories" begin include("trajectories/simulate.jl") -# include("trajectories/transition.jl") + # include("trajectories/transition.jl") end @testset "Extentions" begin diff --git a/test/trajectories/simulate.jl b/test/trajectories/simulate.jl index ac486ce..b5daa15 100644 --- a/test/trajectories/simulate.jl +++ b/test/trajectories/simulate.jl @@ -6,8 +6,8 @@ sys = CoupledSDEs(fitzhugh_nagumo, init, p; noise_strength=σ) traj = trajectory(sys, 10, init) relax = deterministic_orbit(sys, 10, init) - - @test traj[1][1,1] == 1.0 - @test isapprox(relax[1][end,1], 0.816; atol=1e-2) + + @test traj[1][1, 1] == 1.0 + @test isapprox(relax[1][end, 1], 0.816; atol=1e-2) # These tests could be improved - Reyk end