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

For patch release 0.7.5

Author: ablaom

Project.toml

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

src/MLJBase.jl

@@ -214,15 +214,19 @@ include("mlj_model_macro.jl")
 # metadata utils
 include("metadata_utilities.jl")
 
-# __init__() function:
+include("loss_functions_interface.jl")
+
+
 # include("init.jl")
 
-ScientificTypes.TRAIT_FUNCTION_GIVEN_NAME[:supervised_model] =
-    x-> x isa Supervised
-ScientificTypes.TRAIT_FUNCTION_GIVEN_NAME[:unsupervised_model] =
-    x-> x isa Unsupervised
-ScientificTypes.TRAIT_FUNCTION_GIVEN_NAME[:measure] =  is_measure
+function __init__()
 
-include("loss_functions_interface.jl")
+    ScientificTypes.TRAIT_FUNCTION_GIVEN_NAME[:supervised_model] =
+        x-> x isa Supervised
+    ScientificTypes.TRAIT_FUNCTION_GIVEN_NAME[:unsupervised_model] =
+        x-> x isa Unsupervised
+    ScientificTypes.TRAIT_FUNCTION_GIVEN_NAME[:measure] = is_measure
+
+end
 
 end # module

src/distributions.jl

@@ -368,7 +368,6 @@ function Distributions.fit(d::Type{<:UnivariateFinite},
         prob_given_class[c] /=S
     end
 
-    @show typeof(classes_seen) typeof(prob_given_class)
     return UnivariateFinite(prob_given_class)
 
 end

test/info.jl

@@ -5,6 +5,7 @@ using MLJBase
 import MLJBase.info_dict
 using Test
 using OrderedCollections
+using LossFunctions
 
 mutable struct DummyProb <: Probabilistic
     an_int::Int
@@ -174,5 +175,10 @@ end
 
 end
 
+@testset "info for measures" begin
+    @test info(rms).name == "rms"
+    info(L2DistLoss()).name == "LPDistLoss{2}"
+end
+
 end
 true

test/runtests.jl

@@ -5,6 +5,10 @@
 
 using MLJBase, Test
 
+@testset "scientific trait" begin
+    @test include("scientific_trait.jl")
+end
+
 @testset "equality" begin
   @test include("equality.jl")
 end

test/scientific_trait.jl

@@ -0,0 +1,11 @@
+import ScientificTypes.trait
+
+
+struct Foo1 <: Supervised end
+struct Bar1 <: Unsupervised end
+
+@test trait(rms) == :measure
+@test trait(Foo1()) == :supervised_model
+@test trait(Bar1()) == :unsupervised_model
+
+true