Skip to content

Commit 9183006

Browse files
committed
Merge branch 'master' into mtkv_v10_try
2 parents da9f937 + a058ce8 commit 9183006

File tree

3 files changed

+8
-5
lines changed

3 files changed

+8
-5
lines changed

.gitignore

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,4 +10,8 @@ Manifest.toml
1010
.vscode
1111
.vscode/*
1212

13-
LocalPreferences.toml
13+
LocalPreferences.toml
14+
15+
# claude
16+
.claude
17+
.claude/*

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ ModelingToolkit = "9.69"
7171
NetworkLayout = "0.4"
7272
NonlinearSolve = "3.12, 4"
7373
Optim = "1.9"
74-
Optimization = "4"
74+
Optimization = "4, 5"
7575
OptimizationBBO = "0.4"
7676
OptimizationEvolutionary = "0.4"
7777
OptimizationNLopt = "0.3"

test/upstream/mtk_structure_indexing.jl

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ begin
5050
sint = init(sprob, ImplicitEM(); save_everystep = false)
5151
jint = init(jprob, SSAStepper())
5252
nint = init(nprob, NewtonRaphson(); save_everystep = false)
53-
@test_broken ssint = init(ssprob, DynamicSS(Tsit5()); save_everystep = false) # https://github.com/SciML/SciMLBase.jl/issues/660
53+
ssint = init(ssprob, DynamicSS(Tsit5()); save_everystep = false)
5454
integrators = [oint, sint, jint, nint]
5555

5656
# Creates solutions.
@@ -152,8 +152,7 @@ end
152152

153153
# Test integrator indexing.
154154
let
155-
@test_broken false # NOTE: Cannot even create a `ssint` (https://github.com/SciML/SciMLBase.jl/issues/660).
156-
for int in deepcopy([oint, sint, jint, nint])
155+
for int in deepcopy([oint, sint, jint, nint, ssint])
157156
# Get u values.
158157
@test int[X] == int[model.X] == int[:X] == 4
159158
@test int[XY] == int[model.XY] == int[:XY] == 9

0 commit comments

Comments
 (0)