Skip to content

Commit 0232a0a

Browse files
committed
merge ss_discrete
2 parents f4a9d13 + 09f31b2 commit 0232a0a

File tree

12 files changed

+461
-285
lines changed

12 files changed

+461
-285
lines changed

src/ModelingToolkit.jl

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ abstract type AbstractTimeIndependentSystem <: AbstractSystem end
123123
abstract type AbstractODESystem <: AbstractTimeDependentSystem end
124124
abstract type AbstractMultivariateSystem <: AbstractSystem end
125125
abstract type AbstractOptimizationSystem <: AbstractTimeIndependentSystem end
126-
abstract type AbstractDiscreteSystem <: AbstractTimeDependentSystem end
127126

128127
function independent_variable end
129128

@@ -166,7 +165,6 @@ include("systems/diffeqs/modelingtoolkitize.jl")
166165
include("systems/diffeqs/basic_transformations.jl")
167166

168167
include("systems/discrete_system/discrete_system.jl")
169-
include("systems/discrete_system/implicit_discrete_system.jl")
170168

171169
include("systems/jumps/jumpsystem.jl")
172170

@@ -232,7 +230,6 @@ export DAEFunctionExpr, DAEProblemExpr
232230
export SDESystem, SDEFunction, SDEFunctionExpr, SDEProblemExpr
233231
export SystemStructure
234232
export DiscreteSystem, DiscreteProblem, DiscreteFunction, DiscreteFunctionExpr
235-
export ImplicitDiscreteSystem, ImplicitDiscreteProblem, ImplicitDiscreteFunction, ImplicitDiscreteFunctionExpr
236233
export JumpSystem
237234
export ODEProblem, SDEProblem
238235
export NonlinearFunction, NonlinearFunctionExpr

src/structural_transformation/StructuralTransformations.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ using ModelingToolkit: ODESystem, AbstractSystem, var_from_nested_derivative, Di
2222
get_postprocess_fbody, vars!,
2323
IncrementalCycleTracker, add_edge_checked!, topological_sort,
2424
invalidate_cache!, Substitutions, get_or_construct_tearing_state,
25-
filter_kwargs, lower_varname_with_unit, setio, SparseMatrixCLIL,
25+
filter_kwargs, lower_varname_with_unit, lower_shift_varname_with_unit, setio, SparseMatrixCLIL,
2626
get_fullvars, has_equations, observed,
2727
Schedule, schedule
2828

@@ -63,6 +63,7 @@ export torn_system_jacobian_sparsity
6363
export full_equations
6464
export but_ordered_incidence, lowest_order_variable_mask, highest_order_variable_mask
6565
export computed_highest_diff_variables
66+
export shift2term, lower_shift_varname
6667

6768
include("utils.jl")
6869
include("pantelides.jl")

0 commit comments

Comments
 (0)