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

Towards 0.5.4

Project.toml

@@ -1,7 +1,7 @@
 name = "MLJ"
 uuid = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7"
 authors = ["Anthony D. Blaom <anthony.blaom@gmail.com>"]
-version = "0.5.3"
+version = "0.5.4"
 
 [deps]
 CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
@@ -31,7 +31,7 @@ CategoricalArrays = "^0.7"
 ComputationalResources = "^0.3"
 Distributions = "^0.21"
 DocStringExtensions = "^0.8"
-MLJBase = "^0.7"
+MLJBase = "^0.8.1"
 MLJModels = "^0.5"
 OrderedCollections = "^1.1"
 PrettyTables = "^0.6"

src/resampling.jl

@@ -334,25 +334,30 @@ function evaluate!(mach::Machine, resampling;
         reshape(measurements_flat, (nmeasures, nfolds)))
 
     # measurements for each observation:
-    per_observation = map(1:nmeasures) do m
-        if reports_each_observation(measures[m])
-            [measurements_matrix[:,m]...]
+    per_observation = map(1:nmeasures) do k
+        m = measures[k]
+        if reports_each_observation(m)
+            [measurements_matrix[:,k]...]
         else
             missing
         end
     end
 
     # measurements for each fold:
-    per_fold = map(1:nmeasures) do m
-        if reports_each_observation(measures[m])
-            mean.(per_observation[m])
+    per_fold = map(1:nmeasures) do k
+        m = measures[k]
+        if reports_each_observation(m)
+            broadcast(MLJBase.aggregate, per_observation[k], [m,])
         else
-            [measurements_matrix[:,m]...]
+            [measurements_matrix[:,k]...]
         end
     end
 
-    # overall means (one per measure):
-    per_measure = mean.(per_fold)
+    # overall aggregates:
+    per_measure = map(1:nmeasures) do k
+        m = measures[k]
+        MLJBase.aggregate(per_fold[k], m)
+    end
 
     ret = (measure=measures,
            measurement=per_measure,