Removed _kernel further

Author: theogf

src/basekernels/fbm.jl

@@ -66,17 +66,6 @@ function kernelmatrix!(
     return K
 end
 
-## Apply kernel on two vectors ##
-function _kernel(
-        κ::FBMKernel,
-        x::AbstractVector,
-        y::AbstractVector;
-        obsdim::Int = defaultobs
-    )
-    @assert length(x) == length(y) "x and y don't have the same dimension!"
-    return kappa(κ, x, y)
-end
-
 function kappa(κ::FBMKernel, x::AbstractVector{<:Real}, y::AbstractVector{<:Real})
     modX = sum(abs2, x)
     modY = sum(abs2, y)

src/matrix/kernelmatrix.jl

@@ -21,7 +21,7 @@ function kernelmatrix!(
     X::AbstractMatrix;
     obsdim::Int = defaultobs,
 )
-    @assert obsdim ∈ [1, 2] "obsdim should be 1 or 2 (see docs of `kernelmatrix`))"
+    @assert obsdim ∈ [1, 2] "obsdim should be 1 or 2 (see docs of `kernelmatrix`)"
     if !check_dims(K, X, X, feature_dim(obsdim), obsdim)
         throw(DimensionMismatch("Dimensions of the target array K $(size(K)) are not consistent with X $(size(X))"))
     end
@@ -181,9 +181,9 @@ function kerneldiagmatrix(
     )
     @assert obsdim ∈ [1,2] "obsdim should be 1 or 2 (see docs of kernelmatrix))"
     if obsdim == 1
-        kerneldiagmatrix(κ, ColVecs(X)) #[@views _kernel(κ,X[i,:],X[i,:]) for i in 1:size(X,obsdim)]
+        kerneldiagmatrix(κ, ColVecs(X))
     elseif obsdim == 2
-        kerneldiagmatrix(κ, ColVecs(X')) #[@views _kernel(κ,X[:,i],X[:,i]) for i in 1:size(X,obsdim)]
+        kerneldiagmatrix(κ, ColVecs(X'))
     end
 end
 

test/basekernels/exponential.jl

@@ -35,7 +35,7 @@
         @test repr(k) == "Gamma Exponential Kernel (γ = $(γ))"
 
         #Coherence :
-        @test KernelFunctions._kernel(GammaExponentialKernel(γ=1.0),v1,v2) ≈ KernelFunctions._kernel(SqExponentialKernel(),v1,v2)
-        @test KernelFunctions._kernel(GammaExponentialKernel(γ=0.5),v1,v2) ≈ KernelFunctions._kernel(ExponentialKernel(),v1,v2)
+        @test GammaExponentialKernel(γ=1.0)(v1,v2) ≈ SqExponentialKernel(v1,v2)
+        @test GammaExponentialKernel(γ=0.5)(v1,v2) ≈ ExponentialKernel(v1,v2)
     end
 end

test/matrix/kernelmatrix.jl

@@ -30,7 +30,7 @@
                 @test kerneldiagmatrix(k,A,obsdim=obsdim) == diag(kernelmatrix(k,A,obsdim=obsdim))
                 @test k(A,B,obsdim=obsdim) == kernelmatrix(k,A,B,obsdim=obsdim)
                 @test k(A,obsdim=obsdim) == kernelmatrix(k,A,obsdim=obsdim)
-                @test KernelFunctions._kernel(k,1.0,2.0) == KernelFunctions._kernel(k,[1.0],[2.0])
+                # @test KernelFunctions._kernel(k,1.0,2.0) == KernelFunctions._kernel(k,[1.0],[2.0])
                 @test_throws DimensionMismatch kernelmatrix(k,A,C,obsdim=obsdim)
             end
         end