Merge pull request #82 from devmotion/basekernels

Author: devmotion

src/KernelFunctions.jl

@@ -48,9 +48,10 @@ include("distances/delta.jl")
 include("distances/sinus.jl")
 include("transform/transform.jl")
 
-for k in ["exponential","matern","polynomial","constant","rationalquad","exponentiated","cosine","maha","fbm","gabor","periodic","piecewisepolynomial"]
-    include(joinpath("kernels",k*".jl"))
+for f in readdir(joinpath(@__DIR__, "basekernels"))
+    endswith(f, ".jl") && include(joinpath("basekernels", f))
 end
+
 include("kernels/transformedkernel.jl")
 include("kernels/scaledkernel.jl")
 include("matrix/kernelmatrix.jl")

src/kernels/constant.jl renamed to src/basekernels/constant.jl

@@ -0,0 +1,13 @@
+@testset "maha" begin
+    rng = MersenneTwister(123456)
+    x = 2 * rand(rng)
+    v1 = rand(rng, 3)
+    v2 = rand(rng, 3)
+
+    P = rand(rng, 3, 3)
+    k = MahalanobisKernel(P)
+
+    @test kappa(k, x) == exp(-x)
+    @test k(v1, v2) ≈ exp(-sqmahalanobis(v1, v2, P))
+    @test kappa(ExponentialKernel(), x) == kappa(k, x)
+end

src/kernels/cosine.jl renamed to src/basekernels/cosine.jl

@@ -62,20 +62,24 @@ using KernelFunctions: metric
         include(joinpath("transform", "transform.jl"))
     end
 
+    @testset "basekernels" begin
+        include(joinpath("basekernels", "constant.jl"))
+        include(joinpath("basekernels", "cosine.jl"))
+        include(joinpath("basekernels", "exponential.jl"))
+        include(joinpath("basekernels", "exponentiated.jl"))
+        include(joinpath("basekernels", "fbm.jl"))
+        include(joinpath("basekernels", "gabor.jl"))
+        include(joinpath("basekernels", "maha.jl"))
+        include(joinpath("basekernels", "matern.jl"))
+        include(joinpath("basekernels", "periodic.jl"))
+        include(joinpath("basekernels", "polynomial.jl"))
+        include(joinpath("basekernels", "piecewisepolynomial.jl"))
+        include(joinpath("basekernels", "rationalquad.jl"))
+    end
+
     @testset "kernels" begin
-        include(joinpath("kernels", "constant.jl"))
-        include(joinpath("kernels", "cosine.jl"))
-        include(joinpath("kernels", "exponential.jl"))
-        include(joinpath("kernels", "exponentiated.jl"))
-        include(joinpath("kernels", "fbm.jl"))
-        include(joinpath("kernels", "gabor.jl"))
         include(joinpath("kernels", "kernelproduct.jl"))
         include(joinpath("kernels", "kernelsum.jl"))
-        include(joinpath("kernels", "matern.jl"))
-        include(joinpath("kernels", "periodic.jl"))
-        include(joinpath("kernels", "polynomial.jl"))
-        include(joinpath("kernels", "piecewisepolynomial.jl"))
-        include(joinpath("kernels", "rationalquad.jl"))
         include(joinpath("kernels", "scaledkernel.jl"))
         include(joinpath("kernels", "transformedkernel.jl"))