Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/master' into add-matrices
Browse files Browse the repository at this point in the history
  • Loading branch information
vyudu committed Nov 23, 2024
2 parents 835b4ff + 2cd8c75 commit b89329a
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 6 deletions.
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ BifurcationKit = "0.4.4"
CairoMakie = "0.12"
Combinatorics = "1.0.2"
DataStructures = "0.18"
DiffEqBase = "< 6.159.0"
DiffEqBase = "6.159.0"
DocStringExtensions = "0.8, 0.9"
DynamicPolynomials = "0.5, 0.6"
DynamicQuantities = "0.13.2, 1"
Expand All @@ -62,7 +62,7 @@ Parameters = "0.12"
Reexport = "0.2, 1.0"
Requires = "1.0"
RuntimeGeneratedFunctions = "0.5.12"
SciMLBase = "< 2.57.2"
SciMLBase = "2.57.2"
Setfield = "1"
# StructuralIdentifiability = "0.5.8"
SymbolicUtils = "2.1.2, 3.3.0"
Expand Down
2 changes: 1 addition & 1 deletion docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ BifurcationKit = "0.4.4"
CairoMakie = "0.12"
Catalyst = "14.4"
DataFrames = "1.6"
DiffEqBase = "< 6.159.0"
DiffEqBase = "6.159.0"
DiffEqParamEstim = "2.2"
Distributions = "0.25"
Documenter = "1.4.1"
Expand Down
13 changes: 10 additions & 3 deletions test/upstream/mtk_structure_indexing.jl
Original file line number Diff line number Diff line change
Expand Up @@ -208,10 +208,17 @@ end
# Currently, `save_idxs` is broken with symbolic stuff (https://github.com/SciML/ModelingToolkit.jl/issues/1761).
let
for (prob, solver) in zip(deepcopy([oprob, sprob, jprob]), [Tsit5(), ImplicitEM(), SSAStepper()])

# Save single variable
@test_broken solve(prob, solver; seed, save_idxs=X)[X][1] == 4
@test_broken solve(prob, solver; seed, save_idxs=model.X)[X][1] == 4
@test_broken solve(prob, solver; seed, save_idxs=:X)[X][1] == 4
if !(solver isa SSAStepper)
@test solve(prob, solver; seed, save_idxs=X)[X][1] == 4
@test solve(prob, solver; seed, save_idxs=model.X)[X][1] == 4
@test solve(prob, solver; seed, save_idxs=:X)[X][1] == 4
else
@test_broken solve(prob, solver; seed, save_idxs=X)[X][1] == 4
@test_broken solve(prob, solver; seed, save_idxs=model.X)[X][1] == 4
@test_broken solve(prob, solver; seed, save_idxs=:X)[X][1] == 4
end

# Save observable.
@test_broken solve(prob, solver; seed, save_idxs=XY)[XY][1] == 9
Expand Down

0 comments on commit b89329a

Please sign in to comment.