From 2924598a2aefa65f84775ee719f50ab3309463a4 Mon Sep 17 00:00:00 2001 From: Marco-Congedo Date: Mon, 14 Dec 2020 17:12:41 +0100 Subject: [PATCH 1/2] v0.4.3 fixed bug in cvAcc --- src/cv.jl | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/src/cv.jl b/src/cv.jl index 98af846..352a9db 100644 --- a/src/cv.jl +++ b/src/cv.jl @@ -211,11 +211,7 @@ function cvAcc(model :: MLmodel, ℳ=Vector{MLmodel}(undef, nFolds) # ML models # get indeces for all CVs (separated for each class) - if ⏩ - @threads for i=1:z indTr[i], indTe[i] = cvSetup(length(𝐐[i]), nFolds; shuffle=shuffle) end - else - for i=1:z indTr[i], indTe[i] = cvSetup(length(𝐐[i]), nFolds; shuffle=shuffle) end - end + for i=1:z indTr[i], indTe[i] = cvSetup(length(𝐐[i]), nFolds; shuffle=shuffle) end fitArgs✔=() # make sure the user doesn't pass arguments that skrew up the cv @@ -267,11 +263,12 @@ function cvAcc(model :: MLmodel, ℳ[f]=fit(model, 𝐐Tr[f], zTr[f]; #meanInit=M0, verbose=false, + ⏩=false, fitArgs✔...) # predict labels for current fold - for i=1:z pl[f][i]=predict(ℳ[f], 𝐐Te[f][i], :l; verbose=false) end + for i=1:z pl[f][i]=predict(ℳ[f], 𝐐Te[f][i], :l; verbose=false, ⏩=false) end # compute confusion matrix for current fold for i=1:z, s=1:length(pl[f][i]) CM[f][i, pl[f][i][s]]+=1. end From 98a5b582fbd97198dea2cb30685720bec5d398df Mon Sep 17 00:00:00 2001 From: Marco-Congedo Date: Mon, 14 Dec 2020 17:20:42 +0100 Subject: [PATCH 2/2] v 0.4.3 updated project.toml --- Project.toml | 2 +- src/PosDefManifoldML.jl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Project.toml b/Project.toml index c5c9480..9a74a8c 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "PosDefManifoldML" uuid = "a07f4532-e2c9-11e9-2ea2-6d98fe4a1f21" authors = ["Marco-Congedo "] -version = "0.4.2" +version = "0.4.3" [deps] Dates = "ade2ca70-3891-5945-98fb-dc099432e06a" diff --git a/src/PosDefManifoldML.jl b/src/PosDefManifoldML.jl index df5f307..709e0d3 100644 --- a/src/PosDefManifoldML.jl +++ b/src/PosDefManifoldML.jl @@ -1,5 +1,5 @@ # Unit "simulations.jl" of the PosDefManifoldML Package for Julia language -# v 0.4.2 - last update July 8 2020 +# v 0.4.3 - last update July 8 2020 # # MIT License # Copyright (c) 2019-2020,