Skip to content

Commit 89bcacf

Browse files
Merge branch 'master' into master
2 parents c3a265e + 7e74106 commit 89bcacf

43 files changed

Lines changed: 1589 additions & 952 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.JuliaFormatter.toml

Lines changed: 0 additions & 4 deletions
This file was deleted.

.github/workflows/Downgrade.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ on:
1212
- 'docs/**'
1313
jobs:
1414
test:
15+
if: false # Temporarily disabled - see https://github.com/SciML/DataInterpolations.jl/issues/498
1516
runs-on: ubuntu-latest
1617
strategy:
1718
matrix:

.github/workflows/FormatCheck.yml

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,19 @@
1-
name: "Format Check"
1+
name: format-check
22

33
on:
44
push:
55
branches:
66
- 'master'
7+
- 'main'
8+
- 'release-'
79
tags: '*'
810
pull_request:
911

1012
jobs:
11-
format-check:
12-
name: "Format Check"
13-
uses: "SciML/.github/.github/workflows/format-check.yml@v1"
13+
runic:
14+
runs-on: ubuntu-latest
15+
steps:
16+
- uses: actions/checkout@v6
17+
- uses: fredrikekre/runic-action@v1
18+
with:
19+
version: '1'

.github/workflows/TagBot.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ jobs:
2525
if: github.event_name == 'workflow_dispatch' || github.actor == 'JuliaTagBot'
2626
runs-on: ubuntu-latest
2727
steps:
28-
- uses: JuliaRegistries/TagBot@79aed30d025666340f7407285d6e3e1a93535bde
28+
- uses: JuliaRegistries/TagBot@fdeda6bc5e30641e181adf155388e61dcee1526e
2929
with:
3030
token: ${{ secrets.GITHUB_TOKEN }}
3131
# Edit the following line to reflect the actual name of the GitHub Secret containing your private key

.github/workflows/Tests.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,10 @@ jobs:
3434
- Extensions
3535
- Misc
3636
- QA
37+
exclude:
38+
# AllocCheck doesn't work on pre-release Julia versions
39+
- version: "pre"
40+
group: QA
3741
uses: "SciML/.github/.github/workflows/tests.yml@v1"
3842
with:
3943
julia-version: "${{ matrix.version }}"

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
name = "DataInterpolations"
22
uuid = "82cc6244-b520-54b8-b5a6-8a565e85f1d0"
3-
version = "8.8.0"
3+
version = "8.9.0"
44

55
[deps]
66
EnumX = "4e289a0a-7415-4d19-859d-a7e5c4648b56"
@@ -41,7 +41,7 @@ FiniteDifferences = "0.12.31"
4141
ForwardDiff = "0.10.37, 1"
4242
LinearAlgebra = "1.10"
4343
Makie = "0.22, 0.23, 0.24"
44-
Optim = "1.6"
44+
Optim = "1.6, 2"
4545
PrettyTables = "2.4, 3"
4646
QuadGK = "2.9.1"
4747
RecipesBase = "1.3"

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ interp(u′, t′)
4343

4444
## Available Interpolations
4545

46-
In all cases, `u` an `AbstractVector` of values and `t` is an `AbstractVector` of timepoints
46+
In all cases, `u` is an `AbstractVector` of values and `t` is an `AbstractVector` of timepoints
4747
corresponding to `(u,t)` pairs.
4848

4949
- `ConstantInterpolation(u,t)` - A piecewise constant interpolation.
@@ -67,7 +67,7 @@ corresponding to `(u,t)` pairs.
6767

6868
## Extension Methods
6969

70-
The follow methods require extra dependencies and will be loaded as package extensions.
70+
The following methods require extra dependencies and will be loaded as package extensions.
7171

7272
- `Curvefit(u,t,m,p,alg)` - An interpolation which is done by fitting a user-given functional form `m(t,p)` where `p` is the vector of parameters. The user's input `p` is a an initial value for a least-square fitting, `alg` is the algorithm choice to use for optimize the cost function (sum of squared deviations) via `Optim.jl` and optimal `p`s are used in the interpolation. Requires `using Optim`.
7373
- `RegularizationSmooth(u,t,d;λ,alg)` - A regularization algorithm (ridge regression) which is done by minimizing an objective function (l2 loss + derivatives of order `d`) integrated in the time span. It is a global method and creates a smooth curve.

