Skip to content

Commit f7b2d02

Browse files
committed
update model-specific testers to use row and column data
1 parent d78a6fc commit f7b2d02

File tree

1 file changed

+20
-8
lines changed

1 file changed

+20
-8
lines changed

src/special_cases.jl

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,19 @@ function _test(proxies, data; ignore::Bool=false, verbosity=1, kwargs...)
3838
end
3939
_test(data; ignore=true, kwargs...) = _test([], data; ignore, kwargs...)
4040

41+
function __test(data_generator, args...; verbosity=1, kwargs...)
42+
verbosity > 1 && @info "\nUSING COLUMN-BASED DATASETS: "
43+
fails, report = _test(args..., data_generator(); verbosity, kwargs...)
44+
ret = Dict("column table tests" => Dict("fails" => fails, "report" => report))
45+
verbosity > 1 && @info "\nUSING ROW-BASED DATASETS: "
46+
fails, report = _test(args..., data_generator(row_table=true); verbosity, kwargs...)
47+
ret["row table tests"] = Dict("fails" => fails, "report" => report)
48+
return ret
49+
end
50+
51+
52+
_make_transformer(; kwargs...) = (first(make_regression(; kwargs...)),)
53+
4154

4255

4356
# # SINGLE TARGET CLASSIFICATION
@@ -57,8 +70,7 @@ $DOC_AS_ABOVE
5770
5871
"""
5972
test_single_target_classifiers(args...; kwargs...) =
60-
_test(args..., make_binary(); kwargs...)
61-
73+
__test(make_binary, args...; kwargs...)
6274

6375
# # SINGLE TARGET REGRESSION
6476

@@ -75,8 +87,8 @@ passed onto `MLJTestIntegration.test`.
7587
$DOC_AS_ABOVE
7688
7789
"""
78-
test_single_target_regressors(args...; kwargs...) =
79-
_test(args..., make_regression(); kwargs...)
90+
test_single_target_regressors(args...; kwargs...) =
91+
__test(make_regression, args...; kwargs...)
8092

8193

8294
# # SINGLE TARGET COUNT REGRESSORS
@@ -97,13 +109,11 @@ $DOC_AS_ABOVE
97109
98110
"""
99111
test_single_target_count_regressors(args...; kwargs...) =
100-
_test(args..., make_count(); kwargs...)
112+
__test(make_count, args...; kwargs...)
101113

102114

103115
# # CONTINUOUS TABLE TRANSFORMERS
104116

105-
_make_transformer() = (first(make_regression()),)
106-
107117
"""
108118
test_continuous_table_transformers(; keyword_options...)
109119
@@ -115,6 +125,8 @@ using a two-feature selection of the Boston dataset. The specifed
115125
test_continuous_table_transformers(models; ignore=false, keyword_options...)
116126
117127
$DOC_AS_ABOVE
128+
118129
"""
119130
test_continuous_table_transformers(args...; kwargs...) =
120-
_test(args..., _make_transformer(); kwargs...)
131+
__test(_make_transformer, args...; kwargs...)
132+

0 commit comments

Comments
 (0)