Removed the abstractvector{<:real} wrapper and adapted the rest of the functions

Author: theogf

src/kernels/tensorproduct.jl

@@ -96,7 +96,7 @@ function kernelmatrix(
     obsdim ∈ (1, 2) || error("obsdim should be 1 or 2 (see docs of kernelmatrix))")
 
     featuredim = feature_dim(obsdim)
-    if !check_dims(X, X, featuredim, obsdim)
+    if !check_dims(X, X, featuredim)
         throw(DimensionMismatch("Dimensions of the target array K $(size(K)) are not " *
                                 "consistent with X $(size(X))"))
     end
@@ -119,7 +119,7 @@ function kernelmatrix(
     obsdim ∈ (1, 2) || error("obsdim should be 1 or 2 (see docs of kernelmatrix))")
 
     featuredim = feature_dim(obsdim)
-    if !check_dims(X, Y, featuredim, obsdim)
+    if !check_dims(X, Y, featuredim)
         throw(DimensionMismatch("Dimensions $(size(K)) of the target array K are not " *
                                 "consistent with X ($(size(X))) and Y ($(size(Y)))"))
     end

src/matrix/kernelkroneckermat.jl

@@ -8,8 +8,8 @@ function kernelkronmat(
     dims::Int
     )
     @assert iskroncompatible(κ) "The chosen kernel is not compatible for kroenecker matrices (see `iskroncompatible()`)"
-    k = kernelmatrix(κ,reshape(X,:,1),obsdim=1)
-    kronecker(k,dims)
+    k = kernelmatrix(κ, X)
+    kronecker(k, dims)
 end
 
 function kernelkronmat(
@@ -18,8 +18,8 @@ function kernelkronmat(
     obsdim::Int=defaultobs
     )
     @assert iskroncompatible(κ) "The chosen kernel is not compatible for kroenecker matrices"
-    Ks = kernelmatrix.(κ,X,obsdim=obsdim)
-    K = reduce(⊗,Ks)
+    Ks = kernelmatrix.(κ, X)
+    K = reduce(⊗, Ks)
 end
 
 

src/matrix/kernelmatrix.jl

@@ -6,15 +6,6 @@ In-place version of [`kernelmatrix`](@ref) where pre-allocated matrix `K` will b
 """
 kernelmatrix!
 
-## Wrapper for vector of reals
-function kernelmatrix!(
-    K::AbstractMatrix,
-    κ::Kernel,
-    X::AbstractVector{<:Real}
-)
-    kernelmatrix!(K, κ, ColVecs(reshape(X, 1, :)))
-end
-
 function kernelmatrix!(
     K::AbstractMatrix,
     κ::SimpleKernel,
@@ -53,16 +44,6 @@ function kernelmatrix!(
     K .= κ.(X, X')
 end
 
-## Wrapper for vector of reals
-function kernelmatrix!(
-    K::AbstractMatrix,
-    κ::Kernel,
-    X::AbstractVector{<:Real},
-    Y::AbstractVector{<:Real}
-)
-    kernelmatrix!(K, κ, ColVecs(reshape(X, 1, :)), ColVecs(reshape(Y, 1, :)))
-end
-
 function kernelmatrix!(
     K::AbstractMatrix,
     κ::SimpleKernel,
@@ -114,14 +95,6 @@ Calculate the kernel matrix of `X` (and `Y`) with respect to kernel `κ`.
 """
 kernelmatrix
 
-function kernelmatrix(
-    κ::Kernel,
-    X::AbstractVector{<:Real};
-    obsdim::Int = defaultobs,
-)
-    kernelmatrix(κ, reshape(X, 1, :), obsdim = 2)
-end
-
 function kernelmatrix(κ::Kernel, X::AbstractVector)
     kernelmatrix(κ, X, X) #TODO Can be optimized later
 end
@@ -144,22 +117,14 @@ function kernelmatrix(κ::Kernel, X::AbstractMatrix; obsdim::Int = defaultobs)
     end
 end
 
-function kernelmatrix(
-    κ::Kernel,
-    X::AbstractVector{<:Real},
-    Y::AbstractVector{<:Real}
-    )
-    kernelmatrix(κ, ColVecs(reshape(X, 1, :)), ColVecs(reshape(Y, 1, :)))
-end
-
 function kernelmatrix(
     κ::SimpleKernel,
     X::AbstractMatrix,
     Y::AbstractMatrix;
     obsdim = defaultobs,
 )
     @assert obsdim ∈ [1, 2] "obsdim should be 1 or 2 (see docs of kernelmatrix))"
-    if !check_dims(X, Y, feature_dim(obsdim), obsdim)
+    if !check_dims(X, Y, feature_dim(obsdim))
         throw(DimensionMismatch("X $(size(X)) and Y $(size(Y)) do not have the same number of features on the dimension : $(feature_dim(obsdim))"))
     end
     _kernelmatrix(κ, X, Y, obsdim)

test/kernels/tensorproduct.jl

@@ -95,27 +95,27 @@
             trueXY = kernelmatrix(k1, X, Y)
             tmp = Matrix{Float64}(undef, 10, 10)
 
-            @test kernelmatrix(kernel, X) == trueX
+            @test kernelmatrix(kernel, X) ≈ trueX
             @test kernelmatrix(kernel, X'; obsdim = 1) ≈ trueX
 
             @test kernelmatrix(kernel, X, Y) ≈ trueXY
             @test kernelmatrix(kernel, X', Y'; obsdim = 1) ≈ trueXY
 
             fill!(tmp, 0)
             kernelmatrix!(tmp, kernel, X)
-            @test tmp == trueX
+            @test tmp ≈ trueX
 
             fill!(tmp, 0)
             kernelmatrix!(tmp, kernel, X'; obsdim = 1)
-            @test tmp == trueX
+            @test tmp ≈ trueX
 
             fill!(tmp, 0)
             kernelmatrix!(tmp, kernel, X, Y)
-            @test tmp == trueXY
+            @test tmp ≈ trueXY
 
             fill!(tmp, 0)
             kernelmatrix!(tmp, kernel, X', Y'; obsdim = 1)
-            @test tmp == trueXY
+            @test tmp ≈ trueXY
         end
 
         @testset "kerneldiagmatrix" begin