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

For 0.10.1 release

Project.toml

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

src/one_dimensional_range_methods.jl

@@ -85,7 +85,8 @@ range constructor, in the case of a `NominalRange`.
 iterator(r::ParamRange, n::Integer, rng::AbstractRNG) =
     StatsBase.sample(rng, iterator(r, n), n, replace=false)
 
-iterator(r::NominalRange, n::Integer) = collect(r.values[1:n])
+iterator(r::NominalRange, n::Integer) =
+    collect(r.values[1:min(n, length(r.values))])
 iterator(r::NominalRange) = collect(r.values)
 iterator(r::NominalRange, rng::AbstractRNG) =
     iterator(r, length(r.values), rng)

src/resampling.jl

@@ -696,7 +696,6 @@ mutable struct Resampler{S,M<:Supervised} <: Supervised
     repeats::Int
 end
 
-MLJBase.package_name(::Type{<:Resampler}) = "MLJBase"
 MLJBase.is_wrapper(::Type{<:Resampler}) = true
 MLJBase.supports_weights(::Type{<:Resampler{<:Any,M}}) where M =
     supports_weights(M)
@@ -782,8 +781,13 @@ function MLJBase.update(resampler::Resampler{Holdout},
 
 end
 
-MLJBase.input_scitype(::Type{<:Resampler{S,M}}) where {S,M} = MLJBase.input_scitype(M)
-MLJBase.target_scitype(::Type{<:Resampler{S,M}}) where {S,M} = MLJBase.target_scitype(M)
+MLJBase.input_scitype(::Type{<:Resampler{S,M}}) where {S,M} =
+    MLJBase.input_scitype(M)
+MLJBase.target_scitype(::Type{<:Resampler{S,M}}) where {S,M} =
+    MLJBase.target_scitype(M)
+MLJBase.package_name(::Type{<:Resampler}) = "MLJBase"
+
+MLJBase.load_path(::Type{<:Resampler}) = "MLJBase.Resampler"
 
 evaluate(resampler::Resampler, fitresult) = fitresult