Skip to content

Commit a2314a6

Browse files
committed
suggested fix for typename issue in 1.6+
1 parent 1bd56dc commit a2314a6

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

src/model_traits.jl

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,10 @@ docstring(M::Type{<:MLJType}) = name(M)
3636
docstring(M::Type{<:Model}) = "$(name(M)) from $(package_name(M)).jl.\n" *
3737
"[Documentation]($(package_url(M)))."
3838
# "derived" traits:
39-
name(M::Type) = string(M)
40-
name(M::Type{<:MLJType}) = split(string(coretype(M)), '.')[end] |> String
39+
typename(s) = replace(s, r"typename\((.*?)\)" => s"\1")
40+
name(M::Type) = string(M) |> typename
41+
name(M::Type{<:MLJType}) = split(string(coretype(M)), '.')[end] |> String |> typename
42+
4143

4244
is_supervised(::Type) = false
4345
is_supervised(::Type{<:Supervised}) = true

test/model_traits.jl

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -72,5 +72,9 @@ struct FooMeasure <: MLJType end
7272
@test name(Float64) == "Float64"
7373

7474
df = DataFrame(a=randn(2), b=randn(2))
75-
@test string(M.coretype(typeof(df))) == "DataFrame"
75+
if VERSION < v"1.6-"
76+
@test string(M.coretype(typeof(df))) == "DataFrame"
77+
else
78+
@test string(M.coretype(typeof(df))) == "typename(DataFrame)"
79+
end
7680
end

0 commit comments

Comments
 (0)