Skip to content

Commit 4e598cc

Browse files
committed
Merge branch 'master' of https://github.com/SciML/Catalyst.jl
update
2 parents 2f793b1 + a4c75fc commit 4e598cc

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+1165
-478
lines changed

HISTORY.md

Lines changed: 91 additions & 61 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,90 @@
33
## Catalyst unreleased (master branch)
44

55
## Catalyst 14.0
6-
- The `reactionparams`, `numreactionparams`, and `reactionparamsmap` functions have been removed.
6+
7+
#### Breaking changes
8+
Catalyst v14 was prompted by the (breaking) release of ModelingToolkit v9, which introduced several breaking changes to Catalyst. A summary of these (and how to handle them) can be found [here](https://docs.sciml.ai/Catalyst/stable/v14_migration_guide/). These are briefly summarised in the following bullet points:
9+
- `ReactionSystem`s must now be marked *complete* before they are exposed to most forms of simulation and analysis. With the exception of `ReactionSystem`s created through the `@reaction_network` macro, all `ReactionSystem`s are *not* marked complete upon construction. The `complete` function can be used to mark `ReactionSystem`s as complete. To construct a `ReactionSystem` that is not marked complete via the DSL the new `@network_component` macro can be used.
10+
- The `states` function has been replaced with `unknowns`. The `get_states` function has been replaced with `get_unknowns`.
11+
- Support for most units (with the exception of `s`, `m`, `kg`, `A`, `K`, `mol`, and `cd`) has currently been dropped by ModelingToolkit, and hence they are unavailable via Catalyst too. Its is expected that eventually support for relevant chemical units such as molar will return to ModelingToolkit (and should then immediately work in Catalyst too).
12+
- Problem parameter values are now accessed through `prob.ps[p]` (rather than `prob[p]`).
13+
- A significant bug prevents the safe application of the `remake` function on problems for which `remove_conserved = true` was used when updating the values of initial conditions. Instead, the values of each conserved constant must be directly specified.
14+
- The `reactionparams`, `numreactionparams`, and `reactionparamsmap` functions have been deprecated and removed.
715
- To be more consistent with ModelingToolkit's immutability requirement for systems, we have removed API functions that mutate `ReactionSystem`s such as `addparam!`, `addreaction!`, `addspecies`, `@add_reactions`, and `merge!`. Please use `ModelingToolkit.extend` and `ModelingToolkit.compose` to generate new merged and/or composed `ReactionSystem`s from multiple component systems.
16+
17+
#### General changes
18+
- The `default_t()` and `default_time_deriv()` functions are now the preferred approaches for creating the default time independent variable and its differential. i.e.
19+
```julia
20+
# do
21+
t = default_t()
22+
@species A(t)
23+
24+
# avoid
25+
@variables t
26+
@species A(t)
27+
- It is now possible to add metadata to individual reactions, e.g. using:
28+
```julia
29+
rn = @reaction_network begin
30+
@parameters η
31+
k, 2X --> X2, [description="Dimerisation"]
32+
end
33+
getdescription(rn)
34+
```
35+
a more detailed description can be found [here](https://docs.sciml.ai/Catalyst/dev/model_creation/dsl_advanced/#dsl_advanced_options_reaction_metadata).
36+
- `SDEProblem` no longer takes the `noise_scaling` argument. Noise scaling is now handled through the `noise_scaling` metadata (described in more detail [here](https://docs.sciml.ai/Catalyst/stable/model_simulation/simulation_introduction/#simulation_intro_SDEs_noise_saling))
37+
- Fields of the internal `Reaction` structure have been changed. `ReactionSystems`s saved using `serialize` on previous Catalyst versions cannot be loaded using this (or later) versions.
38+
- A new function, `save_reactionsystem`, which permits the writing of `ReactionSystem` models to files, has been created. A thorough description of this function can be found [here](https://docs.sciml.ai/Catalyst/stable/model_creation/model_file_loading_and_export/#Saving-Catalyst-models-to,-and-loading-them-from,-Julia-files)
39+
- Update how compounds are created. E.g. use
40+
```julia
41+
@variables t C(t) O(t)
42+
@compound CO2 ~ C + 2O
43+
```
44+
to create a compound species `CO2` that consists of `C` and 2 `O`.
45+
- Added documentation for chemistry-related functionality (compound creation and reaction balancing).
46+
- Added function `isautonomous` to check if a `ReactionSystem` is autonomous.
47+
- Added function `steady_state_stability` to compute stability for steady states. Example:
48+
```julia
49+
# Creates model.
50+
rn = @reaction_network begin
51+
(p,d), 0 <--> X
52+
end
53+
p = [:p => 1.0, :d => 0.5]
54+
55+
# Finds (the trivial) steady state, and computes stability.
56+
steady_state = [2.0]
57+
steady_state_stability(steady_state, rn, p)
58+
```
59+
Here, `steady_state_stability` takes an optional argument `tol = 10*sqrt(eps())`, which is used to check that the real part of all eigenvalues are at least `tol` away from zero. Eigenvalues within `tol` of zero indicate that stability may not be reliably calculated.
60+
- Added a DSL option, `@combinatoric_ratelaws`, which can be used to toggle whether to use combinatorial rate laws within the DSL (this feature was already supported for programmatic modelling). Example:
61+
```julia
62+
# Creates model.
63+
rn = @reaction_network begin
64+
@combinatoric_ratelaws false
65+
(kB,kD), 2X <--> X2
66+
end
67+
```
68+
- Added a DSL option, `@observables` for [creating observables](https://docs.sciml.ai/Catalyst/stable/model_creation/dsl_advanced/#dsl_advanced_options_observables) (this feature was already supported for programmatic modelling).
69+
- Added DSL options `@continuous_events` and `@discrete_events` to add events to a model as part of its creation (this feature was already supported for programmatic modelling). Example:
70+
```julia
71+
rn = @reaction_network begin
72+
@continuous_events begin
73+
[X ~ 1.0] => [X ~ X + 1.0]
74+
end
75+
d, X --> 0
76+
end
77+
```
78+
- Added DSL option `@equations` to add (algebraic or differential) equations to a model as part of its creation (this feature was already supported for programmatic modelling). Example:
79+
```julia
80+
rn = @reaction_network begin
81+
@equations begin
82+
D(V) ~ 1 - V
83+
end
84+
(p/V,d/V), 0 <--> X
85+
end
86+
```
87+
- Coupled reaction network + differential equation (or algebraic differential equation) systems can now be converted to `SDESystem`s and `NonlinearSystem`s.
88+
89+
#### Structural identifiability extension
890
- Added CatalystStructuralIdentifiabilityExtension, which permits StructuralIdentifiability.jl function to be applied directly to Catalyst systems. E.g. use
991
```julia
1092
using Catalyst, StructuralIdentifiability
@@ -17,47 +99,9 @@ assess_identifiability(goodwind_oscillator; measured_quantities=[:M])
1799
```
18100
to assess (global) structural identifiability for all parameters and variables of the `goodwind_oscillator` model (under the presumption that we can measure `M` only).
19101
- Automatically handles conservation laws for structural identifiability problems (eliminates these internally to speed up computations).
20-
- Adds a tutorial to illustrate the use of the extension.
21-
- Enable adding metadata to individual reactions, e.g:
22-
```julia
23-
rn = @reaction_network begin
24-
@parameters η
25-
k, 2X --> X2, [noise_scaling=η]
26-
end
27-
getnoisescaling(rn)
28-
```
29-
- `SDEProblem` no longer takes the `noise_scaling` argument (see above for new approach to handle noise scaling).
30-
- Changed fields of internal `Reaction` structure. `ReactionSystems`s saved using `serialize` on previous Catalyst versions cannot be loaded using this (or later) versions.
31-
- Simulation of spatial ODEs now supported. For full details, please see https://github.com/SciML/Catalyst.jl/pull/644 and upcoming documentation. Note that these methods are currently considered alpha, with the interface and approach changing even in non-breaking Catalyst releases.
32-
- LatticeReactionSystem structure represents a spatial reaction network:
33-
```julia
34-
rn = @reaction_network begin
35-
(p,d), 0 <--> X
36-
end
37-
tr = @transport_reaction D X
38-
lattice = Graphs.grid([5, 5])
39-
lrs = LatticeReactionSystem(rn, [tr], lattice)
40-
```
41-
- Here, if a `u0` or `p` vector is given with scalar values:
42-
```julia
43-
u0 = [:X => 1.0]
44-
p = [:p => 1.0, :d => 0.5, :D => 0.1]
45-
```
46-
this value will be used across the entire system. If their values are instead vectors, different values are used across the spatial system. Here
47-
```julia
48-
X0 = zeros(25)
49-
X0[1] = 1.0
50-
u0 = [:X => X0]
51-
```
52-
X's value will be `1.0` in the first vertex, but `0.0` in the remaining one (the system have 25 vertexes in total). SInce th parameters `p` and `d` are part of the non-spatial reaction network, their values are tied to vertexes. However, if the `D` parameter (which governs diffusion between vertexes) is given several values, these will instead correspond to the specific edges (and transportation along those edges.)
102+
- A more detailed of how this extension works can be found [here](https://docs.sciml.ai/Catalyst/stable/inverse_problems/structural_identifiability/).
53103

54-
- Update how compounds are created. E.g. use
55-
```julia
56-
@variables t C(t) O(t)
57-
@compound CO2 ~ C + 2O
58-
```
59-
to create a compound species `CO2` that consists of `C` and 2 `O`.
60-
- Added documentation for chemistry related functionality (compound creation and reaction balancing).
104+
#### Bifurcation analysis extension
61105
- Add a CatalystBifurcationKitExtension, permitting BifurcationKit's `BifurcationProblem`s to be created from Catalyst reaction networks. Example usage:
62106
```julia
63107
using Catalyst
@@ -74,32 +118,18 @@ bif_par = :k1
74118
u_guess = [:X => 5.0, :Y => 2.0]
75119
p_start = [:k1 => 4.0, :k2 => 1.0, :k3 => 1.0, :k4 => 1.5, :k5 => 1.25]
76120
plot_var = :X
77-
bprob = BifurcationProblem(wilhelm_2009_model, u_guess, p_start, bif_par; plot_var=plot_var)
121+
bprob = BifurcationProblem(wilhelm_2009_model, u_guess, p_start, bif_par; plot_var = plot_var)
78122
79123
p_span = (2.0, 20.0)
80-
opts_br = ContinuationPar(p_min = p_span[1], p_max = p_span[2], max_steps=1000)
124+
opts_br = ContinuationPar(p_min = p_span[1], p_max = p_span[2], max_steps = 1000)
81125
82-
bif_dia = bifurcationdiagram(bprob, PALC(), 2, (args...) -> opts_br; bothside=true)
126+
bif_dia = bifurcationdiagram(bprob, PALC(), 2, (args...) -> opts_br; bothside = true)
83127
84128
using Plots
85-
plot(bif_dia; xguide="k1", yguide="X")
129+
plot(bif_dia; xguide = "k1", guide = "X")
86130
```
87131
- Automatically handles elimination of conservation laws for computing bifurcation diagrams.
88132
- Updated Bifurcation documentation with respect to this new feature.
89-
- Added function `isautonomous` to check if a `ReactionSystem` is autonomous.
90-
- Added function `steady_state_stability` to compute stability for steady states. Example:
91-
```julia
92-
# Creates model.
93-
rn = @reaction_network begin
94-
(p,d), 0 <--> X
95-
end
96-
p = [:p => 1.0, :d => 0.5]
97-
98-
# Finds (the trivial) steady state, and computes stability.
99-
steady_state = [2.0]
100-
steady_state_stability(steady_state, rn, p)
101-
```
102-
Here, `steady_state_stability` take an optional argument `tol = 10*sqrt(eps())`, which is used to determine whether a eigenvalue real part is reliably less that 0.
103133

104134
## Catalyst 13.5
105135
- Added a CatalystHomotopyContinuationExtension extension, which exports the `hc_steady_state` function if HomotopyContinuation is exported. `hc_steady_state` finds the steady states of a reaction system using the homotopy continuation method. This feature is only available for julia versions 1.9+. Example:
@@ -658,7 +688,7 @@ hc_steady_states(wilhelm_2009_model, ps)
658688
field has been changed (only when created through the `@reaction_network`
659689
macro). Previously they were ordered according to the order with which they
660690
appeared in the macro. Now they are ordered according the to order with which
661-
they appeard after the `end` part. E.g. in
691+
they appeared after the `end` part. E.g. in
662692
```julia
663693
rn = @reaction_network begin
664694
(p,d), 0 <--> X
@@ -763,7 +793,7 @@ which gives
763793
![rn_complexes](https://user-images.githubusercontent.com/9385167/130252763-4418ba5a-164f-47f7-b512-a768e4f73834.png)
764794
765795
*2.* Support for units via ModelingToolkit and
766-
[Uniftul.jl](https://github.com/PainterQubits/Unitful.jl) in directly constructed
796+
[Unitful.jl](https://github.com/PainterQubits/Unitful.jl) in directly constructed
767797
`ReactionSystem`s:
768798
```julia
769799
# ]add Unitful

Project.toml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ SafeTestsets = "1bc83da4-3b8d-516f-aca4-4fe02f6d838f"
7676
SciMLBase = "0bca4576-84f4-4d90-8ffe-ffa030f20462"
7777
SciMLNLSolve = "e9a6253c-8580-4d32-9898-8661bb511710"
7878
StableRNGs = "860ef19b-820b-49d6-a774-d7a799459cd3"
79+
StaticArrays = "90137ffa-7385-5640-81b9-e52037218182"
7980
Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
8081
SteadyStateDiffEq = "9672c7b4-1e72-59bd-8a11-6ac3964bc41f"
8182
StochasticDiffEq = "789caeaf-c7a9-5a7d-9973-96adeb23e2a0"
@@ -84,4 +85,4 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
8485
Unitful = "1986cc42-f94f-5a68-af5c-568840ba703d"
8586

8687
[targets]
87-
test = ["BifurcationKit", "DiffEqCallbacks", "DomainSets", "Graphviz_jll", "HomotopyContinuation", "Logging", "NonlinearSolve", "OrdinaryDiffEq", "Plots", "Random", "SafeTestsets", "SciMLBase", "SciMLNLSolve", "StableRNGs", "Statistics", "SteadyStateDiffEq", "StochasticDiffEq", "StructuralIdentifiability", "Test", "Unitful"]
88+
test = ["BifurcationKit", "DiffEqCallbacks", "DomainSets", "Graphviz_jll", "HomotopyContinuation", "Logging", "NonlinearSolve", "OrdinaryDiffEq", "Plots", "Random", "SafeTestsets", "SciMLBase", "SciMLNLSolve", "StableRNGs", "StaticArrays", "Statistics", "SteadyStateDiffEq", "StochasticDiffEq", "StructuralIdentifiability", "Test", "Unitful"]

0 commit comments

Comments
 (0)