diff --git a/.gitmodules b/.gitmodules index 0912fa4..549c379 100644 --- a/.gitmodules +++ b/.gitmodules @@ -5,14 +5,16 @@ update = merge [submodule "lib/catch2"] path = lib/catch2 - main = v2.x + main = v2.x update = merge url = https://github.com/catchorg/Catch2.git [submodule "lib/json"] path = lib/json url = https://github.com/nlohmann/json.git - master = master + master = master update = merge [submodule "lib/folding"] path = lib/folding url = https://github.com/rmontanana/folding + main = main + update = merge diff --git a/CHANGELOG.md b/CHANGELOG.md index 56f6cb8..18b67a9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,10 +5,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html). -## =[Unreleased] +## [Unreleased] ### Added +- Voting / probability aggregation in Ensemble classes - predict_proba method in Classifier - predict_proba method in BoostAODE - predict_voting parameter in BoostAODE constructor to use voting or probability to predict (default is voting) diff --git a/lib/argparse b/lib/argparse deleted file mode 160000 index 69dabd8..0000000 --- a/lib/argparse +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 69dabd88a8e6680b1a1a18397eb3e165e4019ce6 diff --git a/lib/catch2 b/lib/catch2 index 863c662..ed6ac8a 160000 --- a/lib/catch2 +++ b/lib/catch2 @@ -1 +1 @@ -Subproject commit 863c662c0eff026300f4d729a7054e90d6d12cdd +Subproject commit ed6ac8a629f9a4206575be784c1e340da2a94855 diff --git a/lib/json b/lib/json index a259ecc..0457de2 160000 --- a/lib/json +++ b/lib/json @@ -1 +1 @@ -Subproject commit a259ecc51e1951e12f757ce17db958e9881e9c6c +Subproject commit 0457de21cffb298c22b629e538036bfeb96130b7 diff --git a/lib/libxlsxwriter b/lib/libxlsxwriter deleted file mode 160000 index 29355a0..0000000 --- a/lib/libxlsxwriter +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 29355a0887475488c7cc470ad43cc867fcfa92e2