Skip to content

Commit e2eb777

Browse files
refactor: remove deprecated items
1 parent a8ed1c8 commit e2eb777

File tree

5 files changed

+12
-73
lines changed

5 files changed

+12
-73
lines changed

src/ModelingToolkit.jl

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -128,10 +128,6 @@ $(TYPEDEF)
128128
TODO
129129
"""
130130
abstract type AbstractSystem end
131-
abstract type AbstractTimeDependentSystem <: AbstractSystem end
132-
abstract type AbstractTimeIndependentSystem <: AbstractSystem end
133-
abstract type AbstractMultivariateSystem <: AbstractSystem end
134-
abstract type AbstractOptimizationSystem <: AbstractTimeIndependentSystem end
135131

136132
function independent_variable end
137133

@@ -150,7 +146,6 @@ include("independent_variables.jl")
150146
include("constants.jl")
151147

152148
include("utils.jl")
153-
include("domains.jl")
154149

155150
include("systems/index_cache.jl")
156151
include("systems/parameter_buffer.jl")
@@ -265,25 +260,19 @@ PrecompileTools.@compile_workload begin
265260
end
266261
end
267262

268-
export AbstractTimeDependentSystem,
269-
AbstractTimeIndependentSystem,
270-
AbstractMultivariateSystem
271-
272-
export ODEFunction, ODEFunctionExpr, ODEProblemExpr, convert_system_indepvar,
263+
export ODEFunction, convert_system_indepvar,
273264
System, OptimizationSystem, JumpSystem, SDESystem, NonlinearSystem
274-
export DAEFunctionExpr, DAEProblemExpr
275-
export SDEFunction, SDEFunctionExpr, SDEProblemExpr
265+
export SDEFunction
276266
export SystemStructure
277-
export DiscreteProblem, DiscreteFunction, DiscreteFunctionExpr
278-
export ImplicitDiscreteProblem, ImplicitDiscreteFunction,
279-
ImplicitDiscreteFunctionExpr
267+
export DiscreteProblem, DiscreteFunction
268+
export ImplicitDiscreteProblem, ImplicitDiscreteFunction
280269
export ODEProblem, SDEProblem
281-
export NonlinearFunction, NonlinearFunctionExpr
282-
export NonlinearProblem, NonlinearProblemExpr
283-
export IntervalNonlinearFunction, IntervalNonlinearFunctionExpr
284-
export IntervalNonlinearProblem, IntervalNonlinearProblemExpr
285-
export OptimizationProblem, OptimizationProblemExpr, constraints
286-
export SteadyStateProblem, SteadyStateProblemExpr
270+
export NonlinearFunction
271+
export NonlinearProblem
272+
export IntervalNonlinearFunction
273+
export IntervalNonlinearProblem
274+
export OptimizationProblem, constraints
275+
export SteadyStateProblem
287276
export JumpProblem
288277
export alias_elimination, flatten
289278
export connect, domain_connect, @connector, Connection, AnalysisPoint, Flow, Stream,
@@ -315,7 +304,7 @@ export calculate_jacobian, generate_jacobian, generate_rhs, generate_custom_func
315304
export calculate_control_jacobian, generate_control_jacobian
316305
export calculate_tgrad, generate_tgrad
317306
export generate_cost, calculate_cost_gradient, generate_cost_gradient
318-
export calculate_factorized_W, generate_factorized_W
307+
export calculate_factorized_W
319308
export calculate_cost_hessian, generate_cost_hessian
320309
export calculate_massmatrix, generate_diffusion_function
321310
export stochastic_integral_transform

src/domains.jl

Lines changed: 0 additions & 17 deletions
This file was deleted.

src/systems/abstractsystem.jl

Lines changed: 0 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -207,24 +207,6 @@ Substitutions(subs, deps) = Substitutions(subs, deps, nothing)
207207
Base.nameof(sys::AbstractSystem) = getfield(sys, :name)
208208
description(sys::AbstractSystem) = has_description(sys) ? get_description(sys) : ""
209209

210-
#Deprecated
211-
function independent_variable(sys::AbstractSystem)
212-
Base.depwarn(
213-
"`independent_variable` is deprecated. Use `get_iv` or `independent_variables` instead.",
214-
:independent_variable)
215-
isdefined(sys, :iv) ? getfield(sys, :iv) : nothing
216-
end
217-
218-
function independent_variables(sys::AbstractTimeDependentSystem)
219-
return [getfield(sys, :iv)]
220-
end
221-
222-
independent_variables(::AbstractTimeIndependentSystem) = []
223-
224-
function independent_variables(sys::AbstractMultivariateSystem)
225-
return getfield(sys, :ivs)
226-
end
227-
228210
"""
229211
$(TYPEDSIGNATURES)
230212
@@ -233,9 +215,6 @@ Get the independent variable(s) of the system `sys`.
233215
See also [`@independent_variables`](@ref) and [`ModelingToolkit.get_iv`](@ref).
234216
"""
235217
function independent_variables(sys::AbstractSystem)
236-
if !(sys isa System)
237-
@warn "Please declare ($(typeof(sys))) as a subtype of `AbstractTimeDependentSystem`, `AbstractTimeIndependentSystem` or `AbstractMultivariateSystem`."
238-
end
239218
if isdefined(sys, :iv) && getfield(sys, :iv) !== nothing
240219
return [getfield(sys, :iv)]
241220
elseif isdefined(sys, :ivs)
@@ -309,8 +288,6 @@ function SymbolicIndexingInterface.variable_index(sys::AbstractSystem, sym::Symb
309288
return nothing
310289
end
311290

312-
SymbolicIndexingInterface.variable_symbols(sys::AbstractMultivariateSystem) = sys.dvs
313-
314291
function SymbolicIndexingInterface.variable_symbols(sys::AbstractSystem)
315292
return solved_unknowns(sys)
316293
end
@@ -561,9 +538,6 @@ function SymbolicIndexingInterface.default_values(sys::AbstractSystem)
561538
)
562539
end
563540

564-
SymbolicIndexingInterface.is_time_dependent(::AbstractTimeDependentSystem) = true
565-
SymbolicIndexingInterface.is_time_dependent(::AbstractTimeIndependentSystem) = false
566-
567541
SymbolicIndexingInterface.is_markovian(sys::AbstractSystem) = !is_dde(sys)
568542

569543
SymbolicIndexingInterface.constant_structure(::AbstractSystem) = true
@@ -1645,9 +1619,6 @@ function observables(sys::AbstractSystem)
16451619
return map(eq -> eq.lhs, observed(sys))
16461620
end
16471621

1648-
Base.@deprecate default_u0(x) defaults(x) false
1649-
Base.@deprecate default_p(x) defaults(x) false
1650-
16511622
"""
16521623
$(TYPEDSIGNATURES)
16531624

src/systems/pde/pdesystem.jl

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ domains = [t ∈ (0.0,1.0),
3434
@named pde_system = PDESystem(eq,bcs,domains,[t,x],[u])
3535
```
3636
"""
37-
struct PDESystem <: ModelingToolkit.AbstractMultivariateSystem
37+
struct PDESystem <: AbstractSystem
3838
"The equations which define the PDE."
3939
eqs::Any
4040
"The boundary conditions."
@@ -166,5 +166,3 @@ function Base.show(io::IO, ::MIME"text/plain", sys::PDESystem)
166166
print(io, "Default Parameter Values", get_defaults(sys))
167167
return nothing
168168
end
169-
170-
SymbolicIndexingInterface.is_time_dependent(::AbstractMultivariateSystem) = true

src/utils.jl

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -60,8 +60,6 @@ macro showarr(x)
6060
end
6161
end
6262

63-
@deprecate substitute_expr!(expr, s) substitute(expr, s)
64-
6563
function todict(d)
6664
eltype(d) <: Pair || throw(ArgumentError("The variable-value mapping must be a Dict."))
6765
d isa Dict ? d : Dict(d)

0 commit comments

Comments
 (0)