Merge pull request #513 from alan-turing-institute/dev

For a 0.17.2 release
JuliaAI · Feb 3, 2021 · 6d3b404 · 6d3b404
2 parents 11ef61d + 17f26fe
commit 6d3b404
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MLJBase"
 uuid = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
 authors = ["Anthony D. Blaom <[email protected]>"]
-version = "0.17.1"
+version = "0.17.2"
 
 [deps]
 CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"

diff --git a/src/composition/learning_networks/machines.jl b/src/composition/learning_networks/machines.jl
@@ -50,6 +50,8 @@ function model_supertype(signature)
 
 end
 
+caches_data_by_default(::Type{<:Surrogate}) = false
+
 function machine(model::Surrogate, _sources::Source...; pair_itr...)
 
     # named tuple, such as `(predict=yhat, transform=W)`:

diff --git a/test/composition/learning_networks/machines.jl b/test/composition/learning_networks/machines.jl
@@ -62,6 +62,10 @@ MLJBase.predict(model::DummyClusterer, fitresult, Xnew) =
     # supervised - predict_mode
     fit!(mach)
     @test predict_mode(mach, X) == mode.(predict(mach, X))
+    @test predict(mach, rows=1:2) == predict(mach, rows=:)[1:2]
+
+    # evaluate a learning machine
+    evaluate!(mach, measure=LogLoss())
 
     # supervised - predict_median, predict_mean
     X, y = make_regression(20)

diff --git a/test/runtests.jl b/test/runtests.jl
@@ -106,6 +106,6 @@ end
     @test include("hyperparam/one_dimensional_range_methods.jl")
 end
 
-@testset "openml" begin
-    @test include("openml.jl")
-end
+# @testset "openml" begin
+#     @test include("openml.jl")
+# end