Deprecate constructor with two kernels (#28)

bors r+

Project.toml

@@ -1,7 +1,7 @@
 name = "CalibrationTests"
 uuid = "2818745e-0823-50c7-bc2d-405ac343d48b"
 authors = ["David Widmann <[email protected]>"]
-version = "0.4.2"
+version = "0.4.3"
 
 [deps]
 CalibrationErrors = "33913031-fe46-5864-950f-100836f47845"

src/deprecated.jl

@@ -1,3 +1,7 @@
 @deprecate AsymptoticSKCETest(kernel1::Kernel, kernel2::Kernel, data...; kwargs...) AsymptoticSKCETest(
     kernel1 ⊗ kernel2, data...; kwargs...
 )
+
+@deprecate AsymptoticBlockSKCETest(kernel1::Kernel, kernel2::Kernel, args...) AsymptoticBlockSKCETest(
+    kernel1 ⊗ kernel2, args...
+)

src/skce/asymptotic_block.jl

@@ -17,10 +17,6 @@ function AsymptoticBlockSKCETest(skce::BlockUnbiasedSKCE, data...)
     return AsymptoticBlockSKCETest(skce.kernel, skce.blocksize, data...)
 end
 
-function AsymptoticBlockSKCETest(κpredictions::Kernel, κtargets::Kernel, args...)
-    return AsymptoticBlockSKCETest(TensorProduct(κpredictions, κtargets), args...)
-end
-
 function AsymptoticBlockSKCETest(kernel::Kernel, blocksize::Int, data...)
     # obtain predictions and targets
     predictions, targets = CalibrationErrors.predictions_targets(data...)

test/skce/asymptotic_block.jl

@@ -55,6 +55,9 @@ Random.seed!(1234)
 end
 
 @testset "consistency" begin
+    kernel1 = transform(ExponentialKernel(), 0.1)
+    kernel2 = WhiteKernel()
+    kernel = kernel1 ⊗ kernel2
     αs = 0.05:0.1:0.95
     nsamples = 100
 
@@ -63,9 +66,7 @@ end
 
     for blocksize in (2, 5, 10)
         # create block estimator
-        skce = BlockUnbiasedSKCE(
-            transform(ExponentialKernel(), 0.1) ⊗ WhiteKernel(), blocksize
-        )
+        skce = BlockUnbiasedSKCE(kernel, blocksize)
 
         for nclasses in (2, 10)
             dist = Dirichlet(nclasses, 1)
@@ -89,6 +90,20 @@ end
                 # estimate pvalues
                 pvalues_consistent[i] = pvalue(test_consistent)
                 pvalues_onlyone[i] = pvalue(test_onlyone)
+
+                # deprecations
+                for (targets, test) in
+                    ((targets_consistent, test_consistent), (targets_onlyone, test_onlyone))
+                    test2 = @test_deprecated AsymptoticBlockSKCETest(
+                        kernel1, kernel2, blocksize, predictions, targets
+                    )
+                    @test test2.kernel == test.kernel
+                    @test test2.blocksize == test.blocksize
+                    @test test2.nblocks == test.nblocks
+                    @test test2.estimate == test.estimate
+                    @test test2.stderr == test.stderr
+                    @test test2.z == test.z
+                end
             end
 
             # compute empirical test errors