Merge pull request #6 from JuliaAI/stricter-tests-around-resampling

Strengthen tests to catch more `selectrows`/`reformat` issues

Project.toml

@@ -1,7 +1,7 @@
 name = "MLJTestInterface"
 uuid = "72560011-54dd-4dc2-94f3-c5de45b75ecd"
 authors = ["Anthony D. Blaom <[email protected]>"]
-version = "0.1.1"
+version = "0.2.0"
 
 [deps]
 MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d"

src/attemptors.jl

@@ -78,6 +78,9 @@ function fitted_machine(model, data...; throw=false, verbosity=1)
         mach = model isa Static ? machine(model) :
                                   machine(model, data...)
         fit!(mach, verbosity=-1)
+        train, _ = MLJBase.partition(1:MLJBase.nrows(first(data)), 0.5)
+        fit!(mach, rows=train, verbosity=-1)
+        fit!(mach, rows=:, verbosity=-1)
         MLJBase.report(mach)
         MLJBase.fitted_params(mach)
         mach
@@ -89,12 +92,17 @@ function operations(fitted_machine, data...; throw=false, verbosity=1)
     attempt(finalize(message, verbosity); throw)  do
         operations = String[]
         methods = MLJBase.implemented_methods(fitted_machine.model)
+        _, test = MLJBase.partition(1:MLJBase.nrows(first(data)), 0.5)
         if :predict in methods
             predict(fitted_machine, first(data))
+            predict(fitted_machine, rows=test)
+            predict(fitted_machine, rows=:)
             push!(operations, "predict")
         end
         if :transform in methods
             W = transform(fitted_machine, first(data))
+            transform(fitted_machine, rows=test)
+            transform(fitted_machine, rows=:)
             push!(operations, "transform")
             if :inverse_transform in methods
                 inverse_transform(fitted_machine, W)
@@ -104,4 +112,3 @@ function operations(fitted_machine, data...; throw=false, verbosity=1)
         join(operations, ", ")
     end
 end
-

test/test.jl

@@ -33,7 +33,7 @@ expected_report2 = (
             y;
             mod=@__MODULE__,
             level=2,
-            verbosity=0
+            verbosity=0,
         )
     @test isempty(fails)
     @test report[1] == expected_report1