Merge branch 'master' into general_kernelmatrix

Author: theogf

src/KernelFunctions.jl

@@ -10,7 +10,8 @@ export duplicate, set! # Helpers
 
 export Kernel
 export ConstantKernel, WhiteKernel, EyeKernel, ZeroKernel
-export SqExponentialKernel, ExponentialKernel, GammaExponentialKernel
+export SqExponentialKernel, RBFKernel, GaussianKernel, SEKernel
+export LaplacianKernel, ExponentialKernel, GammaExponentialKernel
 export ExponentiatedKernel
 export MaternKernel, Matern32Kernel, Matern52Kernel
 export LinearKernel, PolynomialKernel

src/basekernels/constant.jl

@@ -60,4 +60,4 @@ kappa(κ::ConstantKernel,x::Real) = first(κ.c)*one(x)
 
 metric(::ConstantKernel) = Delta()
 
-Base.show(io::IO, κ::ConstantKernel) = print(io, "Constant Kernel (c = $(first(κ.c)))")
+Base.show(io::IO, κ::ConstantKernel) = print(io, "Constant Kernel (c = ", first(κ.c), ")")

src/basekernels/exponential.jl

@@ -63,4 +63,4 @@ kappa(κ::GammaExponentialKernel, d²::Real) = exp(-d²^first(κ.γ))
 iskroncompatible(::GammaExponentialKernel) = true
 metric(::GammaExponentialKernel) = SqEuclidean()
 
-Base.show(io::IO, κ::GammaExponentialKernel) = print(io, "Gamma Exponential Kernel (γ = $(first(κ.γ)))")
+Base.show(io::IO, κ::GammaExponentialKernel) = print(io, "Gamma Exponential Kernel (γ = ", first(κ.γ), ")")

src/basekernels/fbm.jl

@@ -17,7 +17,7 @@ struct FBMKernel{T<:Real} <: BaseKernel
     end
 end
 
-Base.show(io::IO, κ::FBMKernel) = print(io, "Fractional Brownian Motion Kernel (h = $(first(k.h)))")
+Base.show(io::IO, κ::FBMKernel) = print(io, "Fractional Brownian Motion Kernel (h = ", first(κ.h), ")")
 
 const sqroundoff = 1e-15
 

src/basekernels/gabor.jl

@@ -30,7 +30,7 @@ function _gabor(; ell = nothing, p = nothing)
 end
 
 function Base.getproperty(k::GaborKernel, v::Symbol)
-    if v == :kernel 
+    if v == :kernel
         return getfield(k, v)
     elseif v == :ell
         kernel1 = k.kernel.kernels[1]
@@ -51,7 +51,7 @@ function Base.getproperty(k::GaborKernel, v::Symbol)
     end
 end
 
-Base.show(io::IO, κ::GaborKernel) = print(io, "Gabor Kernel (ell = $(κ.ell), p = $(κ.p))")
+Base.show(io::IO, κ::GaborKernel) = print(io, "Gabor Kernel (ell = ", κ.ell, ", p = ", κ.p, ")")
 
 kappa(κ::GaborKernel, x, y) = kappa(κ.kernel, x ,y)
 

src/basekernels/maha.jl

@@ -19,4 +19,4 @@ end
 kappa(κ::MahalanobisKernel, d::T) where {T<:Real} = exp(-d)
 metric(κ::MahalanobisKernel) = SqMahalanobis(κ.P)
 
-Base.show(io::IO, κ::MahalanobisKernel) = print(io, "Mahalanobis Kernel (size(P) = $(size(κ.P))")
+Base.show(io::IO, κ::MahalanobisKernel) = print(io, "Mahalanobis Kernel (size(P) = ", size(κ.P), ")")

src/basekernels/matern.jl

@@ -27,7 +27,7 @@ end
 
 metric(::MaternKernel) = Euclidean()
 
-Base.show(io::IO, κ::MaternKernel) = print(io, "Matern Kernel (ν = $(first(κ.ν)))")
+Base.show(io::IO, κ::MaternKernel) = print(io, "Matern Kernel (ν = ", first(κ.ν), ")")
 
 """
     Matern32Kernel()

src/basekernels/periodic.jl

@@ -24,4 +24,4 @@ metric(κ::PeriodicKernel) = Sinus(κ.r)
 
 kappa(κ::PeriodicKernel, d::Real) = exp(- 0.5d)
 
-Base.show(io::IO, κ::PeriodicKernel) = print(io, "Periodic Kernel, length(r) = $(length(κ.r))")
+Base.show(io::IO, κ::PeriodicKernel) = print(io, "Periodic Kernel, length(r) = ", length(κ.r), ")")

src/basekernels/piecewisepolynomial.jl

@@ -95,5 +95,5 @@ end
 metric(κ::PiecewisePolynomialKernel) = Mahalanobis(κ.maha)
 
 function Base.show(io::IO, κ::PiecewisePolynomialKernel{V}) where {V}
-    print(io, "Piecewise Polynomial Kernel (v = $(V), size(maha) = $(size(κ.maha))")
+    print(io, "Piecewise Polynomial Kernel (v = ", V, ", size(maha) = ", size(κ.maha), ")")
 end

src/basekernels/polynomial.jl

@@ -17,7 +17,7 @@ end
 kappa(κ::LinearKernel, xᵀy::Real) = xᵀy + first(κ.c)
 metric(::LinearKernel) = DotProduct()
 
-Base.show(io::IO, κ::LinearKernel) = print(io, "Linear Kernel (c = $(first(κ.c)))")
+Base.show(io::IO, κ::LinearKernel) = print(io, "Linear Kernel (c = ", first(κ.c), ")")
 
 """
     PolynomialKernel(; d = 2.0, c = 0.0)
@@ -40,4 +40,4 @@ end
 kappa(κ::PolynomialKernel, xᵀy::T) where {T<:Real} = (xᵀy + first(κ.c))^(first(κ.d))
 metric(::PolynomialKernel) = DotProduct()
 
-Base.show(io::IO, κ::PolynomialKernel) = print(io, "Polynomial Kernel (c = $(first(κ.c)), d = $(first(κ.d)))")
+Base.show(io::IO, κ::PolynomialKernel) = print(io, "Polynomial Kernel (c = ", first(κ.c), ", d = ", first(κ.d), ")")