Merge branch 'dev' of https://github.com/alan-turing-institute/MLJModelInterface.jl into dev

Author: ablaom

src/model_traits.jl

@@ -36,11 +36,14 @@ docstring(M::Type{<:MLJType})  = name(M)
 docstring(M::Type{<:Model})    = "$(name(M)) from $(package_name(M)).jl.\n" *
                                  "[Documentation]($(package_url(M)))."
 # "derived" traits:
-typename(s)              = replace(s, r"typename\((.*?)\)" => s"\1")
-name(M::Type)            = string(M) |> typename
-name(M::Type{<:MLJType}) = split(string(coretype(M)), '.')[end] |> String |> typename
-
-
+function _coretype(M)
+    if isdefined(M, :name)
+        return M.name.name
+    else
+        return _coretype(M.body)
+    end
+end
+name(M::Type)                            = string(_coretype(M))
 is_supervised(::Type)                    = false
 is_supervised(::Type{<:Supervised})      = true
 prediction_type(::Type)                  = :unknown # used for measures too

src/utils.jl

@@ -2,10 +2,3 @@ if VERSION < v"1.1"
     fieldtypes(t) = Tuple(fieldtype(t, i) for i = 1:fieldcount(t))
 end
 
-function coretype(M)
-    if isdefined(M, :name)
-        return M.name
-    else
-        return coretype(M.body)
-    end
-end

test/model_traits.jl

@@ -64,18 +64,27 @@ bar(::P1) = nothing
     @test Set(implemented_methods(mp)) == Set([:clean!,:bar,:foo])
 end
 
-struct FooMeasure <: MLJType end
+module Fruit
+
+import MLJModelInterface.MLJType
+
+struct Banana <: MLJType end
+struct Apple end
+
+end
+
+import .Banana
 
 @testset "extras" begin
     @test docstring(Float64) == "Float64"
-    @test docstring(FooMeasure) == "FooMeasure"
+    @test docstring(Fruit.Banana) == "Banana"
     @test name(Float64) == "Float64"
 
     df = DataFrame(a=randn(2), b=randn(2))
-    @static if VERSION < v"1.6-"
-        @test string(M.coretype(typeof(df))) == "DataFrame"
-    else
-        @test string(M.coretype(typeof(df))) == "typename(DataFrame)"
-    end
     @test M.name(typeof(df)) == "DataFrame"
+    @test M.name(df) == "DataFrame"
+    @test M.name(Fruit.Banana) == "Banana"
+    @test M.name(Fruit.Banana()) == "Banana"
+    @test M.name(Fruit.Apple) == "Apple"
+    @test M.name(Fruit.Apple()) == "Apple"
 end