Skip to content

Commit b396005

Browse files
authored
fix: BSPlineKit 0.18 is not breaking, but now exports fit, which runs into a conflict (#252)
* fix: BSPlineKit 0.18 is not breaking, but now exports fit, which runs into a conflict * fix BSplinekit - import rather tha using * BSplineKit: basis_to_array_index imported
1 parent 7d77d03 commit b396005

File tree

6 files changed

+14
-7
lines changed

6 files changed

+14
-7
lines changed

docs/literate/explanations/nonlinear_effects.jl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,8 @@
22

33

44

5-
using BSplineKit, Unfold
5+
import BSplineKit
6+
using Unfold
67
using CairoMakie
78
using DataFrames
89
using Random

docs/src/references/extensions.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ using Unfold
1717
To use robust (outlier-"safe") solvers support as described in @Ref(custom_solvers) you have to:
1818

1919
```julia
20-
using RobustSolvers
20+
import RobustSolvers
2121
using Unfold
2222
```
2323

@@ -26,7 +26,7 @@ using Unfold
2626
Finally to use non-linear effects/splines like in `@formula 0~1+spl(continuous,5)` you have to use:
2727

2828
```julia
29-
using BSplineKit
29+
import BSplineKit
3030
using Unfold
3131
```
3232

ext/UnfoldBSplineKitExt/UnfoldBSplineKitExt.jl

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
11
module UnfoldBSplineKitExt
22
using Unfold
3-
using BSplineKit
3+
import BSplineKit:
4+
BSplineOrder,
5+
BSplineBasis,
6+
boundaries,
7+
period,
8+
PeriodicBSplineBasis,
9+
basis_to_array_index
410
using StatsModels
511
import StatsModels: termvars, width, coefnames, modelcols, apply_schema
612
import Base: show

ext/UnfoldBSplineKitExt/basisfunctions.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ end
2525

2626
function splinekernel(e, times, nsplines)
2727
breakpoints = spl_breakpoints(times, nsplines)
28-
basis = BSplineKit.BSplineBasis(BSplineOrder(4), breakpoints) # 4= cubic
28+
basis = BSplineBasis(BSplineOrder(4), breakpoints) # 4= cubic
2929
return sparse(splFunction(times, basis))
3030
end
3131

ext/UnfoldBSplineKitExt/splinepredictors.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ function splFunction(x::AbstractVector, spl::PeriodicBSplineTerm)
100100
end
101101

102102
function splFunction(x::AbstractVector, spl::BSplineTerm)
103-
basis = BSplineKit.BSplineBasis(BSplineOrder(spl.order), deepcopy(spl.breakpoints))
103+
basis = BSplineBasis(BSplineOrder(spl.order), deepcopy(spl.breakpoints))
104104
_splFunction(x, basis)
105105
end
106106
#spl(x,df) = Splines2.bs(x,df=df,intercept=true) # assumes intercept

test/setup.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ using StatsBase
1010
using Missings
1111
using StableRNGs
1212

13-
using RobustModels, BSplineKit # extensionTriggers
13+
import RobustModels, BSplineKit # extensionTriggers
1414
using SparseArrays
1515
using UnfoldSim
1616
using Interpolations

0 commit comments

Comments
 (0)