From 0f3116bc538b05c25f96a9e61b5b3f63eae203bf Mon Sep 17 00:00:00 2001 From: Christopher Rackauckas Date: Sat, 31 Aug 2024 15:33:16 -0400 Subject: [PATCH] format --- src/integrators/type.jl | 7 ++- src/solve.jl | 128 ++++++++++++++++++++-------------------- 2 files changed, 68 insertions(+), 67 deletions(-) diff --git a/src/integrators/type.jl b/src/integrators/type.jl index 42ff7fa..f087d9c 100644 --- a/src/integrators/type.jl +++ b/src/integrators/type.jl @@ -97,7 +97,7 @@ end fsalfirst::FSALType fsallast::FSALType end - + else mutable struct DDEIntegrator{algType, IIP, uType, tType, P, eigenType, tTypeNoUnits, tdirType, @@ -105,7 +105,7 @@ else dRelType, H, tstopsType, discType, FSALType, EventErrorType, CallbackCacheType, DV} <: - AbstractDDEIntegrator{algType, IIP, uType, tType} + AbstractDDEIntegrator{algType, IIP, uType, tType} sol::SolType u::uType k::ksEltype @@ -209,7 +209,8 @@ else history, differential_vars, integrator) where - {algType, IIP, uType, tType, P, eigenType, tTypeNoUnits, tdirType, ksEltype, + { + algType, IIP, uType, tType, P, eigenType, tTypeNoUnits, tdirType, ksEltype, SolType, F, CacheType, IType, FP, O, dAbsType, dRelType, H, tstopsType, discType, FSALType, EventErrorType, CallbackCacheType, DV} diff --git a/src/solve.jl b/src/solve.jl index dd47169..8da0744 100644 --- a/src/solve.jl +++ b/src/solve.jl @@ -397,71 +397,71 @@ function DiffEqBase.__init(prob::DiffEqBase.AbstractDDEProblem, dtacc = tType(1) if isdefined(OrdinaryDiffEq, :get_fsalfirstlast) - fsalfirst, fsallast = OrdinaryDiffEq.get_fsalfirstlast(cache,rate_prototype) + fsalfirst, fsallast = OrdinaryDiffEq.get_fsalfirstlast(cache, rate_prototype) integrator = DDEIntegrator{typeof(alg.alg), isinplace(prob), typeof(u0), tType, - typeof(p), - typeof(eigen_est), QT, typeof(tdir), typeof(k), typeof(sol), - typeof(f_with_history), typeof(cache), - typeof(ode_integrator), typeof(fpsolver), - typeof(opts), typeof(discontinuity_abstol), - typeof(discontinuity_reltol), typeof(history), - typeof(tstops_propagated), - typeof(d_discontinuities_propagated), - typeof(fsalfirst), - typeof(last_event_error), typeof(callback_cache), - typeof(differential_vars)}(sol, u, k, - t0, - tType(dt), - f_with_history, - p, - uprev, - uprev2, - tprev, - prev_idx, - prev2_idx, - fpsolver, - order_discontinuity_t0, - tracked_discontinuities, - discontinuity_interp_points, - discontinuity_abstol, - discontinuity_reltol, - tstops_propagated, - d_discontinuities_propagated, - alg.alg, - dtcache, - dtchangeable, - dtpropose, - tdir, - eigen_est, - EEst, - QT(qoldinit), - q11, - erracc, - dtacc, - success_iter, - iter, - length(ts), - length(ts), - cache, - callback_cache, - kshortsize, - force_stepfail, - last_stepfail, - just_hit_tstop, - do_error_check, - event_last_time, - vector_event_last_time, - last_event_error, - accept_step, - isout, - reeval_fsal, - u_modified, - isdae, - opts, - stats, - history, - differential_vars, - ode_integrator, fsalfirst, fsallast) + typeof(p), + typeof(eigen_est), QT, typeof(tdir), typeof(k), typeof(sol), + typeof(f_with_history), typeof(cache), + typeof(ode_integrator), typeof(fpsolver), + typeof(opts), typeof(discontinuity_abstol), + typeof(discontinuity_reltol), typeof(history), + typeof(tstops_propagated), + typeof(d_discontinuities_propagated), + typeof(fsalfirst), + typeof(last_event_error), typeof(callback_cache), + typeof(differential_vars)}(sol, u, k, + t0, + tType(dt), + f_with_history, + p, + uprev, + uprev2, + tprev, + prev_idx, + prev2_idx, + fpsolver, + order_discontinuity_t0, + tracked_discontinuities, + discontinuity_interp_points, + discontinuity_abstol, + discontinuity_reltol, + tstops_propagated, + d_discontinuities_propagated, + alg.alg, + dtcache, + dtchangeable, + dtpropose, + tdir, + eigen_est, + EEst, + QT(qoldinit), + q11, + erracc, + dtacc, + success_iter, + iter, + length(ts), + length(ts), + cache, + callback_cache, + kshortsize, + force_stepfail, + last_stepfail, + just_hit_tstop, + do_error_check, + event_last_time, + vector_event_last_time, + last_event_error, + accept_step, + isout, + reeval_fsal, + u_modified, + isdae, + opts, + stats, + history, + differential_vars, + ode_integrator, fsalfirst, fsallast) else integrator = DDEIntegrator{typeof(alg.alg), isinplace(prob), typeof(u0), tType, typeof(p),