Extension of #269: Use \circ and compose and deprecate transform

src/basekernels/gabor.jl

@@ -27,7 +27,7 @@ end
 
 (κ::GaborKernel)(x, y) = κ.kernel(x, y)
 
-_lengthscale_transform(::Nothing) = IdentitytTransform()
+_lengthscale_transform(::Nothing) = IdentityTransform()
 _lengthscale_transform(x::Real) = ScaleTransform(inv(x))
 _lengthscale_transform(x::AbstractVector) = ARDTransform(map(inv, x))
 

test/deprecations.jl

@@ -2,11 +2,19 @@
     p = rand()
     v = rand(3)
     M = rand(3, 3)
+    v1 = rand(3)
+    v2 = rand(3)
     kernel = SqExponentialKernel()
-    @test (@test_deprecated transform(kernel, LinearTransform(M))) ==
-          kernel ∘ LinearTransform(M)
-    @test (@test_deprecated transform(kernel ∘ ScaleTransform(p), ARDTransform(v))) ==
-          kernel ∘ ARDTransform(v) ∘ ScaleTransform(p)
-    @test (@test_deprecated transform(kernel, p)) == kernel ∘ ScaleTransform(p)
-    @test (@test_deprecated transform(kernel, v)) == kernel ∘ ARDTransform(v)
+
+    k1 = @test_deprecated transform(kernel, LinearTransform(M))
+    @test k1(v1, v2) == (kernel ∘ LinearTransform(M))(v1, v2)
+
+    k2 = @test_deprecated transform(kernel ∘ ScaleTransform(p), ARDTransform(v))
+    @test k2(v1, v2) == (kernel ∘ ARDTransform(v) ∘ ScaleTransform(p))(v1, v2)
+
+    k3 = @test_deprecated transform(kernel, p)
+    @test k3(v1, v2) == (kernel ∘ ScaleTransform(p))(v1, v2)
+
+    k4 = @test_deprecated transform(kernel, v)
+    @test k4(v1, v2) == (kernel ∘ ARDTransform(v))(v1, v2)
 end

test/kernels/transformedkernel.jl

@@ -6,13 +6,17 @@
 
     s = rand(rng)
     v = rand(rng, 3)
+    P = rand(rng, 3, 2)
     k = SqExponentialKernel()
     kt = TransformedKernel(k, ScaleTransform(s))
     ktard = TransformedKernel(k, ARDTransform(v))
     @test kt(v1, v2) == (k ∘ ScaleTransform(s))(v1, v2)
     @test kt(v1, v2) ≈ k(s * v1, s * v2) atol = 1e-5
     @test ktard(v1, v2) == (k ∘ ARDTransform(v))(v1, v2)
     @test ktard(v1, v2) == k(v .* v1, v .* v2)
+    @test (k ∘ (LinearTransform(P') ∘ ScaleTransform(s)))(v1, v2) ==
+        ((k ∘ LinearTransform(P')) ∘ ScaleTransform(s))(v1, v2)
+
     @test repr(kt) == repr(k) * "\n\t- " * repr(ScaleTransform(s))
 
     TestUtils.test_interface(k, Float64)
@@ -42,15 +46,11 @@
         @test g1[first(ps)] ≈ g3[first(ps)]
     end
 
-    P = rand(3, 2)
     c = Chain(Dense(3, 2))
 
-    test_params(k ∘ ScaleTransform(s), (k, [s]))
-    test_params(k ∘ ARDTransform(v), (k, v))
-    test_params(k ∘ LinearTransform(P), (k, P))
-    test_params(k ∘ (LinearTransform(P) ∘ ScaleTransform(s)), (k, [s], P))
-    test_params(k ∘ FunctionTransform(c), (k, c))
-
-    @test (k ∘ (LinearTransform(P') ∘ ScaleTransform(s)))(v1, v2) ==
-          ((k ∘ LinearTransform(P')) ∘ ScaleTransform(s))(v1, v2)
+    test_params((k ∘ ScaleTransform(s)), (k, [s]))
+    test_params((k ∘ ARDTransform(v)), (k, v))
+    test_params((k ∘ LinearTransform(P), (k, P))
+    test_params((k ∘ (LinearTransform(P) ∘ ScaleTransform(s))), (k, [s], P))
+    test_params((k ∘ FunctionTransform(c)), (k, c))
 end