Improved error throwing and tests

Author: theogf

src/kernelmatrix.jl

@@ -10,7 +10,9 @@ function kernelmatrix!(
         X::AbstractMatrix{T₂};
         obsdim::Int = defaultobs
         ) where {T,T₁<:Real,T₂<:Real}
-        @assert check_dims(K,X,X,feature_dim(obsdim),obsdim) "Dimensions of the target array are not consistent with X and Y"
+        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
         map!(x->kappa(κ,x),K,pairwise(metric(κ),transform(κ,X,obsdim),dims=obsdim))
 end
 
@@ -27,7 +29,9 @@ function kernelmatrix!(
         Y::AbstractMatrix{T₃};
         obsdim::Int = defaultobs
         ) where {T,T₁,T₂,T₃}
-        @assert check_dims(K,X,Y,feature_dim(obsdim),obsdim) "Dimensions $(size(K)) of the target array K are not consistent with X ($(size(X))) and Y ($(size(Y)))"
+        if !check_dims(K,X,Y,feature_dim(obsdim),obsdim)
+            throw(DimensionMismatch("Dimensions $(size(K)) of the target array K are not consistent with X ($(size(X))) and Y ($(size(Y)))"))
+        end
         map!(x->kappa(κ,x),K,pairwise(metric(κ),transform(κ,X,obsdim),transform(κ,Y,obsdim),dims=obsdim))
 end
 
@@ -82,7 +86,9 @@ function kernelmatrix(
         Y::AbstractMatrix{T₂};
         obsdim=defaultobs
     ) where {T,T₁<:Real,T₂<:Real}
-    @assert check_dims(X,Y,feature_dim(obsdim),obsdim) "X ($(size(X))) and Y ($(size(Y))) do not have the same number of features on the dimension obsdim : $(feature_dim(obsdim))"
+    if !check_dims(X,Y,feature_dim(obsdim),obsdim)
+        throw(DimensionMismatch("X ($(size(X))) and Y ($(size(Y))) do not have the same number of features on the dimension obsdim : $(feature_dim(obsdim))"))
+    end
     K = map(x->kappa(κ,x),pairwise(metric(κ),transform(κ,X,obsdim),transform(κ,Y,obsdim),dims=obsdim))
     return K
 end
@@ -113,6 +119,9 @@ function kerneldiagmatrix!(
         X::AbstractMatrix{T₂};
         obsdim::Int = defaultobs
         ) where {T,T₁,T₂}
+        if length(K) != size(X,obsdim)
+            throw(DimensionMismatch("Dimensions of the target array K $(size(K)) are not consistent with X $(size(X))"))
+        end
         if obsdim == 1
             for i in eachindex(K)
                 @inbounds @views K[i] = kernel(κ, X[i,:],X[i,:])

src/utils.jl

@@ -11,13 +11,13 @@ end
 
 
 # Take highest Float among possibilities
-function promote_float(Tₖ::DataType...)
-    if length(Tₖ) == 0
-        return Float64
-    end
-    T = promote_type(Tₖ...)
-    return T <: Real ? T : Float64
-end
+# function promote_float(Tₖ::DataType...)
+#     if length(Tₖ) == 0
+#         return Float64
+#     end
+#     T = promote_type(Tₖ...)
+#     return T <: Real ? T : Float64
+# end
 
 check_dims(K,X,Y,featdim,obsdim) = check_dims(X,Y,featdim,obsdim) && (size(K) == (size(X,obsdim),size(Y,obsdim)))
 

test/test_kernelmatrix.jl

@@ -6,23 +6,29 @@ dims = [10,5]
 
 A = rand(dims...)
 B = rand(dims...)
+C = rand(8,9)
 K = [zeros(dims[1],dims[1]),zeros(dims[2],dims[2])]
 Kdiag = [zeros(dims[1]),zeros(dims[2])]
 k = SqExponentialKernel()
-@testset "Inplace Kernel Matrix" begin
-    for obsdim in [1,2]
-        @test kernelmatrix!(K[obsdim],k,A,B,obsdim=obsdim) == kernelmatrix(k,A,B,obsdim=obsdim)
-        @test kernelmatrix!(K[obsdim],k,A,obsdim=obsdim) == kernelmatrix(k,A,obsdim=obsdim)
-        @test kerneldiagmatrix!(Kdiag[obsdim],k,A,obsdim=obsdim) == kerneldiagmatrix(k,A,obsdim=obsdim)
+@testset "Kernel Matrix Operations" begin
+    @testset "Inplace Kernel Matrix" begin
+        for obsdim in [1,2]
+            @test kernelmatrix!(K[obsdim],k,A,B,obsdim=obsdim) == kernelmatrix(k,A,B,obsdim=obsdim)
+            @test kernelmatrix!(K[obsdim],k,A,obsdim=obsdim) == kernelmatrix(k,A,obsdim=obsdim)
+            @test kerneldiagmatrix!(Kdiag[obsdim],k,A,obsdim=obsdim) == kerneldiagmatrix(k,A,obsdim=obsdim)
+            @test_throws DimensionMismatch kernelmatrix!(K[obsdim],k,A,C,obsdim=obsdim)
+            @test_throws DimensionMismatch kernelmatrix!(K[obsdim],k,C,obsdim=obsdim)
+            @test_throws DimensionMismatch kerneldiagmatrix!(Kdiag[obsdim],k,C,obsdim=obsdim)
+        end
     end
-end
-
-@testset "Kernel matrix" begin
-    for obsdim in [1,2]
-        @test kernelmatrix(k,A,B,obsdim=obsdim) == kappa.([k],pairwise(KernelFunctions.metric(k),A,B,dims=obsdim))
-        @test kernelmatrix(k,A,obsdim=obsdim) == kappa.([k],pairwise(KernelFunctions.metric(k),A,dims=obsdim))
-        @test k(A,B,obsdim=obsdim) == kernelmatrix(k,A,B,obsdim=obsdim)
-        @test k(A,obsdim=obsdim) == kernelmatrix(k,A,obsdim=obsdim)
-        @test kernel(k,1.0,2.0) == kernel(k,[1.0],[2.0])
+    @testset "Kernel matrix" begin
+        for obsdim in [1,2]
+            @test kernelmatrix(k,A,B,obsdim=obsdim) == kappa.([k],pairwise(KernelFunctions.metric(k),A,B,dims=obsdim))
+            @test kernelmatrix(k,A,obsdim=obsdim) == kappa.([k],pairwise(KernelFunctions.metric(k),A,dims=obsdim))
+            @test k(A,B,obsdim=obsdim) == kernelmatrix(k,A,B,obsdim=obsdim)
+            @test k(A,obsdim=obsdim) == kernelmatrix(k,A,obsdim=obsdim)
+            @test kernel(k,1.0,2.0) == kernel(k,[1.0],[2.0])
+            @test_throws DimensionMismatch kernelmatrix(k,A,C,obsdim=obsdim)
+        end
     end
 end