Skip to content

Commit 9a4a7cf

Browse files
Merge pull request #1065 from SciML/testfix
Fix a few tests for depwarns
2 parents 839e52f + f5a4994 commit 9a4a7cf

File tree

2 files changed

+49
-49
lines changed

2 files changed

+49
-49
lines changed

src/DiffEqBase.jl

Lines changed: 48 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -49,56 +49,56 @@ using SciMLBase
4949
using SciMLOperators: AbstractSciMLOperator, AbstractSciMLScalarOperator
5050

5151
using SciMLBase: @def, DEIntegrator, AbstractDEProblem,
52-
AbstractDiffEqInterpolation,
53-
DECallback, AbstractDEOptions, DECache, AbstractContinuousCallback,
54-
AbstractDiscreteCallback, AbstractLinearProblem,
55-
AbstractNonlinearProblem,
56-
AbstractOptimizationProblem, AbstractSteadyStateProblem,
57-
AbstractJumpProblem,
58-
AbstractNoiseProblem, AbstractEnsembleProblem,
59-
AbstractDynamicalODEProblem,
60-
AbstractDEAlgorithm, StandardODEProblem, AbstractIntegralProblem,
61-
AbstractSensitivityAlgorithm, AbstractODEAlgorithm,
62-
AbstractSDEAlgorithm, AbstractDDEAlgorithm, AbstractDAEAlgorithm,
63-
AbstractSDDEAlgorithm, AbstractRODEAlgorithm,
64-
DAEInitializationAlgorithm,
65-
AbstractSteadyStateAlgorithm, AbstractODEProblem,
66-
AbstractDiscreteProblem,
67-
AbstractSDEProblem, AbstractRODEProblem, AbstractDDEProblem,
68-
AbstractDAEProblem, AbstractSDDEProblem, AbstractBVProblem,
69-
AbstractTimeseriesSolution, AbstractNoTimeSolution, numargs,
70-
AbstractODEFunction, AbstractSDEFunction, AbstractRODEFunction,
71-
AbstractDDEFunction, AbstractSDDEFunction, AbstractDAEFunction,
72-
AbstractNonlinearFunction, AbstractEnsembleSolution,
73-
AbstractODESolution, AbstractRODESolution, AbstractDAESolution,
74-
AbstractDDESolution,
75-
EnsembleAlgorithm, EnsembleSolution, EnsembleSummary,
76-
NonlinearSolution,
77-
TimeGradientWrapper, TimeDerivativeWrapper, UDerivativeWrapper,
78-
UJacobianWrapper, ParamJacobianWrapper, JacobianWrapper,
79-
check_error!, has_jac, has_tgrad, has_Wfact, has_Wfact_t, has_paramjac,
80-
AbstractODEIntegrator, AbstractSDEIntegrator, AbstractRODEIntegrator,
81-
AbstractDDEIntegrator, AbstractSDDEIntegrator,
82-
AbstractDAEIntegrator, unwrap_cache, has_reinit, reinit!,
83-
postamble!, last_step_failed, islinear, has_stats,
84-
initialize_dae!, build_solution, solution_new_retcode,
85-
solution_new_tslocation, plot_indices,
86-
NullParameters, isinplace, AbstractADType, AbstractDiscretization,
87-
DISCRETE_OUTOFPLACE_DEFAULT, DISCRETE_INPLACE_DEFAULT,
88-
has_analytic, calculate_solution_errors!, AbstractNoiseProcess,
89-
has_colorvec, parameterless_type, undefined_exports,
90-
is_diagonal_noise, AbstractDiffEqFunction, sensitivity_solution,
91-
interp_summary, AbstractHistoryFunction, LinearInterpolation,
92-
ConstantInterpolation, HermiteInterpolation, SensitivityInterpolation,
93-
NoAD, @add_kwonly,
94-
calculate_ensemble_errors, DEFAULT_UPDATE_FUNC, isconstant,
95-
DEFAULT_REDUCTION, isautodifferentiable,
96-
isadaptive, isdiscrete, has_syms, AbstractAnalyticalSolution,
97-
RECOMPILE_BY_DEFAULT, wrap_sol, has_destats
52+
AbstractDiffEqInterpolation,
53+
DECallback, AbstractDEOptions, DECache, AbstractContinuousCallback,
54+
AbstractDiscreteCallback, AbstractLinearProblem,
55+
AbstractNonlinearProblem,
56+
AbstractOptimizationProblem, AbstractSteadyStateProblem,
57+
AbstractJumpProblem,
58+
AbstractNoiseProblem, AbstractEnsembleProblem,
59+
AbstractDynamicalODEProblem,
60+
AbstractDEAlgorithm, StandardODEProblem, AbstractIntegralProblem,
61+
AbstractSensitivityAlgorithm, AbstractODEAlgorithm,
62+
AbstractSDEAlgorithm, AbstractDDEAlgorithm, AbstractDAEAlgorithm,
63+
AbstractSDDEAlgorithm, AbstractRODEAlgorithm,
64+
DAEInitializationAlgorithm,
65+
AbstractSteadyStateAlgorithm, AbstractODEProblem,
66+
AbstractDiscreteProblem,
67+
AbstractSDEProblem, AbstractRODEProblem, AbstractDDEProblem,
68+
AbstractDAEProblem, AbstractSDDEProblem, AbstractBVProblem,
69+
AbstractTimeseriesSolution, AbstractNoTimeSolution, numargs,
70+
AbstractODEFunction, AbstractSDEFunction, AbstractRODEFunction,
71+
AbstractDDEFunction, AbstractSDDEFunction, AbstractDAEFunction,
72+
AbstractNonlinearFunction, AbstractEnsembleSolution,
73+
AbstractODESolution, AbstractRODESolution, AbstractDAESolution,
74+
AbstractDDESolution,
75+
EnsembleAlgorithm, EnsembleSolution, EnsembleSummary,
76+
NonlinearSolution,
77+
TimeGradientWrapper, TimeDerivativeWrapper, UDerivativeWrapper,
78+
UJacobianWrapper, ParamJacobianWrapper, JacobianWrapper,
79+
check_error!, has_jac, has_tgrad, has_Wfact, has_Wfact_t, has_paramjac,
80+
AbstractODEIntegrator, AbstractSDEIntegrator, AbstractRODEIntegrator,
81+
AbstractDDEIntegrator, AbstractSDDEIntegrator,
82+
AbstractDAEIntegrator, unwrap_cache, has_reinit, reinit!,
83+
postamble!, last_step_failed, islinear, has_stats,
84+
initialize_dae!, build_solution, solution_new_retcode,
85+
solution_new_tslocation, plot_indices,
86+
NullParameters, isinplace, AbstractADType, AbstractDiscretization,
87+
DISCRETE_OUTOFPLACE_DEFAULT, DISCRETE_INPLACE_DEFAULT,
88+
has_analytic, calculate_solution_errors!, AbstractNoiseProcess,
89+
has_colorvec, parameterless_type, undefined_exports,
90+
is_diagonal_noise, AbstractDiffEqFunction, sensitivity_solution,
91+
interp_summary, AbstractHistoryFunction, LinearInterpolation,
92+
ConstantInterpolation, HermiteInterpolation, SensitivityInterpolation,
93+
NoAD, @add_kwonly,
94+
calculate_ensemble_errors, DEFAULT_UPDATE_FUNC, isconstant,
95+
DEFAULT_REDUCTION, isautodifferentiable,
96+
isadaptive, isdiscrete, has_syms, AbstractAnalyticalSolution,
97+
RECOMPILE_BY_DEFAULT, wrap_sol, has_destats
9898

9999
import SciMLBase: solve, init, step!, solve!, __init, __solve, update_coefficients!,
100-
update_coefficients, isadaptive, wrapfun_oop, wrapfun_iip,
101-
unwrap_fw, promote_tspan, set_u!, set_t!, set_ut!
100+
update_coefficients, isadaptive, wrapfun_oop, wrapfun_iip,
101+
unwrap_fw, promote_tspan, set_u!, set_t!, set_ut!
102102

103103
import SciMLBase: AbstractDiffEqLinearOperator # deprecation path
104104

test/termination_conditions.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ u = rand(4)
55
uprev = rand(4)
66

77
const TERMINATION_CONDITIONS = [
8-
SteadyStateDiffEqTerminationMode(), SimpleNonlinearSolveTerminationMode(),
8+
SimpleNonlinearSolveTerminationMode(),
99
RelTerminationMode(), NormTerminationMode(), RelNormTerminationMode(),
1010
AbsTerminationMode(), AbsNormTerminationMode(), RelSafeTerminationMode(),
1111
AbsSafeTerminationMode(), RelSafeBestTerminationMode(), AbsSafeBestTerminationMode()

0 commit comments

Comments
 (0)