From caa29971d9005b9ddb7a7dfbe50054b8a18cccf3 Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Wed, 29 Dec 2021 10:05:52 +1300 Subject: [PATCH 1/3] Fix PerformanceEvaluation bug #702 --- src/resampling.jl | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/src/resampling.jl b/src/resampling.jl index 065792e7..2e95c95f 100644 --- a/src/resampling.jl +++ b/src/resampling.jl @@ -1221,19 +1221,17 @@ function evaluate!(mach::Machine, resampling, weights, MLJBase.aggregate(per_fold[k], m) end - ret = ( - measure = measures, - measurement = per_measure, - operation = operations, - per_fold = per_fold, - per_observation = per_observation, - fitted_params_per_fold = fitted_params_per_fold |> collect, - report_per_fold = report_per_fold |> collect, - train_test_rows = resampling + return PerformanceEvaluation( + measures, + per_measure, + operations, + per_fold, + per_observation, + fitted_params_per_fold |> collect, + report_per_fold |> collect, + resampling ) - return ret - end # ---------------------------------------------------------------- From 3a39df3784f1cd4934fe490be31cd22f685d309a Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Wed, 29 Dec 2021 10:10:17 +1300 Subject: [PATCH 2/3] bump 0.19.1 --- Project.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Project.toml b/Project.toml index 30819165..e51683e5 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "MLJBase" uuid = "a7f614a8-145f-11e9-1d2a-a57a1082229d" authors = ["Anthony D. Blaom "] -version = "0.19" +version = "0.19.1" [deps] CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597" From 5d8c78c857e893dd0a3b2efd0b154e5b672201e8 Mon Sep 17 00:00:00 2001 From: "Anthony D. Blaom" Date: Wed, 29 Dec 2021 10:40:13 +1300 Subject: [PATCH 3/3] add julia 1.6 testing to ci --- .github/workflows/ci.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index a2c2e0fe..01f8a0d9 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -22,6 +22,7 @@ jobs: matrix: version: - '1.3' + - '1.6' - '1' # automatically expands to the latest stable 1.x release of Julia. os: - ubuntu-latest