Skip to content

Commit 66581bc

Browse files
authored
Merge pull request #220 from JuliaAI/dev
For a 0.8.7 release
2 parents 1af0202 + c13e844 commit 66581bc

File tree

3 files changed

+11
-6
lines changed

3 files changed

+11
-6
lines changed

Project.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
name = "MLJTuning"
22
uuid = "03970b2e-30c4-11ea-3135-d1576263f10f"
33
authors = ["Anthony D. Blaom <anthony.blaom@gmail.com>"]
4-
version = "0.8.6"
4+
version = "0.8.7"
55

66
[deps]
77
ComputationalResources = "ed09eef8-17a6-5b46-8889-db040fac31e3"
@@ -18,7 +18,7 @@ StatisticalMeasuresBase = "c062fc1d-0d66-479b-b6ac-8b44719de4cc"
1818
ComputationalResources = "0.3"
1919
Distributions = "0.22,0.23,0.24, 0.25"
2020
LatinHypercubeSampling = "1.7.2"
21-
MLJBase = "1.3"
21+
MLJBase = "1.4"
2222
ProgressMeter = "1.7.1"
2323
RecipesBase = "0.8,0.9,1"
2424
StatisticalMeasuresBase = "0.1.1"

src/tuned_models.jl

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -905,17 +905,19 @@ function MLJBase.feature_importances(::EitherTunedModel, fitresult, report)
905905
return MLJBase.feature_importances(fitresult)
906906
end
907907

908+
909+
910+
911+
908912
## METADATA
909913

910914
MLJBase.is_wrapper(::Type{<:EitherTunedModel}) = true
911915
MLJBase.supports_weights(::Type{<:EitherTunedModel{<:Any,M,L}}) where {M,L} =
912916
MLJBase.supports_weights(M)
913917
MLJBase.supports_class_weights(::Type{<:EitherTunedModel{<:Any,M,L}}) where {M,L} =
914918
MLJBase.supports_class_weights(M)
915-
MLJBase.load_path(::Type{<:ProbabilisticTunedModel}) =
916-
"MLJTuning.ProbabilisticTunedModel"
917-
MLJBase.load_path(::Type{<:DeterministicTunedModel}) =
918-
"MLJTuning.DeterministicTunedModel"
919+
MLJBase.load_path(::Type{<:EitherTunedModel}) =
920+
"MLJTuning.TunedModel"
919921
MLJBase.package_name(::Type{<:EitherTunedModel}) = "MLJTuning"
920922
MLJBase.package_uuid(::Type{<:EitherTunedModel}) =
921923
"03970b2e-30c4-11ea-3135-d1576263f10f"
@@ -928,3 +930,4 @@ MLJBase.input_scitype(::Type{<:EitherTunedModel{T,M,L}}) where {T,M,L} =
928930
MLJBase.input_scitype(M)
929931
MLJBase.target_scitype(::Type{<:EitherTunedModel{T,M,L}}) where {T,M,L} =
930932
MLJBase.target_scitype(M)
933+
MLJBase.constructor(::Type{<:EitherTunedModel}) = TunedModel

test/tuned_models.jl

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ end
6969
TunedModel(first(r), last(r), range=r, measure=l2),
7070
)
7171
tm = @test_logs TunedModel(model=first(r), range=r, measure=l2)
72+
@test MLJBase.constructor(tm) == TunedModel
73+
@test MLJBase.load_path(tm) == "MLJTuning.TunedModel"
7274
@test tm.tuning isa RandomSearch
7375
@test input_scitype(tm) == Table(Continuous)
7476

0 commit comments

Comments
 (0)