Skip to content
Merged

Fix CI #1339

Show file tree
Hide file tree
Changes from 19 commits
Commits
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 .github/workflows/Documentation.yml
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ jobs:
- name: Install Julia
uses: julia-actions/setup-julia@latest
with:
version: '1'
version: '1.11'

# Cache to speed up subsequent runs
- uses: julia-actions/cache@v2
Expand Down
2 changes: 1 addition & 1 deletion Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ EnumX = "1"
GraphMakie = "0.5"
Graphs = "1.4"
HomotopyContinuation = "2.9"
JumpProcesses = "9.13.2"
JumpProcesses = "9.19.2"
LaTeXStrings = "1.3.0"
Latexify = "0.16.6"
MacroTools = "0.5.5"
Expand Down
8 changes: 4 additions & 4 deletions docs/Project.toml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"

[compat]
BenchmarkTools = "1.5"
BifurcationKit = "0.4.4"
BifurcationKit = "0.4.17"
CairoMakie = "0.12, 0.13"
Catalyst = "15"
DataFrames = "1.6"
Expand All @@ -64,14 +64,14 @@ GraphMakie = "0.5"
Graphs = "1.11.1"
HomotopyContinuation = "2.9"
IncompleteLU = "0.2"
JumpProcesses = "9.13.2"
JumpProcesses = "9.19.2"
Latexify = "0.16.5"
LinearSolve = "2.30, 3"
ModelingToolkit = "9.69"
NetworkLayout = "0.4"
NonlinearSolve = "3.12, 4"
Optim = "1.9"
Optimization = "4, 5"
Optimization = "4"
OptimizationBBO = "0.4"
OptimizationEvolutionary = "0.4"
OptimizationNLopt = "0.3"
Expand All @@ -83,7 +83,7 @@ OrdinaryDiffEqRosenbrock = "1"
OrdinaryDiffEqSDIRK = "1"
OrdinaryDiffEqTsit5 = "1"
OrdinaryDiffEqVerner = "1"
PEtab = "3.8"
PEtab = "3.11.1"
Plots = "1.40"
QuasiMonteCarlo = "0.3"
SciMLBase = "2.46"
Expand Down
6 changes: 3 additions & 3 deletions docs/src/inverse_problems/petab_ode_param_fitting.md
Original file line number Diff line number Diff line change
Expand Up @@ -435,14 +435,14 @@ And two additional optional argument:

Because `calibrate_multistart` handles initial guess sampling, unlike for `calibrate`, no initial guess has to be provided.

Here, we fit parameters through 10 independent optimisation runs, using QuasiMonteCarlo's `SobolSample` method, and save the result to the OptimisationRuns folder:
Here, we fit parameters through 10 independent optimisation runs, using QuasiMonteCarlo's `LatinHypercubeSample` method, and save the result to the OptimisationRuns folder:
```@example petab1
using Optim
using QuasiMonteCarlo
mkdir("OptimisationRuns") # hide
res_ms = calibrate_multistart(petab_problem, IPNewton(), 10; dirsave = "OptimisationRuns",
sampling_method = QuasiMonteCarlo.SobolSample())
res_ms = calibrate_multistart(petab_problem, IPNewton(), 10; dirsave = "OptimisationRuns", sampling_method = QuasiMonteCarlo.SobolSample()) # hide
sampling_method = QuasiMonteCarlo.LatinHypercubeSample())
res_ms = calibrate_multistart(petab_problem, IPNewton(), 10; dirsave = "OptimisationRuns", sampling_method = QuasiMonteCarlo.LatinHypercubeSample()) # hide
nothing # hide
```
The best result across all runs can still be retrieved using `get_ps(res_ms, petab_problem)`, with the results of the individual runs being stored in the `res_ms.runs` field.
Expand Down
4 changes: 2 additions & 2 deletions test/simulation_and_solving/hybrid_models.jl
Original file line number Diff line number Diff line change
Expand Up @@ -106,12 +106,12 @@ let
Nsims = 4000
for n in 1:Nsims
sol = solve(jprob, Tsit5(); saveat = tspan[2], seed)
@test sol.retcode == ReturnCode.Terminated
@test SciMLBase.successful_retcode(sol)
Xsamp += sol[1, end]
seed += 1
end
Xsamp /= Nsims
@test abs(Xsamp - Xf(0.2, p) < 0.05 * Xf(0.2, p))
@test abs(Xsamp - Xf(0.2, p)) < 0.05 * Xf(0.2, p)
end

# Checks that a disjoint hybrid model (i.e. where the Jump and ODE parts do not interact) gives the
Expand Down
2 changes: 1 addition & 1 deletion test/upstream/mtk_structure_indexing.jl
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ begin
sint = init(sprob, ImplicitEM(); save_everystep = false)
jint = init(jprob, SSAStepper())
nint = init(nprob, NewtonRaphson(); save_everystep = false)
@test_broken ssint = init(ssprob, DynamicSS(Tsit5()); save_everystep = false) # https://github.com/SciML/SciMLBase.jl/issues/660
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@TorkelE this doesn't return a boolean or error, so the test is not broken. I assume you meant this as a flag that there is an issue, but it seems to work now. Note though that ssint is not used anymore throughout the tests, so nothing is really being tested for it now beyond init.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This has been fine for 16 months, so I presume that something has changed underneath. I will update to ... false # ..., which should make things run for now. Then when we do the MTK fixes I will go through all of the changes and implications proiperly again.

ssint = init(ssprob, DynamicSS(Tsit5()); save_everystep = false)
integrators = [oint, sint, jint, nint]

# Creates solutions.
Expand Down
Loading