Merge pull request #814 from JuliaAI/dev

For a 0.20.15 release

Project.toml

@@ -1,7 +1,7 @@
 name = "MLJBase"
 uuid = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
 authors = ["Anthony D. Blaom <[email protected]>"]
-version = "0.20.14"
+version = "0.20.15"
 
 [deps]
 CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"

src/operations.jl

@@ -23,7 +23,8 @@
 ## predict(::Machine, ) and transform(::Machine, )
 
 _err_rows_not_allowed() =
-    throw(ArgumentError("Calling `transform(mach, rows=...)` when "*
+    throw(ArgumentError("Calling `transform(mach, rows=...)` or "*
+                        "`predict(mach, rows=...)` when "*
                         "`mach.model isa Static` is not allowed, as no data "*
                         "is bound to `mach` in this case. Specify a explicit "*
                         "data or node, as in `transform(mach, X)`, or "*
@@ -80,14 +81,14 @@ for operation in OPERATIONS
             )
             return get!(ret, $quoted_operation, mach)
         end
+
+        # special case of Static models (no training arguments):
+        $operation(mach::Machine{<:Static}; rows=:) = _err_rows_not_allowed()
     end
     eval(ex)
 
 end
 
-# special case of Static models (no training arguments):
-transform(mach::Machine{<:Static}; rows=:) = _err_rows_not_allowed()
-
 inverse_transform(mach::Machine; rows=:) =
             throw(ArgumentError("`inverse_transform(mach)` and "*
                                 "`inverse_transform(mach, rows=...)` are "*

test/composition/models/static_transformers.jl

@@ -16,7 +16,7 @@ end
 MLJBase.transform(transf::PlainTransformer, verbosity, X) =
     selectcols(X, transf.ftr)
 
-@testset "nodal machine constructor for static transformers" begin
+@testset "machine constructor for static transformers" begin
     X = (x1=rand(3), x2=[1, 2, 3]);
     mach = machine(PlainTransformer(:x2))
     @test transform(mach, X) == [1, 2, 3]
@@ -31,10 +31,14 @@ MLJBase.reporting_operations(::Type{<:YourTransformer}) = (:transform,)
 MLJBase.transform(transf::YourTransformer, verbosity, X) =
     (selectcols(X, transf.ftr), (; nrows=nrows(X)))
 
+MLJBase.predict(transf::YourTransformer, verbosity, X) =
+    collect(1:nrows(X)) |> reverse
+
 @testset "nodal machine constructor for static transformers" begin
     X = (x1=rand(3), x2=[1, 2, 3]);
     mach = machine(YourTransformer(:x2))
     @test transform(mach, X) == [1, 2, 3]
+    @test predict(mach, X) == [3, 2, 1]
     @test report(mach).nrows == 3
     transform(mach, (x2=["a", "b"],))
     @test report(mach).nrows == 2