First work on printing output

Author: theogf

Project.toml

@@ -13,7 +13,7 @@ StatsFuns = "4c63d2b9-4356-54db-8cca-17b64c39e42c"
 ZygoteRules = "700de1a5-db45-46bc-99cf-38207098b444"
 
 [compat]
-Compat = "2.2, 3.2"
+Compat = "2.2, 3"
 Distances = "0.8"
 PDMats = "0.9"
 SpecialFunctions = "0.8, 0.9, 0.10"

src/KernelFunctions.jl

@@ -11,6 +11,7 @@ export MaternKernel, Matern32Kernel, Matern52Kernel
 export LinearKernel, PolynomialKernel
 export RationalQuadraticKernel, GammaRationalQuadraticKernel
 export KernelSum, KernelProduct
+export TransformedKernel, ScaledKernel
 
 export Transform, SelectTransform, ChainTransform, ScaleTransform, LowRankTransform, IdentityTransform, FunctionTransform
 

src/generic.jl

@@ -21,16 +21,9 @@ for k in subtypes(BaseKernel)
     end
 end
 
-for k in Symbol.(subtypes(BaseKernel))
-    k = Symbol(string(k)[17:end])
-    new_k = Symbol(lowercase(string(k)))
+for k in nameof.(subtypes(BaseKernel))
     @eval begin
-        $new_k(;args...) = $k(;args...)
-        $new_k(ρ::Real;args...) = TransformedKernel($k(;args...),ScaleTransform(ρ))
-        $new_k(ρ::AbstractVector{<:Real};args...) = TransformedKernel($k(;args...),ARDTransform(ρ))
-        $new_k(t::Transform;args...) = TransformedKernel($k(;args...),t)
-        @deprecate($k(ρ::Real;args...),$new_k(ρ;args...))
-        @deprecate($k(ρ::AbstractVector{<:Real};args...),$new_k(ρ;args...))
-        export $new_k
+        @deprecate($k(ρ::Real;args...),TransformedKernel($k(args...),ScaleTransform(ρ)))
+        @deprecate($k(ρ::AbstractVector{<:Real};args...),TransformedKernel($k(args...),ARDTransform(ρ)))
     end
 end

src/kernels/kernelsum.jl

@@ -36,10 +36,14 @@ Base.:+(k::Kernel, ks::KernelSum) =
     KernelSum(vcat(k, ks.kernels), weights = vcat(1.0, ks.weights))
 Base.:+(k::ScaledKernel, ks::KernelSum) =
         KernelSum(vcat(kernel(k), ks.kernels), weights = vcat(first(k.σ), ks.weights))
+Base.:+(k::ScaledKernel, ks::Kernel) =
+        KernelSum(vcat(kernel(k), ks), weights = vcat(first(k.σ), 1.0))
 Base.:+(ks::KernelSum, k::Kernel) =
     KernelSum(vcat(ks.kernels, k), weights = vcat(ks.weights, 1.0))
 Base.:+(ks::KernelSum, k::ScaledKernel) =
         KernelSum(vcat(ks.kernels, kernel(k)), weights = vcat(ks.weights, first(k.σ)))
+Base.:+(ks::Kernel, k::ScaledKernel) =
+        KernelSum(vcat(ks, kernel(k)), weights = vcat(1.0, first(k.σ)))
 Base.:*(w::Real, k::KernelSum) = KernelSum(k.kernels, weights = w * k.weights) #TODO add tests
 
 Base.length(k::KernelSum) = length(k.kernels)
@@ -66,3 +70,10 @@ function kerneldiagmatrix(
 )
     sum(κ.weights[i] * kerneldiagmatrix(κ.kernels[i], X, obsdim = obsdim) for i in 1:length(κ))
 end
+
+function Base.show(io::IO,κ::KernelSum)
+    print(io,"Sum of $(length(κ)) kernels:")
+    for i in 1:length(κ)
+        print(io,"\n\t- (w=$(κ.weights[i])) $(κ.kernels[i])")
+    end
+end

src/kernels/scaledkernel.jl

@@ -16,3 +16,5 @@ params(k::ScaledKernel) = (k.σ,params(k.kernel))
 opt_params(k::ScaledKernel) = (k.σ,opt_params(k.kernel))
 
 Base.:*(w::Real,k::Kernel) = ScaledKernel(k,w)
+
+Base.show(io::IO,κ::ScaledKernel) = print(io,"$(κ.kernel)\n\t- σ = $(first(κ.σ))")

src/kernels/transformedkernel.jl

@@ -5,13 +5,10 @@ end
 
 kernel(κ) = κ.kernel
 
-transform(κ::Kernel,t::Transform) = TransformedKernel(κ,t)
-
 kappa(κ::TransformedKernel, x) = kappa(κ.kernel, x)
 
 metric(κ::TransformedKernel) = metric(κ.kernel)
 
 params(κ::TransformedKernel) = (params(κ.transform),params(κ.kernel))
-opt_params(κ::TransformedKernel) = (opt_params(κ.transform),opt_params(κ.kernel))
 
-Base.show(io::IO,κ::TransformedKernel) = print(io,"$(κ.kernel) with $(κ.transform)")
+Base.show(io::IO,κ::TransformedKernel) = print(io,"$(κ.kernel)\n\t- $(κ.transform)")

src/transform/transform.jl

@@ -3,7 +3,6 @@ export Transform, IdentityTransform, ScaleTransform, ARDTransform, LowRankTransf
 """
 ```julia
     transform(t::Transform, X::AbstractMatrix)
-    transform(k::Kernel, X::AbstractMatrix)
 ```
 Apply the transfomration `t` or `k.transform` on the input `X`
 """