Merge pull request #42 from theogf/wct/fix-typo

Fix typo

Author: theogf

src/kernels/kernelsum.jl

@@ -22,28 +22,28 @@ function KernelSum(
 )
     @assert length(kernels) == length(weights) "Weights and kernel vector should be of the same length"
     @assert all(weights .>= 0) "All weights should be positive"
-    KernelSum(kernels, weights)
+    return KernelSum(kernels, weights)
 end
 
 params(k::KernelSum) = (k.weights, params.(k.kernels))
 opt_params(k::KernelSum) = (k.weights, opt_params.(k.kernels))
 
 Base.:+(k1::Kernel, k2::Kernel) = KernelSum([k1, k2], weights = [1.0, 1.0])
-Base.:+(k1::ScaledKernel, k2::ScaledKernel) = KernelSum([kernel(k1), kernel(k2)], weights = [first(k1.σ), first(k2.σ)])
+Base.:+(k1::ScaledKernel, k2::ScaledKernel) = KernelSum([kernel(k1), kernel(k2)], weights = [first(k1.σ²), first(k2.σ²)])
 Base.:+(k1::KernelSum, k2::KernelSum) =
     KernelSum(vcat(k1.kernels, k2.kernels), weights = vcat(k1.weights, k2.weights))
 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))
+        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))
+        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.σ)))
+        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.σ)))
+        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)

src/kernels/scaledkernel.jl

@@ -1,25 +1,25 @@
-struct ScaledKernel{Tk<:Kernel,Tσ<:Real} <: Kernel
+struct ScaledKernel{Tk<:Kernel, Tσ²<:Real} <: Kernel
     kernel::Tk
-    σ::Vector{Tσ}
+    σ²::Vector{Tσ²}
 end
 
-function ScaledKernel(kernel::Tk,σ::Tσ=1.0) where {Tk<:Kernel,Tσ<:Real}
-    @check_args(ScaledKernel, σ, σ > zero(Tσ), "σ > 0")
-    ScaledKernel{Tk,Tσ}(kernel,[σ])
+function ScaledKernel(kernel::Tk, σ²::Tσ²=1.0) where {Tk<:Kernel,Tσ²<:Real}
+    @check_args(ScaledKernel, σ², σ² > zero(Tσ²), "σ² > 0")
+    return ScaledKernel{Tk, Tσ²}(kernel, [σ²])
 end
 
-kappa(k::ScaledKernel, x) = first(k.σ)*kappa(k.kernel, x)
+kappa(k::ScaledKernel, x) = first(k.σ²) * kappa(k.kernel, x)
 
 metric(k::ScaledKernel) = metric(k.kernel)
 
-params(k::ScaledKernel) = (k.σ,params(k.kernel))
-opt_params(k::ScaledKernel) = (k.σ,opt_params(k.kernel))
+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.:*(w::Real, k::Kernel) = ScaledKernel(k, w)
 
-Base.show(io::IO,κ::ScaledKernel) = printshifted(io,κ,0)
+Base.show(io::IO, κ::ScaledKernel) = printshifted(io, κ, 0)
 
-function printshifted(io::IO,κ::ScaledKernel,shift::Int)
-    printshifted(io,κ.kernel,shift)
-    print(io,"\n"*("\t"^(shift+1))*"- σ = $(first(κ.σ))")
+function printshifted(io::IO, κ::ScaledKernel, shift::Int)
+    printshifted(io, κ.kernel, shift)
+    print(io,"\n" * ("\t"^(shift+1)) * "- σ² = $(first(κ.σ²))")
 end

test/runtests.jl

@@ -4,15 +4,15 @@ using Distances
 using Random
 
 @testset "KernelFunctions" begin
-include("test_kernelmatrix.jl")
-include("test_approximations.jl")
-include("test_constructors.jl")
-# include("test_AD.jl")
-include("test_transform.jl")
-include("test_distances.jl")
-include("test_kernels.jl")
-include("test_generic.jl")
-include("test_adjoints.jl")
-include("test_custom.jl")
+    include("test_kernelmatrix.jl")
+    include("test_approximations.jl")
+    include("test_constructors.jl")
+    # include("test_AD.jl")
+    include("test_transform.jl")
+    include("test_distances.jl")
+    include("test_kernels.jl")
+    include("test_generic.jl")
+    include("test_adjoints.jl")
+    include("test_custom.jl")
     #include("types.jl")
 end