Skip to content

Commit 3554faa

Browse files
committed
Removed _kernel
1 parent 1801fc7 commit 3554faa

File tree

3 files changed

+8
-17
lines changed

3 files changed

+8
-17
lines changed

src/basekernels/piecewisepolynomial.jl

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -43,16 +43,6 @@ function kappa(
4343
return _piecewisepolynomial(κ, r, j)
4444
end
4545

46-
function _kernel(
47-
κ::PiecewisePolynomialKernel,
48-
x::AbstractVector,
49-
y::AbstractVector;
50-
obsdim::Int = defaultobs,
51-
)
52-
@assert length(x) == length(y) "x and y don't have the same dimension!"
53-
return kappa(κ,x,y)
54-
end
55-
5646
function kernelmatrix(
5747
κ::PiecewisePolynomialKernel{V},
5848
X::AbstractMatrix;

src/generic.jl

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

2323
for k in concretetypes(Kernel, [])
2424
@eval begin
25-
@inline::$k)(x::AbstractVector{<:Real}, y::AbstractVector{<:Real}) = kappa(κ, x, y)
25+
@inline::$k)(x, y) = kappa(κ, x, y)
2626
@inline::$k)(X::AbstractMatrix{T}, Y::AbstractMatrix{T}; obsdim::Integer=defaultobs) where {T} = kernelmatrix(κ, X, Y, obsdim=obsdim)
2727
@inline::$k)(X::AbstractMatrix{T}; obsdim::Integer=defaultobs) where {T} = kernelmatrix(κ, X, obsdim=obsdim)
2828
end

src/matrix/kernelmatrix.jl

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,8 @@ function kernelmatrix(
101101
_kernelmatrix(κ,X,Y,obsdim)
102102
end
103103

104-
@inline _kernelmatrix::Kernel,X,Y,obsdim) = map(x->kappa(κ,x),pairwise(metric(κ),X,Y,dims=obsdim))
104+
@inline _kernelmatrix::SimpleKernel, X, Y, obsdim) =
105+
map(x -> kappa(κ, x), pairwise(metric(κ), X, Y, dims = obsdim))
105106

106107
kernelmatrix::TransformedKernel, X::AbstractMatrix, Y::AbstractMatrix; obsdim::Int = defaultobs) =
107108
kernelmatrix(kernel(κ), apply.transform, X, obsdim = obsdim), apply.transform, Y, obsdim = obsdim), obsdim = obsdim)
@@ -120,9 +121,9 @@ function kerneldiagmatrix(
120121
)
121122
@assert obsdim [1,2] "obsdim should be 1 or 2 (see docs of kernelmatrix))"
122123
if obsdim == 1
123-
@compat eachrow(X) .|> x->_kernel(κ,x,x) #[@views _kernel(κ,X[i,:],X[i,:]) for i in 1:size(X,obsdim)]
124+
@compat eachrow(X) .|> x-> κ(x, x) #[@views _kernel(κ,X[i,:],X[i,:]) for i in 1:size(X,obsdim)]
124125
elseif obsdim == 2
125-
@compat eachcol(X) .|> x->_kernel(κ,x,x) #[@views _kernel(κ,X[:,i],X[:,i]) for i in 1:size(X,obsdim)]
126+
@compat eachcol(X) .|> x-> κ(x, x) #[@views _kernel(κ,X[:,i],X[:,i]) for i in 1:size(X,obsdim)]
126127
end
127128
end
128129

@@ -133,7 +134,7 @@ In place version of [`kerneldiagmatrix`](@ref)
133134
"""
134135
function kerneldiagmatrix!(
135136
K::AbstractVector,
136-
κ::Kernel,
137+
κ::SimpleKernel,
137138
X::AbstractMatrix;
138139
obsdim::Int = defaultobs
139140
)
@@ -143,11 +144,11 @@ function kerneldiagmatrix!(
143144
end
144145
if obsdim == 1
145146
for i in eachindex(K)
146-
@inbounds @views K[i] = _kernel(κ, X[i,:],X[i,:])
147+
@inbounds @views K[i] = κ(X[i,:], X[i,:])
147148
end
148149
else
149150
for i in eachindex(K)
150-
@inbounds @views K[i] = _kernel(κ,X[:,i],X[:,i])
151+
@inbounds @views K[i] = κ(X[:,i], X[:,i])
151152
end
152153
end
153154
return K

0 commit comments

Comments
 (0)