Skip to content

Commit

Permalink
Merge pull request #1065 from SciML/testfix
Browse files Browse the repository at this point in the history
Fix a few tests for depwarns
  • Loading branch information
ChrisRackauckas authored Jul 20, 2024
2 parents 839e52f + f5a4994 commit 9a4a7cf
Show file tree
Hide file tree
Showing 2 changed files with 49 additions and 49 deletions.
96 changes: 48 additions & 48 deletions src/DiffEqBase.jl
Original file line number Diff line number Diff line change
Expand Up @@ -49,56 +49,56 @@ using SciMLBase
using SciMLOperators: AbstractSciMLOperator, AbstractSciMLScalarOperator

using SciMLBase: @def, DEIntegrator, AbstractDEProblem,
AbstractDiffEqInterpolation,
DECallback, AbstractDEOptions, DECache, AbstractContinuousCallback,
AbstractDiscreteCallback, AbstractLinearProblem,
AbstractNonlinearProblem,
AbstractOptimizationProblem, AbstractSteadyStateProblem,
AbstractJumpProblem,
AbstractNoiseProblem, AbstractEnsembleProblem,
AbstractDynamicalODEProblem,
AbstractDEAlgorithm, StandardODEProblem, AbstractIntegralProblem,
AbstractSensitivityAlgorithm, AbstractODEAlgorithm,
AbstractSDEAlgorithm, AbstractDDEAlgorithm, AbstractDAEAlgorithm,
AbstractSDDEAlgorithm, AbstractRODEAlgorithm,
DAEInitializationAlgorithm,
AbstractSteadyStateAlgorithm, AbstractODEProblem,
AbstractDiscreteProblem,
AbstractSDEProblem, AbstractRODEProblem, AbstractDDEProblem,
AbstractDAEProblem, AbstractSDDEProblem, AbstractBVProblem,
AbstractTimeseriesSolution, AbstractNoTimeSolution, numargs,
AbstractODEFunction, AbstractSDEFunction, AbstractRODEFunction,
AbstractDDEFunction, AbstractSDDEFunction, AbstractDAEFunction,
AbstractNonlinearFunction, AbstractEnsembleSolution,
AbstractODESolution, AbstractRODESolution, AbstractDAESolution,
AbstractDDESolution,
EnsembleAlgorithm, EnsembleSolution, EnsembleSummary,
NonlinearSolution,
TimeGradientWrapper, TimeDerivativeWrapper, UDerivativeWrapper,
UJacobianWrapper, ParamJacobianWrapper, JacobianWrapper,
check_error!, has_jac, has_tgrad, has_Wfact, has_Wfact_t, has_paramjac,
AbstractODEIntegrator, AbstractSDEIntegrator, AbstractRODEIntegrator,
AbstractDDEIntegrator, AbstractSDDEIntegrator,
AbstractDAEIntegrator, unwrap_cache, has_reinit, reinit!,
postamble!, last_step_failed, islinear, has_stats,
initialize_dae!, build_solution, solution_new_retcode,
solution_new_tslocation, plot_indices,
NullParameters, isinplace, AbstractADType, AbstractDiscretization,
DISCRETE_OUTOFPLACE_DEFAULT, DISCRETE_INPLACE_DEFAULT,
has_analytic, calculate_solution_errors!, AbstractNoiseProcess,
has_colorvec, parameterless_type, undefined_exports,
is_diagonal_noise, AbstractDiffEqFunction, sensitivity_solution,
interp_summary, AbstractHistoryFunction, LinearInterpolation,
ConstantInterpolation, HermiteInterpolation, SensitivityInterpolation,
NoAD, @add_kwonly,
calculate_ensemble_errors, DEFAULT_UPDATE_FUNC, isconstant,
DEFAULT_REDUCTION, isautodifferentiable,
isadaptive, isdiscrete, has_syms, AbstractAnalyticalSolution,
RECOMPILE_BY_DEFAULT, wrap_sol, has_destats
AbstractDiffEqInterpolation,
DECallback, AbstractDEOptions, DECache, AbstractContinuousCallback,
AbstractDiscreteCallback, AbstractLinearProblem,
AbstractNonlinearProblem,
AbstractOptimizationProblem, AbstractSteadyStateProblem,
AbstractJumpProblem,
AbstractNoiseProblem, AbstractEnsembleProblem,
AbstractDynamicalODEProblem,
AbstractDEAlgorithm, StandardODEProblem, AbstractIntegralProblem,
AbstractSensitivityAlgorithm, AbstractODEAlgorithm,
AbstractSDEAlgorithm, AbstractDDEAlgorithm, AbstractDAEAlgorithm,
AbstractSDDEAlgorithm, AbstractRODEAlgorithm,
DAEInitializationAlgorithm,
AbstractSteadyStateAlgorithm, AbstractODEProblem,
AbstractDiscreteProblem,
AbstractSDEProblem, AbstractRODEProblem, AbstractDDEProblem,
AbstractDAEProblem, AbstractSDDEProblem, AbstractBVProblem,
AbstractTimeseriesSolution, AbstractNoTimeSolution, numargs,
AbstractODEFunction, AbstractSDEFunction, AbstractRODEFunction,
AbstractDDEFunction, AbstractSDDEFunction, AbstractDAEFunction,
AbstractNonlinearFunction, AbstractEnsembleSolution,
AbstractODESolution, AbstractRODESolution, AbstractDAESolution,
AbstractDDESolution,
EnsembleAlgorithm, EnsembleSolution, EnsembleSummary,
NonlinearSolution,
TimeGradientWrapper, TimeDerivativeWrapper, UDerivativeWrapper,
UJacobianWrapper, ParamJacobianWrapper, JacobianWrapper,
check_error!, has_jac, has_tgrad, has_Wfact, has_Wfact_t, has_paramjac,
AbstractODEIntegrator, AbstractSDEIntegrator, AbstractRODEIntegrator,
AbstractDDEIntegrator, AbstractSDDEIntegrator,
AbstractDAEIntegrator, unwrap_cache, has_reinit, reinit!,
postamble!, last_step_failed, islinear, has_stats,
initialize_dae!, build_solution, solution_new_retcode,
solution_new_tslocation, plot_indices,
NullParameters, isinplace, AbstractADType, AbstractDiscretization,
DISCRETE_OUTOFPLACE_DEFAULT, DISCRETE_INPLACE_DEFAULT,
has_analytic, calculate_solution_errors!, AbstractNoiseProcess,
has_colorvec, parameterless_type, undefined_exports,
is_diagonal_noise, AbstractDiffEqFunction, sensitivity_solution,
interp_summary, AbstractHistoryFunction, LinearInterpolation,
ConstantInterpolation, HermiteInterpolation, SensitivityInterpolation,
NoAD, @add_kwonly,
calculate_ensemble_errors, DEFAULT_UPDATE_FUNC, isconstant,
DEFAULT_REDUCTION, isautodifferentiable,
isadaptive, isdiscrete, has_syms, AbstractAnalyticalSolution,
RECOMPILE_BY_DEFAULT, wrap_sol, has_destats

import SciMLBase: solve, init, step!, solve!, __init, __solve, update_coefficients!,
update_coefficients, isadaptive, wrapfun_oop, wrapfun_iip,
unwrap_fw, promote_tspan, set_u!, set_t!, set_ut!
update_coefficients, isadaptive, wrapfun_oop, wrapfun_iip,
unwrap_fw, promote_tspan, set_u!, set_t!, set_ut!

import SciMLBase: AbstractDiffEqLinearOperator # deprecation path

Expand Down
2 changes: 1 addition & 1 deletion test/termination_conditions.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ u = rand(4)
uprev = rand(4)

const TERMINATION_CONDITIONS = [
SteadyStateDiffEqTerminationMode(), SimpleNonlinearSolveTerminationMode(),
SimpleNonlinearSolveTerminationMode(),
RelTerminationMode(), NormTerminationMode(), RelNormTerminationMode(),
AbsTerminationMode(), AbsNormTerminationMode(), RelSafeTerminationMode(),
AbsSafeTerminationMode(), RelSafeBestTerminationMode(), AbsSafeBestTerminationMode()
Expand Down

0 comments on commit 9a4a7cf

Please sign in to comment.