Skip to content

Commit 10ec569

Browse files
committed
Remove accidental comments
1 parent b589653 commit 10ec569

File tree

3 files changed

+17
-21
lines changed

3 files changed

+17
-21
lines changed

src/kernels/exponentiated.jl

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,6 @@ The exponentiated kernel is a Mercer kernel given by:
77
"""
88
struct ExponentiatedKernel{Tr} <: Kernel{Tr}
99
transform::Tr
10-
11-
# function ExponentiatedKernel{T,Tr}(transform::Tr) where {T,Tr<:Transform}
12-
# return new{T,Tr}(transform)
13-
# end
1410
end
1511
@inline kappa::ExponentiatedKernel, xᵀy::T) where {T<:Real} = exp(xᵀy)
1612

test/runtests.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ include("test_distances.jl")
1212
include("test_kernels.jl")
1313
include("test_generic.jl")
1414
include("test_adjoints.jl")
15-
# #include("types.jl")
15+
#include("types.jl")
1616
end

test/test_kernelmatrix.jl

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,21 @@ k = SqExponentialKernel()
5050
k1 = SqExponentialKernel()
5151
k2 = LinearKernel()
5252
k3 = RationalQuadraticKernel()
53-
# kp = k1 * k2
54-
# kp2 = k1 * k3
55-
# @test all(KernelFunctions.metric(kp).==[KernelFunctions.metric(k1),KernelFunctions.metric(k2)])
56-
# @test all(kernelmatrix(kp,A) .≈ kernelmatrix(k1,A) .* kernelmatrix(k2,A))
57-
# @test all(kernelmatrix(kp*k1,A) .≈ kernelmatrix(k1,A).^2 .* kernelmatrix(k2,A))
58-
# @test all(kernelmatrix(k1*kp,A) .≈ kernelmatrix(k1,A).^2 .* kernelmatrix(k2,A))
59-
# @test all(kernelmatrix(kp,A) .≈ kernelmatrix(k1,A) .* kernelmatrix(k2,A))
60-
# @test all(kernelmatrix(kp,A,B) .≈ kernelmatrix(k1,A,B) .* kernelmatrix(k2,A,B))
61-
# @test all(kernelmatrix(kp,A) .≈ kernelmatrix(k1,A) .* kernelmatrix(k2,A))
62-
# @test all(kerneldiagmatrix(kp,A) .== kerneldiagmatrix(k1,A) .* kerneldiagmatrix(k2,A))
53+
kp = k1 * k2
54+
kp2 = k1 * k3
55+
@test all(KernelFunctions.metric(kp).==[KernelFunctions.metric(k1),KernelFunctions.metric(k2)])
56+
@test all(kernelmatrix(kp,A) .≈ kernelmatrix(k1,A) .* kernelmatrix(k2,A))
57+
@test all(kernelmatrix(kp*k1,A) .≈ kernelmatrix(k1,A).^2 .* kernelmatrix(k2,A))
58+
@test all(kernelmatrix(k1*kp,A) .≈ kernelmatrix(k1,A).^2 .* kernelmatrix(k2,A))
59+
@test all(kernelmatrix(kp,A) .≈ kernelmatrix(k1,A) .* kernelmatrix(k2,A))
60+
@test all(kernelmatrix(kp,A,B) .≈ kernelmatrix(k1,A,B) .* kernelmatrix(k2,A,B))
61+
@test all(kernelmatrix(kp,A) .≈ kernelmatrix(k1,A) .* kernelmatrix(k2,A))
62+
@test all(kerneldiagmatrix(kp,A) .== kerneldiagmatrix(k1,A) .* kerneldiagmatrix(k2,A))
63+
end
64+
@testset "PDMat" begin
65+
for obsdim in [1,2]
66+
@test all(Matrix(kernelpdmat(k,A,obsdim=obsdim)) .≈ Matrix(PDMat(kernelmatrix(k,A,obsdim=obsdim))))
67+
# @test_throws ErrorException kernelpdmat(k,ones(100,100),obsdim=obsdim)
68+
end
6369
end
64-
# @testset "PDMat" begin
65-
# for obsdim in [1,2]
66-
# @test all(Matrix(kernelpdmat(k,A,obsdim=obsdim)) .≈ Matrix(PDMat(kernelmatrix(k,A,obsdim=obsdim))))
67-
# # @test_throws ErrorException kernelpdmat(k,ones(100,100),obsdim=obsdim)
68-
# end
69-
# end
7070
end

0 commit comments

Comments
 (0)