Skip to content

Commit 4eb1e57

Browse files
github-actions[bot]CompatHelper Juliareykboerner
authored
CompatHelper: bump compat for Interpolations to 0.16, (keep existing compat) (#169)
* CompatHelper: bump compat for Interpolations to 0.16, (keep existing compat) * changed example menu headings * fixed ModelingToolkit test * bump version number * tried to fix github-actions * bump DiffEqNoiseProcess version hoping to fix downgrade CI * disable downgrade.yml running after push * updated docs * bump version number --------- Co-authored-by: CompatHelper Julia <compathelper_noreply@julialang.org> Co-authored-by: reykboerner <reyk.boerner@reading.ac.uk>
1 parent be54fd3 commit 4eb1e57

File tree

8 files changed

+39
-36
lines changed

8 files changed

+39
-36
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@ name: CI
22

33
on:
44
push:
5-
tags:
6-
- '*'
75
branches:
86
- 'main'
97
pull_request:
@@ -27,8 +25,9 @@ jobs:
2725
strategy:
2826
matrix:
2927
version:
30-
- 'pre'
3128
- '1.10'
29+
- '1.11'
30+
#- 'pre'
3231
# - '1.9'
3332
# - 'nightly'
3433
os:
@@ -53,6 +52,10 @@ jobs:
5352
arch: ${{ matrix.arch }}
5453
- uses: julia-actions/cache@v2
5554
- uses: julia-actions/julia-buildpkg@v1
55+
56+
- name: Instantiate Julia environment
57+
run: julia --project=. -e 'using Pkg; Pkg.instantiate()'
58+
5659
- uses: julia-actions/julia-runtest@v1
5760
# - uses: julia-actions/julia-processcoverage@v1
5861
# - uses: codecov/codecov-action@v4

.github/workflows/downgrade.yml

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
name: Downgrade
22
on:
3-
push:
4-
tags:
5-
- '*'
6-
branches:
7-
- 'main'
8-
pull_request:
9-
branches:
10-
- 'main'
3+
workflow_dispatch:
4+
#push:
5+
# branches:
6+
# - 'main'
7+
#pull_request:
8+
# branches:
9+
# - 'main'
1110
jobs:
1211
test:
1312
name: Julia ${{ matrix.version }} - ${{ matrix.os }} - ${{ matrix.arch }}
@@ -19,7 +18,7 @@ jobs:
1918
strategy:
2019
matrix:
2120
version:
22-
- '1.10'
21+
- '1.11'
2322
# - '1.9'
2423
# - 'nightly'
2524
os:
@@ -39,4 +38,8 @@ jobs:
3938
with:
4039
skip: Pkg,TOML
4140
- uses: julia-actions/julia-buildpkg@v1
41+
42+
- name: Instantiate Julia environment
43+
run: julia --project=. -e 'using Pkg; Pkg.instantiate()'
44+
4245
- uses: julia-actions/julia-runtest@v1

Project.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name = "CriticalTransitions"
22
uuid = "251e6cd3-3112-48a5-99dd-66efcfd18334"
33
authors = ["Reyk Börner, Orjan Ameye, Ryan Deeley, Raphael Römer"]
44
repo = "https://github.com/juliadynamics/CriticalTransitions.jl.git"
5-
version = "0.5.0"
5+
version = "0.6.0"
66

77
[deps]
88
DataStructures = "864edb3b-99cc-5e75-8d2d-829cb0a9cfe8"
@@ -32,8 +32,8 @@ DelaunayTriangulation = "927a84f5-c5f4-47a5-9785-b46e178433df"
3232
StateSpaceSets = "40b095a5-5852-4c12-98c7-d43bf788e795"
3333

3434
[extensions]
35-
ChaosToolsExt = ["ChaosTools"]
3635
AttractorsExt = ["Attractors"]
36+
ChaosToolsExt = ["ChaosTools"]
3737
DistMesh2D = ["DelaunayTriangulation"]
3838

3939
[compat]
@@ -44,7 +44,7 @@ DelaunayTriangulation = "1.6"
4444
DocStringExtensions = "0.9.3"
4545
DynamicalSystemsBase = "3.13"
4646
Format = "1"
47-
Interpolations = "0.15.1"
47+
Interpolations = "0.15.1, 0.16"
4848
IntervalArithmetic = "0.22.22"
4949
LinearSolve = "2.37.0, 3"
5050
Optimization = "4"

README.md

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,16 @@ using CriticalTransitions
2121

2222
function fitzhugh_nagumo(u, p, t)
2323
x, y = u
24-
ϵ, β, α, γ, κ, I = p
24+
ϵ, β = p
2525

26-
dx = (-α * x^3 + γ * x - κ * y + I) / ϵ
27-
dy = -β * y + x
26+
dx = (-x^3 + x - y)/ϵ
27+
dy = -β*y + x
2828

2929
return SVector{2}([dx, dy])
3030
end
3131

3232
# System parameters
33-
params = [1., 3., 1., 1., 1., 0.]
33+
params = [0.1, 3.0]
3434
noise_strength = 0.02
3535
initial_state = zeros(2)
3636

@@ -52,4 +52,4 @@ Developers: Reyk Börner, Ryan Deeley, Raphael Römer and Orjan Ameye
5252

5353
Thanks to Jeroen Wouters, Calvin Nesbitt, Tobias Grafke, George Datseris and Oliver Mehling
5454

55-
This work is part of the [CriticalEarth](https://www.criticalearth.eu) project.
55+
This package was created as part of the [CriticalEarth](https://www.criticalearth.eu) project.

docs/pages.jl

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ pages = [
44
"Quickstart" => "quickstart.md",
55
"Tutorial" => "examples/tutorial.md",
66
"Examples" => Any[
7-
"Anlyses of the Maier-Stein system" => "examples/gMAM_Maierstein.md",
8-
"sgMAM for the Kerr Parametric Oscillator" => "examples/sgMAM_KPO.md",
9-
"Transition Path Theory using finite element method" => "examples/duffing_TPT.md",
7+
"Maier-Stein system: Noise-induced transitions and instantons" => "examples/gMAM_Maierstein.md",
8+
"Kerr Parametric Oscillator: Simple gMAM" => "examples/sgMAM_KPO.md",
9+
"Duffing Oscillator: Transition path theory" => "examples/duffing_TPT.md",
1010
],
1111
"Manual" => Any[
1212
"Define a CoupledSDEs system" => "man/CoupledSDEs.md",

docs/src/quickstart.md

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,17 @@
11
# Quickstart
22

33
## Installation
4-
As this module is not published yet, there are two ways to access it:
4+
Although the package is not yet registered, you can install it from Github via the Julia package manager:
5+
```julia
6+
using Pkg; Pkg.add('https://github.com/juliadynamics/CriticalTransitions.jl.git')
7+
```
58

6-
* **Option 1 (recommended): Install from GitHub**
7-
1. Enter the Julia package manager by typing `]` in the REPL: `julia> ]`
8-
2. type `add https://github.com/juliadynamics/CriticalTransitions.jl.git`
9-
* **Option 2: Load module locally**
10-
1. Clone the repo: `git clone https://github.com/juliadynamics/CriticalTransitions.jl.git`
11-
2. In Julia, include the module file: `include("PATH/src/CriticalTransitions.jl")`, where `PATH` is the relative path to the repo you just cloned
12-
3. Load the module: `using .CriticalTransitions`
9+
The package is currently tested to be compatible with Julia versions `1.10` and `1.11`.
1310

1411
## Basic usage
1512
The general workflow of `CriticalTransitions` essentially follows two steps:
1613

17-
1. Define your system (see [Define a CoupledSDEs system](@ref))
14+
1. Define your system as a `CoupledSDEs` (see [Define a CoupledSDEs system](@ref))
1815
2. Investigate the system by calling methods (see [Methods](@ref))
1916

2017
!!! info "New system type: RateSystem"
@@ -26,5 +23,5 @@ Currently the following functions are implemented to analyze a [`CoupledSDEs`](@
2623
corresponding sample transition paths.
2724

2825
```@index
29-
Pages = ["man/simulation.md", "man/sampling.md", "man/largedeviations.md"]
26+
Pages = ["man/systemanalysis.md", "man/simulation.md", "man/sampling.md", "man/largedeviations.md", "man/utils.md"]
3027
```

test/ModelingToolkit.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ using StochasticDiffEq: LambaEulerHeun
2727
(s * x * z)-s * z 0
2828
]
2929

30-
sys2 = SDESystem(drift_eqs, diffusion_eqs, t, sts, ps; name=:sys1)
30+
sys2 = structural_simplify(SDESystem(drift_eqs, diffusion_eqs, t, sts, ps; name=:sys1))
3131
@test sys1 == sys2
3232

3333
prob = SDEProblem(sys1, sts .=> [1.0, 0.0, 0.0], (0.0, 100.0), ps .=> (10.0, 26.0))

test/Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
2828
Aqua = "0.8.7"
2929
Attractors = "1.19.12"
3030
ChaosTools = "3.2.1"
31-
DiffEqNoiseProcess = "5.22"
31+
DiffEqNoiseProcess = "5.24"
3232
ExplicitImports = "1.9"
33-
JET = "0.9.9"
33+
JET = "0.9.18"
3434
ModelingToolkit = "9.25"
3535
Optimization = "4"
3636
OptimizationOptimJL = "0.4.1"

0 commit comments

Comments
 (0)