Skip to content

CompatHelper: bump compat for Catalyst to 15, (keep existing compat) #175

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Apr 19, 2025
Merged

CompatHelper: bump compat for Catalyst to 15, (keep existing compat) #175

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cc0e05c
CompatHelper: bump compat for Catalyst to 15, (keep existing compat)
Apr 16, 2025
f3d5792
test: fix tests
AayushSabharwal Apr 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Project.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ SymbolicUtils = "d1185830-fcd6-423d-90d6-eec64667417b"
[compat]
Aqua = "0.8"
CSV = "0.10.5"
Catalyst = "14"
Catalyst = "14, 15"
DataFrames = "1"
Downloads = "1"
ModelingToolkit = "9"
Expand Down
12 changes: 7 additions & 5 deletions test/systems.jl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ using Catalyst, SBML
using Test

cd(@__DIR__)
sbmlfile = joinpath("data", "reactionsystem_01.xml")
sbmlfile = joinpath("test", "data", "reactionsystem_01.xml")
const IV = default_t()
@parameters k1, c1
@species s1(IV), s2(IV), s1s2(IV)
Expand Down Expand Up @@ -83,10 +83,11 @@ trueeqs = Equation[default_time_deriv()(s1) ~ k1]
@test isequal(Catalyst.get_eqs(odesys), trueeqs)
@test isequal(Catalyst.get_iv(odesys), IV)
@test isequal(Catalyst.get_unknowns(odesys), [s1])
@test issetequal(Catalyst.get_ps(odesys), [k1, c1])
@test issetequal(ModelingToolkit.parameters_toplevel(odesys), [k1, c1])
u0 = [s1 => 1.0]
par = [k1 => 1.0, c1 => 2.0]
@test isequal(ModelingToolkit.defaults(odesys), ModelingToolkit._merge(u0, par)) # PL: @Anand: for some reason this does not work with `Catalyst.get_default()`
testdef = merge(Dict(u0), Dict(par))
@test issubset(testdef, defaults(odesys))
@named odesys = ODESystem(MODEL1)
isequal(nameof(odesys), :odesys)
@test structural_simplify(odesys) isa ODESystem
Expand All @@ -99,10 +100,11 @@ trueeqs = Equation[default_time_deriv()(s1) ~ -((k1 * s1 * s2) / c1),
@test isequal(Catalyst.get_eqs(odesys), trueeqs)
@test isequal(Catalyst.get_iv(odesys), IV)
@test isequal(Catalyst.get_unknowns(odesys), [s1, s1s2, s2])
@test issetequal(Catalyst.get_ps(odesys), [k1, c1])
@test issetequal(Catalyst.parameters_toplevel(odesys), [k1, c1])
u0 = [s1 => 2 * 1.0, s2 => 2 * 1.0, s1s2 => 2 * 1.0]
par = [k1 => 1.0, c1 => 2.0]
@test isequal(ModelingToolkit.defaults(odesys), ModelingToolkit._merge(u0, par))
testdef = merge(Dict(u0), Dict(par))
@test issubset(testdef, ModelingToolkit.defaults(odesys))
@named odesys = ODESystem(MODEL1)
isequal(nameof(odesys), :odesys)

Expand Down