Skip to content

Commit 37170c5

Browse files
committed
Merge remote-tracking branch 'origin' into ss_discrete
merge master
2 parents 5491098 + a2db412 commit 37170c5

File tree

5 files changed

+46
-4
lines changed

5 files changed

+46
-4
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -146,8 +146,8 @@ StaticArrays = "0.10, 0.11, 0.12, 1.0"
146146
StochasticDiffEq = "6.72.1"
147147
StochasticDelayDiffEq = "1.8.1"
148148
SymbolicIndexingInterface = "0.3.37"
149-
SymbolicUtils = "3.10.1"
150-
Symbolics = "6.27"
149+
SymbolicUtils = "3.14"
150+
Symbolics = "6.29"
151151
URIs = "1"
152152
UnPack = "0.1, 1.0"
153153
Unitful = "1.1"

docs/pages.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,8 @@ pages = [
4141
"systems/JumpSystem.md",
4242
"systems/NonlinearSystem.md",
4343
"systems/OptimizationSystem.md",
44-
"systems/PDESystem.md"],
44+
"systems/PDESystem.md",
45+
"systems/DiscreteSystem.md"],
4546
"comparison.md",
4647
"internals.md"
4748
]

docs/src/systems/DiscreteSystem.md

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
# DiscreteSystem
2+
3+
## System Constructors
4+
5+
```@docs
6+
DiscreteSystem
7+
```
8+
9+
## Composition and Accessor Functions
10+
11+
- `get_eqs(sys)` or `equations(sys)`: The equations that define the discrete system.
12+
- `get_unknowns(sys)` or `unknowns(sys)`: The set of unknowns in the discrete system.
13+
- `get_ps(sys)` or `parameters(sys)`: The parameters of the discrete system.
14+
- `get_iv(sys)`: The independent variable of the discrete system
15+
- `discrete_events(sys)`: The set of discrete events in the discrete system.
16+
17+
## Transformations
18+
19+
```@docs; canonical=false
20+
structural_simplify
21+
```
22+
23+
## Problem Constructors
24+
25+
```@docs; canonical=false
26+
DiscreteProblem(sys::DiscreteSystem, u0map, tspan)
27+
DiscreteFunction(sys::DiscreteSystem, args...)
28+
```

src/systems/codegen_utils.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ function build_function_wrapper(sys::AbstractSystem, expr, args...; p_start = 2,
121121
p_end = is_time_dependent(sys) ? length(args) - 1 : length(args),
122122
wrap_delays = is_dde(sys), wrap_code = identity,
123123
add_observed = true, filter_observed = Returns(true),
124-
create_bindings = true, output_type = nothing, mkarray = nothing,
124+
create_bindings = false, output_type = nothing, mkarray = nothing,
125125
wrap_mtkparameters = true, extra_assignments = Assignment[], kwargs...)
126126
isscalar = !(expr isa AbstractArray || symbolic_type(expr) == ArraySymbolic())
127127
# filter observed equations

src/systems/discrete_system/discrete_system.jl

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -323,6 +323,19 @@ end
323323
function SciMLBase.DiscreteFunction{false}(sys::DiscreteSystem, args...; kwargs...)
324324
DiscreteFunction{false, SciMLBase.FullSpecialize}(sys, args...; kwargs...)
325325
end
326+
327+
"""
328+
```julia
329+
SciMLBase.DiscreteFunction{iip}(sys::DiscreteSystem,
330+
dvs = unknowns(sys),
331+
ps = parameters(sys);
332+
kwargs...) where {iip}
333+
```
334+
335+
Create an `DiscreteFunction` from the [`DiscreteSystem`](@ref). The arguments `dvs` and `ps`
336+
are used to set the order of the dependent variable and parameter vectors,
337+
respectively.
338+
"""
326339
function SciMLBase.DiscreteFunction{iip, specialize}(
327340
sys::DiscreteSystem,
328341
dvs = unknowns(sys),

0 commit comments

Comments
 (0)