docs/Project.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ Symbolics = "0c5d862f-8b57-4792-8d23-62f2024744c7"
1313
Documenter = "1"
1414
ModelingToolkit = "9, 10.1, 11.1"
1515
ModelingToolkitStandardLibrary = "2"
16-
Optim = "1"
16+
Optim = "1, 2.0"
1717
OrdinaryDiffEq = "6"
1818
Plots = "1"
1919
RegularizationTools = "0.6"

docs/make.jl

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,16 @@ cp("./docs/Project.toml", "./docs/src/assets/Project.toml", force = true)
55

66
ENV["GKSwstype"] = "100"
77

8-
makedocs(modules = [DataInterpolations],
8+
makedocs(
9+
modules = [DataInterpolations],
910
sitename = "DataInterpolations.jl",
1011
clean = true,
1112
doctest = false,
1213
linkcheck = true,
13-
format = Documenter.HTML(assets = ["assets/favicon.ico"],
14-
canonical = "https://docs.sciml.ai/DataInterpolations/stable/"),
14+
format = Documenter.HTML(
15+
assets = ["assets/favicon.ico"],
16+
canonical = "https://docs.sciml.ai/DataInterpolations/stable/"
17+
),
1518
linkcheck_ignore = [
1619
"https://www.mathworks.com/content/dam/mathworks/mathworks-dot-com/moler/interp.pdf",
1720
],

docs/src/extrapolation_methods.md

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -48,33 +48,33 @@ This extrapolation type extends the interpolation with a continuation of the exp
4848
```@example tutorial
4949
A = QuadraticSpline(u, t; extrapolation = ExtrapolationType.Extension)
5050
plot(A)
51-
plot!(t_eval_left, A.(t_eval_left); label = "extrapolation down")
52-
plot!(t_eval_right, A.(t_eval_right); label = "extrapolation up")
51+
plot!(t_eval_left, A.(t_eval_left); label = "extrapolation left")
52+
plot!(t_eval_right, A.(t_eval_right); label = "extrapolation right")
5353
```
5454

5555
## `ExtrapolationType.Periodic`
5656

57-
this extrapolation type extends the interpolation such that `A(t + T) == A(t)` for all `t`, where the period is given by `T = last(A.t) - first(A.t)`.
57+
This extrapolation type extends the interpolation such that `A(t + T) == A(t)` for all `t`, where the period is given by `T = last(A.t) - first(A.t)`.
5858

5959
```@example tutorial
6060
T = last(A.t) - first(A.t)
6161
t_eval_left = range(first(t) - 2T, first(t), length = 100)
6262
t_eval_right = range(last(t), last(t) + 2T, length = 100)
6363
A = QuadraticSpline(u, t; extrapolation = ExtrapolationType.Periodic)
6464
plot(A)
65-
plot!(t_eval_left, A.(t_eval_left); label = "extrapolation down")
66-
plot!(t_eval_right, A.(t_eval_right); label = "extrapolation up")
65+
plot!(t_eval_left, A.(t_eval_left); label = "extrapolation left")
66+
plot!(t_eval_right, A.(t_eval_right); label = "extrapolation right")
6767
```
6868

6969
## `ExtrapolationType.Reflective`
7070

71-
this extrapolation type extends the interpolation such that `A(t_ + t) == A(t_ - t)` for all `t_, t` such that `(t_ - first(A.t)) % T == 0` and `0 < t < T`, where `T = last(A.t) - first(A.t)`.
71+
This extrapolation type extends the interpolation such that `A(t_ + t) == A(t_ - t)` for all `t_, t` such that `(t_ - first(A.t)) % T == 0` and `0 < t < T`, where `T = last(A.t) - first(A.t)`.
7272

7373
```@example tutorial
7474
A = QuadraticSpline(u, t; extrapolation = ExtrapolationType.Reflective)
7575
plot(A)
76-
plot!(t_eval_left, A.(t_eval_left); label = "extrapolation down")
77-
plot!(t_eval_right, A.(t_eval_right); label = "extrapolation up")
76+
plot!(t_eval_left, A.(t_eval_left); label = "extrapolation left")
77+
plot!(t_eval_right, A.(t_eval_right); label = "extrapolation right")
7878
```
7979

8080
## Mixed extrapolation

0 commit comments

Comments
 (0)