Add Cuda iniitialization in Classifier

.clang-format

@@ -1,4 +0,0 @@
-# .clang-format
-BasedOnStyle: LLVM
-IndentWidth: 4
-ColumnLimit: 120

.clang-uml

@@ -1,4 +1,4 @@
-compilation_database_dir: build_Debug
+compilation_database_dir: build_debug
 output_directory: diagrams
 diagrams:
   BayesNet:

.devcontainer/Dockerfile

@@ -1,6 +1,6 @@
 FROM mcr.microsoft.com/devcontainers/cpp:ubuntu22.04
 
-ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="3.29.3"
+ARG REINSTALL_CMAKE_VERSION_FROM_SOURCE="3.22.2"
 
 # Optionally install the cmake for vcpkg
 COPY ./reinstall-cmake.sh /tmp/
@@ -23,7 +23,7 @@ RUN add-apt-repository ppa:ubuntu-toolchain-r/test
 RUN apt-get update
 
 # Install GCC 13.1
-RUN apt-get install -y gcc-13 g++-13 doxygen
+RUN apt-get install -y gcc-13 g++-13
 
 # Install lcov 2.1
 RUN wget --quiet https://github.com/linux-test-project/lcov/releases/download/v2.1/lcov-2.1.tar.gz && \

.gitignore

@@ -44,5 +44,4 @@ docs/manual
 docs/man3
 docs/man
 docs/Doxyfile
-.cache
 

.gitmodules

@@ -1,3 +1,8 @@
+[submodule "lib/mdlp"]
+	path = lib/mdlp
+	url = https://github.com/rmontanana/mdlp
+	main = main
+	update = merge
 [submodule "lib/json"]
 	path = lib/json
 	url = https://github.com/nlohmann/json.git
@@ -16,6 +21,3 @@
 [submodule "tests/lib/Files"]
 	path = tests/lib/Files
 	url = https://github.com/rmontanana/ArffFiles
-[submodule "lib/mdlp"]
-	path = lib/mdlp
-	url = https://github.com/rmontanana/mdlp

.vscode/launch.json

@@ -5,7 +5,7 @@
             "type": "lldb",
             "request": "launch",
             "name": "sample",
-            "program": "${workspaceFolder}/sample/build/bayesnet_sample",
+            "program": "${workspaceFolder}/build_release/sample/bayesnet_sample",
             "args": [
                 "${workspaceFolder}/tests/data/glass.arff"
             ]
@@ -16,7 +16,7 @@
             "name": "test",
             "program": "${workspaceFolder}/build_Debug/tests/TestBayesNet",
             "args": [
-                "[XBAODE]"
+                "[Network]"
             ],
             "cwd": "${workspaceFolder}/build_Debug/tests"
         },

CHANGELOG.md

@@ -7,37 +7,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
-## [1.0.7] 2025-03-16
-
-
-### Added
-
-- A new hyperparameter to the BoostAODE class, *alphablock*, to control the way α is computed, with the last model or with the ensmble built so far. Default value is *false*.
-- A new hyperparameter to the SPODE class, *parent*, to set the root node of the model. If no value is set the root parameter of the constructor is used.
-- A new hyperparameter to the TAN class, *parent*, to set the root node of the model. If not set the first feature is used as root.
-- A new model named XSPODE, an optimized for speed averaged one dependence estimator.
-- A new model named XSP2DE, an optimized for speed averaged two dependence estimator.
-- A new model named XBAODE, an optimized for speed BoostAODE model.
-- A new model named XBA2DE, an optimized for speed BoostA2DE model.
-
-### Internal
-
-- Optimize ComputeCPT method in the Node class.
-- Add methods getCount and getMaxCount to the CountingSemaphore class, returning the current count and the maximum count of threads respectively.
-
-### Changed
-
-- Hyperparameter *maxTolerance* in the BoostAODE class is now in [1, 6] range (it was in [1, 4] range before).
-
-## [1.0.6] 2024-11-23
-
-### Fixed
-
-- Prevent existing edges to be added to the network in the `add_edge` method.
-- Don't allow to add nodes or edges on already fiited networks.
-- Number of threads spawned
-- Network class tests
-
 ### Added
 
 - Library logo generated with <https://openart.ai> to README.md
@@ -45,21 +14,15 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - *convergence_best* hyperparameter to the BoostAODE class, to control the way the prior accuracy is computed if convergence is set. Default value is *false*.
 - SPnDE model.
 - A2DE model.
-- BoostA2DE model.
 - A2DE & SPnDE tests.
 - Add tests to reach 99% of coverage.
 - Add tests to check the correct version of the mdlp, folding and json libraries.
 - Library documentation generated with Doxygen.
 - Link to documentation in the README.md.
-- Three types of smoothing the Bayesian Network ORIGINAL, LAPLACE and CESTNIK.
+- Three types of smoothing the Bayesian Network OLD_LAPLACE, LAPLACE and CESTNIK.
 
 ### Internal
 
-- Fixed doxygen optional dependency
-- Add env parallel variable to Makefile
-- Add CountingSemaphore class to manage the number of threads spawned.
-- Ignore CUDA language in CMake CodeCoverage module.
-- Update mdlp library as a git submodule.
 - Create library ShuffleArffFile to limit the number of samples with a parameter and shuffle them.
 - Refactor catch2 library location to test/lib
 - Refactor loadDataset function in tests.
@@ -70,13 +33,6 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 - Add a Makefile target (doc) to generate the documentation.
 - Add a Makefile target (doc-install) to install the documentation.
 
-### Libraries versions
-
-- mdlp: 2.0.1
-- Folding: 1.1.0
-- json: 3.11
-- ArffFiles: 1.1.0
-
 ## [1.0.5] 2024-04-20
 
 ### Added

CMakeLists.txt

@@ -1,7 +1,7 @@
 cmake_minimum_required(VERSION 3.20)
 
 project(BayesNet
-  VERSION 1.0.7
+  VERSION 1.0.6
   DESCRIPTION "Bayesian Network and basic classifiers Library."
   HOMEPAGE_URL "https://github.com/rmontanana/bayesnet"
   LANGUAGES CXX
@@ -49,13 +49,17 @@ if (CMAKE_BUILD_TYPE STREQUAL "Debug")
   set(CODE_COVERAGE ON)
 endif (CMAKE_BUILD_TYPE STREQUAL "Debug")
 
-get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
+
-message(STATUS "Languages=${LANGUAGES}")
 if (CODE_COVERAGE)
+get_property(LANGUAGES GLOBAL PROPERTY ENABLED_LANGUAGES)
+message("ALL LANGUAGES: ${LANGUAGES}")
+foreach(LANG ${LANGUAGES})
+    message("${LANG} compiler is \"${CMAKE_${LANG}_COMPILER_ID}\"")
+endforeach()
   enable_testing()
-  include(CodeCoverage)
+  #include(CodeCoverage)
-  MESSAGE(STATUS "Code coverage enabled")
+  #MESSAGE("Code coverage enabled")
-  SET(GCC_COVERAGE_LINK_FLAGS " ${GCC_COVERAGE_LINK_FLAGS} -lgcov --coverage")
+  #SET(GCC_COVERAGE_LINK_FLAGS " ${GCC_COVERAGE_LINK_FLAGS} -lgcov --coverage")
 endif (CODE_COVERAGE)
 
 if (ENABLE_CLANG_TIDY)
@@ -64,7 +68,6 @@ endif (ENABLE_CLANG_TIDY)
 
 # External libraries - dependencies of BayesNet
 # ---------------------------------------------
-
 # include(FetchContent)
 add_git_submodule("lib/json")
 add_git_submodule("lib/mdlp")
@@ -77,7 +80,7 @@ add_subdirectory(bayesnet)
 # Testing
 # -------
 if (ENABLE_TESTING)
-MESSAGE(STATUS "Testing enabled")
+MESSAGE("Testing enabled")
   add_subdirectory(tests/lib/catch2)
   include(CTest)
   add_subdirectory(tests)
@@ -95,14 +98,10 @@ install(FILES ${CMAKE_BINARY_DIR}/configured_files/include/bayesnet/config.h DES
 # Documentation
 # -------------
 find_package(Doxygen)
-if (Doxygen_FOUND)
+set(DOC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/docs)
-  set(DOC_DIR ${CMAKE_CURRENT_SOURCE_DIR}/docs)
+set(doxyfile_in ${DOC_DIR}/Doxyfile.in)
-  set(doxyfile_in ${DOC_DIR}/Doxyfile.in)
+set(doxyfile ${DOC_DIR}/Doxyfile)
-  set(doxyfile ${DOC_DIR}/Doxyfile)
+configure_file(${doxyfile_in} ${doxyfile} @ONLY)
-  configure_file(${doxyfile_in} ${doxyfile} @ONLY)
+doxygen_add_docs(doxygen
-  doxygen_add_docs(doxygen
+    WORKING_DIRECTORY ${DOC_DIR}
-      WORKING_DIRECTORY ${DOC_DIR}
     CONFIG_FILE ${doxyfile})
-else (Doxygen_FOUND) 
-  MESSAGE("* Doxygen not found")
-endif (Doxygen_FOUND)

Makefile

@@ -43,7 +43,7 @@ setup: ## Install dependencies for tests and coverage
 	fi
 	@echo "* You should install plantuml & graphviz for the diagrams"
 
-diagrams: ## Create an UML class diagram & dependency of the project (diagrams/BayesNet.png)
+diagrams: ## Create an UML class diagram & depnendency of the project (diagrams/BayesNet.png)
 	@which $(plantuml) || (echo ">>> Please install plantuml"; exit 1)
 	@which $(dot) || (echo ">>> Please install graphviz"; exit 1)
 	@which $(clang-uml) || (echo ">>> Please install clang-uml"; exit 1)
@@ -58,10 +58,10 @@ diagrams: ## Create an UML class diagram & dependency of the project (diagrams/B
 	@$(dot) -Tsvg $(f_debug)/dependency.dot.BayesNet -o $(f_diagrams)/dependency.svg
 
 buildd: ## Build the debug targets
-	cmake --build $(f_debug) -t $(app_targets) --parallel $(CMAKE_BUILD_PARALLEL_LEVEL)
+	cmake --build $(f_debug) -t $(app_targets) --parallel
 
 buildr: ## Build the release targets
-	cmake --build $(f_release) -t $(app_targets) --parallel $(CMAKE_BUILD_PARALLEL_LEVEL)
+	cmake --build $(f_release) -t $(app_targets) --parallel
 
 clean: ## Clean the tests info
 	@echo ">>> Cleaning Debug BayesNet tests...";
@@ -97,23 +97,15 @@ fname = "tests/data/iris.arff"
 sample: ## Build sample
 	@echo ">>> Building Sample...";
 	@if [ -d ./sample/build ]; then rm -rf ./sample/build; fi
-	@cd sample && cmake -B build -S . -D CMAKE_BUILD_TYPE=Debug && cmake --build build -t bayesnet_sample
+	@cd sample && cmake -B build -S . && cmake --build build -t bayesnet_sample
 	sample/build/bayesnet_sample $(fname)
-	@echo ">>> Done";
+	@echo ">>> Done";	
-
-fname = "tests/data/iris.arff"
-sample2: ## Build sample2
-	@echo ">>> Building Sample...";
-	@if [ -d ./sample/build ]; then rm -rf ./sample/build; fi
-	@cd sample && cmake -B build -S . -D CMAKE_BUILD_TYPE=Debug && cmake --build build -t bayesnet_sample_xspode
-	sample/build/bayesnet_sample_xspode $(fname)
-	@echo ">>> Done";		
 
 opt = ""
 test: ## Run tests (opt="-s") to verbose output the tests, (opt="-c='Test Maximum Spanning Tree'") to run only that section
 	@echo ">>> Running BayesNet tests...";
 	@$(MAKE) clean
-	@cmake --build $(f_debug) -t $(test_targets) --parallel $(CMAKE_BUILD_PARALLEL_LEVEL)
+	@cmake --build $(f_debug) -t $(test_targets) --parallel
 	@for t in $(test_targets); do \
 		echo ">>> Running $$t...";\
 		if [ -f $(f_debug)/tests/$$t ]; then \
@@ -180,7 +172,7 @@ docdir = ""
 doc-install: ## Install documentation
 	@echo ">>> Installing documentation..."
 	@if [ "$(docdir)" = "" ]; then \
-		echo "docdir parameter has to be set when calling doc-install, i.e. docdir=../bayesnet_help"; \
+		echo "docdir parameter has to be set when calling doc-install"; \
 		exit 1; \
 	fi
 	@if [ ! -d $(docdir) ]; then \

README.md

@@ -7,10 +7,9 @@
 [![Security Rating](https://sonarcloud.io/api/project_badges/measure?project=rmontanana_BayesNet&metric=security_rating)](https://sonarcloud.io/summary/new_code?id=rmontanana_BayesNet)
 [![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=rmontanana_BayesNet&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=rmontanana_BayesNet)
 ![Gitea Last Commit](https://img.shields.io/gitea/last-commit/rmontanana/bayesnet?gitea_url=https://gitea.rmontanana.es:3000&logo=gitea)
-[![Coverage Badge](https://img.shields.io/badge/Coverage-99,1%25-green)](html/index.html)
+[![Coverage Badge](https://img.shields.io/badge/Coverage-97,1%25-green)](html/index.html)
-[![DOI](https://zenodo.org/badge/667782806.svg)](https://doi.org/10.5281/zenodo.14210344)
 
-Bayesian Network Classifiers library
+Bayesian Network Classifiers using libtorch from scratch
 
 ## Dependencies
 
@@ -18,7 +17,7 @@ The only external dependency is [libtorch](https://pytorch.org/cppdocs/installin
 
 ```bash
 wget https://download.pytorch.org/libtorch/nightly/cpu/libtorch-shared-with-deps-latest.zip
-unzip libtorch-shared-with-deps-latest.zip
+unzip libtorch-shared-with-deps-latest.zips
 ```
 
 ## Setup
@@ -72,8 +71,6 @@ make sample fname=tests/data/glass.arff
 
 #### - AODE
 
-#### - A2DE
-
 #### - [BoostAODE](docs/BoostAODE.md)
 
 #### - BoostA2DE

bayesnet/BaseClassifier.h

@@ -14,13 +14,13 @@ namespace bayesnet {
     enum status_t { NORMAL, WARNING, ERROR };
     class BaseClassifier {
     public:
-        virtual ~BaseClassifier() = default;
         // X is nxm std::vector, y is nx1 std::vector
         virtual BaseClassifier& fit(std::vector<std::vector<int>>& X, std::vector<int>& y, const std::vector<std::string>& features, const std::string& className, std::map<std::string, std::vector<int>>& states, const Smoothing_t smoothing) = 0;
         // X is nxm tensor, y is nx1 tensor
         virtual BaseClassifier& fit(torch::Tensor& X, torch::Tensor& y, const std::vector<std::string>& features, const std::string& className, std::map<std::string, std::vector<int>>& states, const Smoothing_t smoothing) = 0;
         virtual BaseClassifier& fit(torch::Tensor& dataset, const std::vector<std::string>& features, const std::string& className, std::map<std::string, std::vector<int>>& states, const Smoothing_t smoothing) = 0;
         virtual BaseClassifier& fit(torch::Tensor& dataset, const std::vector<std::string>& features, const std::string& className, std::map<std::string, std::vector<int>>& states, const torch::Tensor& weights, const Smoothing_t smoothing) = 0;
+        virtual ~BaseClassifier() = default;
         torch::Tensor virtual predict(torch::Tensor& X) = 0;
         std::vector<int> virtual predict(std::vector<std::vector<int >>& X) = 0;
         torch::Tensor virtual predict_proba(torch::Tensor& X) = 0;
@@ -28,8 +28,8 @@ namespace bayesnet {
         status_t virtual getStatus() const = 0;
         float virtual score(std::vector<std::vector<int>>& X, std::vector<int>& y) = 0;
         float virtual score(torch::Tensor& X, torch::Tensor& y) = 0;
-        int virtual getNumberOfNodes() const = 0;
+        int virtual getNumberOfNodes()const = 0;
-        int virtual getNumberOfEdges() const = 0;
+        int virtual getNumberOfEdges()const = 0;
         int virtual getNumberOfStates() const = 0;
         int virtual getClassNumStates() const = 0;
         std::vector<std::string> virtual show() const = 0;
@@ -37,13 +37,11 @@ namespace bayesnet {
         virtual std::string getVersion() = 0;
         std::vector<std::string> virtual topological_order() = 0;
         std::vector<std::string> virtual getNotes() const = 0;
-        std::string virtual dump_cpt() const = 0;
+        std::string virtual dump_cpt()const = 0;
         virtual void setHyperparameters(const nlohmann::json& hyperparameters) = 0;
         std::vector<std::string>& getValidHyperparameters() { return validHyperparameters; }
     protected:
         virtual void trainModel(const torch::Tensor& weights, const Smoothing_t smoothing) = 0;
         std::vector<std::string> validHyperparameters;
-        std::vector<std::string> notes; // Used to store messages occurred during the fit process
-        status_t status = NORMAL;
     };
 }

bayesnet/CMakeLists.txt

@@ -1,5 +1,4 @@
 include_directories(
-    ${BayesNet_SOURCE_DIR}/lib/log
     ${BayesNet_SOURCE_DIR}/lib/mdlp/src
     ${BayesNet_SOURCE_DIR}/lib/folding
     ${BayesNet_SOURCE_DIR}/lib/json/include
@@ -10,4 +9,4 @@ include_directories(
 file(GLOB_RECURSE Sources "*.cc")
 
 add_library(BayesNet ${Sources})
-target_link_libraries(BayesNet fimdlp "${TORCH_LIBRARIES}")
+target_link_libraries(BayesNet mdlp "${TORCH_LIBRARIES}")

bayesnet/classifiers/Classifier.cc

@@ -9,7 +9,16 @@
 #include "Classifier.h"
 
 namespace bayesnet {
-    Classifier::Classifier(Network model) : model(model), m(0), n(0), metrics(Metrics()), fitted(false) {}
+    Classifier::Classifier(Network model) : model(model), m(0), n(0), metrics(Metrics()), fitted(false), device(torch::kCPU)
+    {
+        if (torch::cuda::is_available()) {
+            device = torch::Device(torch::kCUDA);
+            std::cout << "CUDA is available! Using GPU." << std::endl;
+        } else {
+            std::cout << "CUDA is not available. Using CPU." << std::endl;
+        }
+    }
+    const std::string CLASSIFIER_NOT_FITTED = "Classifier has not been fitted";
     Classifier& Classifier::build(const std::vector<std::string>& features, const std::string& className, std::map<std::string, std::vector<int>>& states, const torch::Tensor& weights, const Smoothing_t smoothing)
     {
         this->features = features;
@@ -30,7 +39,7 @@ namespace bayesnet {
     {
         try {
             auto yresized = torch::transpose(ytmp.view({ ytmp.size(0), 1 }), 0, 1);
-            dataset = torch::cat({ dataset, yresized }, 0);
+            dataset = torch::cat({ dataset, yresized }, 0).to(device);
         }
         catch (const std::exception& e) {
             std::stringstream oss;
@@ -49,7 +58,7 @@ namespace bayesnet {
     {
         dataset = X;
         buildDataset(y);
-        const torch::Tensor weights = torch::full({ dataset.size(1) }, 1.0 / dataset.size(1), torch::kDouble);
+        const torch::Tensor weights = torch::full({ dataset.size(1) }, 1.0 / dataset.size(1), torch::kDouble).to(device);
         return build(features, className, states, weights, smoothing);
     }
     // X is nxm where n is the number of features and m the number of samples
@@ -190,4 +199,4 @@ namespace bayesnet {
             throw std::invalid_argument("Invalid hyperparameters" + hyperparameters.dump());
         }
     }
-}
+}

bayesnet/classifiers/Classifier.h

@@ -38,6 +38,7 @@ namespace bayesnet {
         std::string dump_cpt() const override;
         void setHyperparameters(const nlohmann::json& hyperparameters) override; //For classifiers that don't have hyperparameters
     protected:
+        torch::Device device;
         bool fitted;
         unsigned int m, n; // m: number of samples, n: number of features
         Network model;
@@ -46,11 +47,12 @@ namespace bayesnet {
         std::string className;
         std::map<std::string, std::vector<int>> states;
         torch::Tensor dataset; // (n+1)xm tensor
+        status_t status = NORMAL;
+        std::vector<std::string> notes; // Used to store messages occurred during the fit process
         void checkFitParameters();
         virtual void buildModel(const torch::Tensor& weights) = 0;
         void trainModel(const torch::Tensor& weights, const Smoothing_t smoothing) override;
         void buildDataset(torch::Tensor& y);
-        const std::string CLASSIFIER_NOT_FITTED = "Classifier has not been fitted";
     private:
         Classifier& build(const std::vector<std::string>& features, const std::string& className, std::map<std::string, std::vector<int>>& states, const torch::Tensor& weights, const Smoothing_t smoothing);
     };

bayesnet/classifiers/KDB.cc

@@ -3,7 +3,7 @@
 // SPDX-FileType: SOURCE
 // SPDX-License-Identifier: MIT
 // ***************************************************************
-#include "bayesnet/utils/bayesnetUtils.h"
+
 #include "KDB.h"
 
 namespace bayesnet {

bayesnet/classifiers/KDB.h

@@ -7,14 +7,15 @@
 #ifndef KDB_H
 #define KDB_H
 #include <torch/torch.h>
+#include "bayesnet/utils/bayesnetUtils.h"
 #include "Classifier.h"
 namespace bayesnet {
     class KDB : public Classifier {
     private:
         int k;
         float theta;
-    protected:
         void add_m_edges(int idx, std::vector<int>& S, torch::Tensor& weights);
+    protected:
         void buildModel(const torch::Tensor& weights) override;
     public:
         explicit KDB(int k, float theta = 0.03);
@@ -23,4 +24,4 @@ namespace bayesnet {
         std::vector<std::string> graph(const std::string& name = "KDB") const override;
     };
 }
-#endif
+#endif

bayesnet/classifiers/Proposal.cc

@@ -11,7 +11,7 @@ namespace bayesnet {
     Proposal::~Proposal()
     {
         for (auto& [key, value] : discretizers) {
-            delete value; 
+            delete value;
         }
     }
     void Proposal::checkInput(const torch::Tensor& X, const torch::Tensor& y)
@@ -126,4 +126,4 @@ namespace bayesnet {
         }
         return yy;
     }
-}
+}

bayesnet/classifiers/SPODE.cc

@@ -8,29 +8,14 @@
 
 namespace bayesnet {
 
-    SPODE::SPODE(int root) : Classifier(Network()), root(root)
+    SPODE::SPODE(int root) : Classifier(Network()), root(root) {}
-    {
-        validHyperparameters = { "parent" };
-    }
 
-    void SPODE::setHyperparameters(const nlohmann::json& hyperparameters_)
-    {
-        auto hyperparameters = hyperparameters_;
-        if (hyperparameters.contains("parent")) {
-            root = hyperparameters["parent"];
-            hyperparameters.erase("parent");
-        }
-        Classifier::setHyperparameters(hyperparameters);
-    }
     void SPODE::buildModel(const torch::Tensor& weights)
     {
         // 0. Add all nodes to the model
         addNodes();
         // 1. Add edges from the class node to all other nodes
         // 2. Add edges from the root node to all other nodes
-        if (root >= static_cast<int>(features.size())) {
-            throw std::invalid_argument("The parent node is not in the dataset");
-        }
         for (int i = 0; i < static_cast<int>(features.size()); ++i) {
             model.addEdge(className, features[i]);
             if (i != root) {

bayesnet/classifiers/SPODE.h

@@ -10,15 +10,14 @@
 
 namespace bayesnet {
     class SPODE : public Classifier {
+    private:
+        int root;
+    protected:
+        void buildModel(const torch::Tensor& weights) override;
     public:
         explicit SPODE(int root);
         virtual ~SPODE() = default;
-        void setHyperparameters(const nlohmann::json& hyperparameters_) override;
         std::vector<std::string> graph(const std::string& name = "SPODE") const override;
-    protected:
-        void buildModel(const torch::Tensor& weights) override;
-    private:
-        int root;
     };
 }
 #endif

bayesnet/classifiers/SPnDE.cc

@@ -35,4 +35,4 @@ namespace bayesnet {
         return model.graph(name);
     }
 
-}
+}

bayesnet/classifiers/TAN.cc

@@ -7,20 +7,8 @@
 #include "TAN.h"
 
 namespace bayesnet {
-    TAN::TAN() : Classifier(Network())
+    TAN::TAN() : Classifier(Network()) {}
-    {
-        validHyperparameters = { "parent" };
-    }
 
-    void TAN::setHyperparameters(const nlohmann::json& hyperparameters_)
-    {
-        auto hyperparameters = hyperparameters_;
-        if (hyperparameters.contains("parent")) {
-            parent = hyperparameters["parent"];
-            hyperparameters.erase("parent");
-        }
-        Classifier::setHyperparameters(hyperparameters);
-    }
     void TAN::buildModel(const torch::Tensor& weights)
     {
         // 0. Add all nodes to the model
@@ -35,10 +23,7 @@ namespace bayesnet {
             mi.push_back({ i, mi_value });
         }
         sort(mi.begin(), mi.end(), [](const auto& left, const auto& right) {return left.second < right.second;});
-        auto root = parent == -1 ? mi[mi.size() - 1].first : parent;
+        auto root = mi[mi.size() - 1].first;
-        if (root >= static_cast<int>(features.size())) {
-            throw std::invalid_argument("The parent node is not in the dataset");
-        }
         // 2. Compute mutual information between each feature and the class
         auto weights_matrix = metrics.conditionalEdge(weights);
         // 3. Compute the maximum spanning tree

bayesnet/classifiers/TAN.h

@@ -9,15 +9,13 @@
 #include "Classifier.h"
 namespace bayesnet {
     class TAN : public Classifier {
+    private:
+    protected:
+        void buildModel(const torch::Tensor& weights) override;
     public:
         TAN();
         virtual ~TAN() = default;
-        void setHyperparameters(const nlohmann::json& hyperparameters_) override;
         std::vector<std::string> graph(const std::string& name = "TAN") const override;
-    protected:
-        void buildModel(const torch::Tensor& weights) override;
-    private:
-        int parent = -1;
     };
 }
 #endif

bayesnet/classifiers/XSP2DE.cc

@@ -1,575 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#include "XSP2DE.h"
-#include <pthread.h>   // for pthread_setname_np on linux
-#include <cassert>
-#include <cmath>
-#include <limits>
-#include <stdexcept>
-#include <iostream>
-#include "bayesnet/utils/TensorUtils.h"
-
-namespace bayesnet {
-
-// --------------------------------------
-// Constructor
-// --------------------------------------
-XSp2de::XSp2de(int spIndex1, int spIndex2)
-  : superParent1_{ spIndex1 }
-  , superParent2_{ spIndex2 }
-  , nFeatures_{0}
-  , statesClass_{0}
-  , alpha_{1.0}
-  , initializer_{1.0}
-  , semaphore_{ CountingSemaphore::getInstance() }
-  , Classifier(Network())
-{
-  validHyperparameters = { "parent1", "parent2" };
-}
-
-// --------------------------------------
-// setHyperparameters
-// --------------------------------------
-void XSp2de::setHyperparameters(const nlohmann::json &hyperparameters_)
-{
-  auto hyperparameters = hyperparameters_;
-  if (hyperparameters.contains("parent1")) {
-    superParent1_ = hyperparameters["parent1"];
-    hyperparameters.erase("parent1");
-  }
-  if (hyperparameters.contains("parent2")) {
-    superParent2_ = hyperparameters["parent2"];
-    hyperparameters.erase("parent2");
-  }
-  // Hand off anything else to base Classifier
-  Classifier::setHyperparameters(hyperparameters);
-}
-
-// --------------------------------------
-// fitx
-// --------------------------------------
-void XSp2de::fitx(torch::Tensor & X, torch::Tensor & y, 
-                  torch::Tensor & weights_, const Smoothing_t smoothing)
-{
-  m = X.size(1);  // number of samples
-  n = X.size(0);  // number of features
-  dataset = X;
-
-  // Build the dataset in your environment if needed:
-  buildDataset(y);
-
-  // Construct the data structures needed for counting
-  buildModel(weights_);
-
-  // Accumulate counts & convert to probabilities
-  trainModel(weights_, smoothing);
-  fitted = true;
-}
-
-// --------------------------------------
-// buildModel
-// --------------------------------------
-void XSp2de::buildModel(const torch::Tensor &weights)
-{
-  nFeatures_ = n;
-
-  // Derive the number of states for each feature from the dataset
-  // states_[f] = max value in dataset[f] + 1.
-  states_.resize(nFeatures_);
-  for (int f = 0; f < nFeatures_; f++) {
-    // This is naive: we take max in feature f. You might adapt for real data.
-    states_[f] = dataset[f].max().item<int>() + 1;
-  }
-  // Class states:
-  statesClass_ = dataset[-1].max().item<int>() + 1;
-
-  // Initialize the class counts
-  classCounts_.resize(statesClass_, 0.0);
-
-  // For sp1 -> p(sp1Val| c)
-  sp1FeatureCounts_.resize(states_[superParent1_] * statesClass_, 0.0);
-
-  // For sp2 -> p(sp2Val| c)
-  sp2FeatureCounts_.resize(states_[superParent2_] * statesClass_, 0.0);
-
-  // For child features, we store p(childVal | c, sp1Val, sp2Val).
-  // childCounts_ will hold raw counts. We’ll gather them in one big vector.
-  // We need an offset for each feature.
-  childOffsets_.resize(nFeatures_, -1);
-
-  int totalSize = 0;
-  for (int f = 0; f < nFeatures_; f++) {
-    if (f == superParent1_ || f == superParent2_) {
-      // skip the superparents
-      childOffsets_[f] = -1;
-      continue;
-    }
-    childOffsets_[f] = totalSize;
-    // block size for a single child f: states_[f] * statesClass_ 
-    //                               * states_[superParent1_] 
-    //                               * states_[superParent2_].
-    totalSize += (states_[f] * statesClass_ 
-                  * states_[superParent1_] 
-                  * states_[superParent2_]);
-  }
-  childCounts_.resize(totalSize, 0.0);
-}
-
-// --------------------------------------
-// trainModel
-// --------------------------------------
-void XSp2de::trainModel(const torch::Tensor &weights, 
-                        const bayesnet::Smoothing_t smoothing)
-{
-  // Accumulate raw counts
-  for (int i = 0; i < m; i++) {
-    std::vector<int> instance(nFeatures_ + 1);
-    for (int f = 0; f < nFeatures_; f++) {
-      instance[f] = dataset[f][i].item<int>();
-    }
-    instance[nFeatures_] = dataset[-1][i].item<int>();  // class
-    double w = weights[i].item<double>();
-    addSample(instance, w);
-  }
-
-  // Choose alpha based on smoothing:
-  switch (smoothing) {
-    case bayesnet::Smoothing_t::ORIGINAL:
-      alpha_ = 1.0 / m;
-      break;
-    case bayesnet::Smoothing_t::LAPLACE:
-      alpha_ = 1.0;
-      break;
-    default:
-      alpha_ = 0.0; // no smoothing
-  }
-
-  // Large initializer factor for numerical stability
-  initializer_ = std::numeric_limits<double>::max() / (nFeatures_ * nFeatures_);
-
-  // Convert raw counts to probabilities
-  computeProbabilities();
-}
-
-// --------------------------------------
-// addSample
-// --------------------------------------
-void XSp2de::addSample(const std::vector<int> &instance, double weight)
-{
-  if (weight <= 0.0)
-    return;
-
-  int c = instance.back();
-  // increment classCounts
-  classCounts_[c] += weight;
-
-  int sp1Val = instance[superParent1_];
-  int sp2Val = instance[superParent2_];
-
-  // p(sp1|c)
-  sp1FeatureCounts_[sp1Val * statesClass_ + c] += weight;
-
-  // p(sp2|c)
-  sp2FeatureCounts_[sp2Val * statesClass_ + c] += weight;
-
-  // p(childVal| c, sp1Val, sp2Val)
-  for (int f = 0; f < nFeatures_; f++) {
-    if (f == superParent1_ || f == superParent2_)
-      continue;
-
-    int childVal = instance[f];
-    int offset = childOffsets_[f];
-    // block layout: 
-    //    offset + (sp1Val*(states_[sp2_]* states_[f]* statesClass_)) 
-    //            + (sp2Val*(states_[f]* statesClass_)) 
-    //            + childVal*(statesClass_) 
-    //            + c
-    int blockSizeSp2 = states_[superParent2_] 
-                       * states_[f] 
-                       * statesClass_;
-    int blockSizeChild = states_[f] * statesClass_;
-
-    int idx = offset 
-            + sp1Val*blockSizeSp2 
-            + sp2Val*blockSizeChild 
-            + childVal*statesClass_ 
-            + c;
-    childCounts_[idx] += weight;
-  }
-}
-
-// --------------------------------------
-// computeProbabilities
-// --------------------------------------
-void XSp2de::computeProbabilities()
-{
-  double totalCount = std::accumulate(classCounts_.begin(), 
-                                      classCounts_.end(), 0.0);
-
-  // classPriors_
-  classPriors_.resize(statesClass_, 0.0);
-  if (totalCount <= 0.0) {
-    // fallback => uniform
-    double unif = 1.0 / static_cast<double>(statesClass_);
-    for (int c = 0; c < statesClass_; c++) {
-      classPriors_[c] = unif;
-    }
-  } else {
-    for (int c = 0; c < statesClass_; c++) {
-      classPriors_[c] = 
-        (classCounts_[c] + alpha_) 
-        / (totalCount + alpha_ * statesClass_);
-    }
-  }
-
-  // p(sp1Val| c)
-  sp1FeatureProbs_.resize(sp1FeatureCounts_.size());
-  int sp1Card = states_[superParent1_];
-  for (int spVal = 0; spVal < sp1Card; spVal++) {
-    for (int c = 0; c < statesClass_; c++) {
-      double denom = classCounts_[c] + alpha_ * sp1Card;
-      double num = sp1FeatureCounts_[spVal * statesClass_ + c] + alpha_;
-      sp1FeatureProbs_[spVal * statesClass_ + c] = 
-         (denom <= 0.0 ? 0.0 : num / denom);
-    }
-  }
-
-  // p(sp2Val| c)
-  sp2FeatureProbs_.resize(sp2FeatureCounts_.size());
-  int sp2Card = states_[superParent2_];
-  for (int spVal = 0; spVal < sp2Card; spVal++) {
-    for (int c = 0; c < statesClass_; c++) {
-      double denom = classCounts_[c] + alpha_ * sp2Card;
-      double num = sp2FeatureCounts_[spVal * statesClass_ + c] + alpha_;
-      sp2FeatureProbs_[spVal * statesClass_ + c] = 
-         (denom <= 0.0 ? 0.0 : num / denom);
-    }
-  }
-
-  // p(childVal| c, sp1Val, sp2Val)
-  childProbs_.resize(childCounts_.size());
-  int offset = 0;
-  for (int f = 0; f < nFeatures_; f++) {
-    if (f == superParent1_ || f == superParent2_) 
-      continue;
-
-    int fCard = states_[f];
-    int sp1Card_ = states_[superParent1_];
-    int sp2Card_ = states_[superParent2_];
-    int childBlockSizeSp2 = sp2Card_ * fCard * statesClass_;
-    int childBlockSizeF   = fCard * statesClass_;
-
-    int blockSize = fCard * sp1Card_ * sp2Card_ * statesClass_;
-    for (int sp1Val = 0; sp1Val < sp1Card_; sp1Val++) {
-      for (int sp2Val = 0; sp2Val < sp2Card_; sp2Val++) {
-        for (int childVal = 0; childVal < fCard; childVal++) {
-          for (int c = 0; c < statesClass_; c++) {
-            // index in childCounts_ 
-            int idx = offset 
-                    + sp1Val*childBlockSizeSp2 
-                    + sp2Val*childBlockSizeF 
-                    + childVal*statesClass_ 
-                    + c;
-            double num = childCounts_[idx] + alpha_;
-            // denominator is the count of (sp1Val,sp2Val,c) plus alpha * fCard
-            // We can find that by summing childVal dimension, but we already
-            // have it in childCounts_[...] or we can re-check the superparent 
-            // counts if your approach is purely hierarchical. 
-            // Here we'll do it like the XSpode approach: sp1&sp2 are 
-            // conditionally independent given c, so denominators come from 
-            // summing the relevant block or we treat sp1,sp2 as "parents."
-            // A simpler approach: 
-            double sumSp1Sp2C = 0.0;
-            // sum over all childVal:
-            for (int cv = 0; cv < fCard; cv++) {
-              int idx2 = offset
-                       + sp1Val*childBlockSizeSp2
-                       + sp2Val*childBlockSizeF
-                       + cv*statesClass_ + c;
-              sumSp1Sp2C += childCounts_[idx2];
-            }
-            double denom = sumSp1Sp2C + alpha_ * fCard;
-            childProbs_[idx] = (denom <= 0.0 ? 0.0 : num / denom);
-          }
-        }
-      }
-    }
-    offset += blockSize;
-  }
-}
-
-// --------------------------------------
-// predict_proba (single instance)
-// --------------------------------------
-std::vector<double> XSp2de::predict_proba(const std::vector<int> &instance) const
-{
-  if (!fitted) {
-    throw std::logic_error(CLASSIFIER_NOT_FITTED);
-  }
-  std::vector<double> probs(statesClass_, 0.0);
-
-  int sp1Val = instance[superParent1_];
-  int sp2Val = instance[superParent2_];
-
-  // Start with p(c) * p(sp1Val| c) * p(sp2Val| c)
-  for (int c = 0; c < statesClass_; c++) {
-    double pC = classPriors_[c];
-    double pSp1C = sp1FeatureProbs_[sp1Val * statesClass_ + c];
-    double pSp2C = sp2FeatureProbs_[sp2Val * statesClass_ + c];
-    probs[c] = pC * pSp1C * pSp2C * initializer_;
-  }
-
-  // Multiply by each child feature f
-  int offset = 0;
-  for (int f = 0; f < nFeatures_; f++) {
-    if (f == superParent1_ || f == superParent2_) 
-      continue;
-
-    int valF = instance[f];
-    int fCard = states_[f];
-    int sp1Card = states_[superParent1_];
-    int sp2Card = states_[superParent2_];
-    int blockSizeSp2 = sp2Card * fCard * statesClass_;
-    int blockSizeF   = fCard * statesClass_;
-
-    // base index for childProbs_ for this child and sp1Val, sp2Val
-    int base = offset 
-             + sp1Val*blockSizeSp2 
-             + sp2Val*blockSizeF 
-             + valF*statesClass_;
-    for (int c = 0; c < statesClass_; c++) {
-      probs[c] *= childProbs_[base + c];
-    }
-    offset += (fCard * sp1Card * sp2Card * statesClass_);
-  }
-
-  // Normalize
-  normalize(probs);
-  return probs;
-}
-
-// --------------------------------------
-// predict_proba (batch)
-// --------------------------------------
-std::vector<std::vector<double>> XSp2de::predict_proba(std::vector<std::vector<int>> &test_data)
-{
-  int test_size = test_data[0].size();  // each feature is test_data[f], size = #samples
-  int sample_size = test_data.size();   // = nFeatures_
-  std::vector<std::vector<double>> probabilities(
-      test_size, std::vector<double>(statesClass_, 0.0));
-
-  // same concurrency approach
-  int chunk_size = std::min(150, int(test_size / semaphore_.getMaxCount()) + 1);
-  std::vector<std::thread> threads;
-
-  auto worker = [&](const std::vector<std::vector<int>> &samples, 
-                    int begin, 
-                    int chunk, 
-                    int sample_size, 
-                    std::vector<std::vector<double>> &predictions) {
-    std::string threadName =
-      "XSp2de-" + std::to_string(begin) + "-" + std::to_string(chunk);
-#if defined(__linux__)
-    pthread_setname_np(pthread_self(), threadName.c_str());
-#else
-    pthread_setname_np(threadName.c_str());
-#endif
-
-    std::vector<int> instance(sample_size);
-    for (int sample = begin; sample < begin + chunk; ++sample) {
-      for (int feature = 0; feature < sample_size; ++feature) {
-        instance[feature] = samples[feature][sample];
-      }
-      predictions[sample] = predict_proba(instance);
-    }
-    semaphore_.release();
-  };
-
-  for (int begin = 0; begin < test_size; begin += chunk_size) {
-    int chunk = std::min(chunk_size, test_size - begin);
-    semaphore_.acquire();
-    threads.emplace_back(worker, test_data, begin, chunk, sample_size, 
-                         std::ref(probabilities));
-  }
-  for (auto &th : threads) {
-    th.join();
-  }
-  return probabilities;
-}
-
-// --------------------------------------
-// predict (single instance)
-// --------------------------------------
-int XSp2de::predict(const std::vector<int> &instance) const
-{
-  auto p = predict_proba(instance);
-  return static_cast<int>(
-    std::distance(p.begin(), std::max_element(p.begin(), p.end()))
-  );
-}
-
-// --------------------------------------
-// predict (batch of data)
-// --------------------------------------
-std::vector<int> XSp2de::predict(std::vector<std::vector<int>> &test_data)
-{
-  auto probabilities = predict_proba(test_data);
-  std::vector<int> predictions(probabilities.size(), 0);
-
-  for (size_t i = 0; i < probabilities.size(); i++) {
-    predictions[i] = static_cast<int>(
-      std::distance(probabilities[i].begin(), 
-                    std::max_element(probabilities[i].begin(), 
-                                     probabilities[i].end()))
-    );
-  }
-  return predictions;
-}
-
-// --------------------------------------
-// predict (torch::Tensor version)
-// --------------------------------------
-torch::Tensor XSp2de::predict(torch::Tensor &X)
-{
-  auto X_ = TensorUtils::to_matrix(X);
-  auto result_v = predict(X_);
-  return torch::tensor(result_v, torch::kInt32);
-}
-
-// --------------------------------------
-// predict_proba (torch::Tensor version)
-// --------------------------------------
-torch::Tensor XSp2de::predict_proba(torch::Tensor &X)
-{
-  auto X_ = TensorUtils::to_matrix(X);
-  auto result_v = predict_proba(X_);
-  int n_samples = X.size(1);
-  torch::Tensor result =
-    torch::zeros({ n_samples, statesClass_ }, torch::kDouble);
-  for (int i = 0; i < (int)result_v.size(); ++i) {
-    result.index_put_({ i, "..." }, torch::tensor(result_v[i]));
-  }
-  return result;
-}
-
-// --------------------------------------
-// score (torch::Tensor version)
-// --------------------------------------
-float XSp2de::score(torch::Tensor &X, torch::Tensor &y)
-{
-  torch::Tensor y_pred = predict(X);
-  return (y_pred == y).sum().item<float>() / y.size(0);
-}
-
-// --------------------------------------
-// score (vector version)
-// --------------------------------------
-float XSp2de::score(std::vector<std::vector<int>> &X, std::vector<int> &y)
-{
-  auto y_pred = predict(X);
-  int correct = 0;
-  for (size_t i = 0; i < y_pred.size(); ++i) {
-    if (y_pred[i] == y[i]) {
-      correct++;
-    }
-  }
-  return static_cast<float>(correct) / static_cast<float>(y_pred.size());
-}
-
-// --------------------------------------
-// Utility: normalize
-// --------------------------------------
-void XSp2de::normalize(std::vector<double> &v) const
-{
-  double sum = 0.0;
-  for (auto &val : v) {
-    sum += val;
-  }
-  if (sum > 0.0) {
-    for (auto &val : v) {
-      val /= sum;
-    }
-  }
-}
-
-// --------------------------------------
-// to_string
-// --------------------------------------
-std::string XSp2de::to_string() const
-{
-  std::ostringstream oss;
-  oss << "----- XSp2de Model -----\n"
-      << "nFeatures_    = " << nFeatures_    << "\n"
-      << "superParent1_ = " << superParent1_ << "\n"
-      << "superParent2_ = " << superParent2_ << "\n"
-      << "statesClass_  = " << statesClass_  << "\n\n";
-
-  oss << "States: [";
-  for (auto s : states_) oss << s << " ";
-  oss << "]\n";
-
-  oss << "classCounts_:\n";
-  for (auto v : classCounts_) oss << v << " ";
-  oss << "\nclassPriors_:\n";
-  for (auto v : classPriors_) oss << v << " ";
-  oss << "\nsp1FeatureCounts_ (size=" << sp1FeatureCounts_.size() << ")\n";
-  for (auto v : sp1FeatureCounts_) oss << v << " ";
-  oss << "\nsp2FeatureCounts_ (size=" << sp2FeatureCounts_.size() << ")\n";
-  for (auto v : sp2FeatureCounts_) oss << v << " ";
-  oss << "\nchildCounts_ (size=" << childCounts_.size() << ")\n";
-  for (auto v : childCounts_) oss << v << " ";
-
-  oss << "\nchildOffsets_:\n";
-  for (auto c : childOffsets_) oss << c << " ";
-
-  oss << "\n----------------------------------------\n";
-  return oss.str();
-}
-
-// --------------------------------------
-// Some introspection about the graph
-// --------------------------------------
-int XSp2de::getNumberOfNodes() const 
-{
-  // nFeatures + 1 class node
-  return nFeatures_ + 1;
-}
-
-int XSp2de::getClassNumStates() const 
-{ 
-  return statesClass_; 
-}
-
-int XSp2de::getNFeatures() const 
-{ 
-  return nFeatures_; 
-}
-
-int XSp2de::getNumberOfStates() const
-{
-  // purely an example. Possibly you want to sum up actual 
-  // cardinalities or something else. 
-  return std::accumulate(states_.begin(), states_.end(), 0) * nFeatures_;
-}
-
-int XSp2de::getNumberOfEdges() const
-{
-  // In an SPNDE with n=2, for each feature we have edges from class, sp1, sp2. 
-  // So that’s 3*(nFeatures_) edges, minus the ones for the superparents themselves, 
-  // plus the edges from class->superparent1, class->superparent2. 
-  // For a quick approximation:
-  //   - class->sp1, class->sp2 => 2 edges
-  //   - class->child => (nFeatures -2) edges
-  //   - sp1->child, sp2->child => 2*(nFeatures -2) edges
-  // total = 2 + (nFeatures-2) + 2*(nFeatures-2) = 2 + 3*(nFeatures-2) 
-  //         = 3nFeatures - 4 (just an example).
-  // You can adapt to your liking:
-  return 3 * nFeatures_ - 4; 
-}
-
-} // namespace bayesnet
-

bayesnet/classifiers/XSP2DE.h

@@ -1,75 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#ifndef XSP2DE_H
-#define XSP2DE_H
-
-#include "Classifier.h"
-#include "bayesnet/utils/CountingSemaphore.h"
-#include <torch/torch.h>
-#include <vector>
-
-namespace bayesnet {
-
-class XSp2de : public Classifier {
-  public:
-    XSp2de(int spIndex1, int spIndex2);
-    void setHyperparameters(const nlohmann::json &hyperparameters_) override;
-    void fitx(torch::Tensor &X, torch::Tensor &y, torch::Tensor &weights_, const Smoothing_t smoothing);
-    std::vector<double> predict_proba(const std::vector<int> &instance) const;
-    std::vector<std::vector<double>> predict_proba(std::vector<std::vector<int>> &test_data) override;
-    int predict(const std::vector<int> &instance) const;
-    std::vector<int> predict(std::vector<std::vector<int>> &test_data) override;
-    torch::Tensor predict(torch::Tensor &X) override;
-    torch::Tensor predict_proba(torch::Tensor &X) override;
-
-    float score(torch::Tensor &X, torch::Tensor &y) override;
-    float score(std::vector<std::vector<int>> &X, std::vector<int> &y) override;
-    std::string to_string() const;
-    std::vector<std::string> graph(const std::string &title) const override {
-        return std::vector<std::string>({title});
-    }
-
-    int getNumberOfNodes() const override;
-    int getNumberOfEdges() const override;
-    int getNFeatures() const;
-    int getClassNumStates() const override;
-    int getNumberOfStates() const override;
-
-  protected:
-    void buildModel(const torch::Tensor &weights) override;
-    void trainModel(const torch::Tensor &weights, const bayesnet::Smoothing_t smoothing) override;
-
-  private:
-    void addSample(const std::vector<int> &instance, double weight);
-    void normalize(std::vector<double> &v) const;
-    void computeProbabilities();
-
-    int superParent1_;
-    int superParent2_;
-    int nFeatures_;
-    int statesClass_;
-    double alpha_;
-    double initializer_;
-
-    std::vector<int> states_;
-    std::vector<double> classCounts_;
-    std::vector<double> classPriors_;
-    std::vector<double> sp1FeatureCounts_, sp1FeatureProbs_;
-    std::vector<double> sp2FeatureCounts_, sp2FeatureProbs_;
-    // childOffsets_[f] will be the offset into childCounts_ for feature f.
-    // If f is either superParent1 or superParent2, childOffsets_[f] = -1
-    std::vector<int> childOffsets_;
-    // For each child f, we store p(x_f | c, sp1Val, sp2Val).  We'll store the raw
-    // counts in childCounts_, and the probabilities in childProbs_, with a
-    // dimension block of size: states_[f]* statesClass_* states_[sp1]* states_[sp2].
-    std::vector<double> childCounts_;
-    std::vector<double> childProbs_;
-    CountingSemaphore &semaphore_;
-};
-
-} // namespace bayesnet
-#endif // XSP2DE_H

bayesnet/classifiers/XSPODE.cc

@@ -1,450 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-#include <algorithm>
-#include <cmath>
-#include <limits>
-#include <numeric>
-#include <sstream>
-#include <stdexcept>
-#include "XSPODE.h"
-#include "bayesnet/utils/TensorUtils.h"
-
-namespace bayesnet {
-
-  // --------------------------------------
-  // Constructor
-  // --------------------------------------
-  XSpode::XSpode(int spIndex)
-    : superParent_{ spIndex }, nFeatures_{ 0 }, statesClass_{ 0 }, alpha_{ 1.0 },
-    initializer_{ 1.0 }, semaphore_{ CountingSemaphore::getInstance() },
-    Classifier(Network())
-  {
-    validHyperparameters = { "parent" };
-  }
-
-  void XSpode::setHyperparameters(const nlohmann::json& hyperparameters_)
-  {
-    auto hyperparameters = hyperparameters_;
-    if (hyperparameters.contains("parent")) {
-      superParent_ = hyperparameters["parent"];
-      hyperparameters.erase("parent");
-    }
-    Classifier::setHyperparameters(hyperparameters);
-  }
-
-  void XSpode::fitx(torch::Tensor & X, torch::Tensor& y, torch::Tensor& weights_, const Smoothing_t smoothing)
-  {
-    m = X.size(1);
-    n = X.size(0);
-    dataset = X;
-    buildDataset(y);
-    buildModel(weights_);
-    trainModel(weights_, smoothing);
-    fitted = true;
-  }
-
-  // --------------------------------------
-  // trainModel
-  // --------------------------------------
-  // Initialize storage needed for the super-parent and child features counts and
-  // probs.
-  // --------------------------------------
-  void XSpode::buildModel(const torch::Tensor& weights)
-  {
-    int numInstances = m;
-    nFeatures_ = n;
-
-    // Derive the number of states for each feature and for the class.
-    // (This is just one approach; adapt to match your environment.)
-    // Here, we assume the user also gave us the total #states per feature in e.g.
-    // statesMap. We'll simply reconstruct the integer states_ array. The last
-    // entry is statesClass_.
-    states_.resize(nFeatures_);
-    for (int f = 0; f < nFeatures_; f++) {
-      // Suppose you look up in “statesMap” by the feature name, or read directly
-      // from X. We'll assume states_[f] = max value in X[f] + 1.
-      states_[f] = dataset[f].max().item<int>() + 1;
-    }
-    // For the class: states_.back() = max(y)+1
-    statesClass_ = dataset[-1].max().item<int>() + 1;
-
-    // Initialize counts
-    classCounts_.resize(statesClass_, 0.0);
-    // p(x_sp = spVal | c)
-    // We'll store these counts in spFeatureCounts_[spVal * statesClass_ + c].
-    spFeatureCounts_.resize(states_[superParent_] * statesClass_, 0.0);
-
-    // For each child ≠ sp, we store p(childVal| c, spVal) in a separate block of
-    // childCounts_. childCounts_ will be sized as sum_{child≠sp} (states_[child]
-    // * statesClass_ * states_[sp]). We also need an offset for each child to
-    // index into childCounts_.
-    childOffsets_.resize(nFeatures_, -1);
-    int totalSize = 0;
-    for (int f = 0; f < nFeatures_; f++) {
-      if (f == superParent_)
-        continue; // skip sp
-      childOffsets_[f] = totalSize;
-      // block size for this child's counts: states_[f] * statesClass_ *
-      // states_[superParent_]
-      totalSize += (states_[f] * statesClass_ * states_[superParent_]);
-    }
-    childCounts_.resize(totalSize, 0.0);
-  }
-  // --------------------------------------
-  // buildModel
-  // --------------------------------------
-  //
-  // We only store conditional probabilities for:
-  //   p(x_sp| c)   (the super-parent feature)
-  //   p(x_child| c, x_sp)  for all child ≠ sp
-  //
-  // --------------------------------------
-  void XSpode::trainModel(const torch::Tensor& weights,
-    const bayesnet::Smoothing_t smoothing)
-  {
-    // Accumulate raw counts
-    for (int i = 0; i < m; i++) {
-      std::vector<int> instance(nFeatures_ + 1);
-      for (int f = 0; f < nFeatures_; f++) {
-        instance[f] = dataset[f][i].item<int>();
-      }
-      instance[nFeatures_] = dataset[-1][i].item<int>();
-      addSample(instance, weights[i].item<double>());
-    }
-    switch (smoothing) {
-      case bayesnet::Smoothing_t::ORIGINAL:
-        alpha_ = 1.0 / m;
-        break;
-      case bayesnet::Smoothing_t::LAPLACE:
-        alpha_ = 1.0;
-        break;
-      default:
-        alpha_ = 0.0; // No smoothing
-    }
-    initializer_ = std::numeric_limits<double>::max() /
-      (nFeatures_ * nFeatures_); // for numerical stability
-    // Convert raw counts to probabilities
-    computeProbabilities();
-  }
-
-  // --------------------------------------
-  // addSample
-  // --------------------------------------
-  //
-  // instance has size nFeatures_ + 1, with the class at the end.
-  // We add 1 to the appropriate counters for each (c, superParentVal, childVal).
-  //
-  void XSpode::addSample(const std::vector<int>& instance, double weight)
-  {
-    if (weight <= 0.0)
-      return;
-
-    int c = instance.back();
-    // (A) increment classCounts
-    classCounts_[c] += weight;
-
-    // (B) increment super-parent counts => p(x_sp | c)
-    int spVal = instance[superParent_];
-    spFeatureCounts_[spVal * statesClass_ + c] += weight;
-
-    // (C) increment child counts => p(childVal | c, x_sp)
-    for (int f = 0; f < nFeatures_; f++) {
-      if (f == superParent_)
-        continue;
-      int childVal = instance[f];
-      int offset = childOffsets_[f];
-      // Compute index in childCounts_.
-      // Layout: [ offset + (spVal * states_[f] + childVal) * statesClass_ + c ]
-      int blockSize = states_[f] * statesClass_;
-      int idx = offset + spVal * blockSize + childVal * statesClass_ + c;
-      childCounts_[idx] += weight;
-    }
-  }
-
-  // --------------------------------------
-  // computeProbabilities
-  // --------------------------------------
-  //
-  // Once all samples are added in COUNTS mode, call this to:
-  //    p(c)
-  //    p(x_sp = spVal | c)
-  //    p(x_child = v | c, x_sp = s_sp)
-  //
-  // --------------------------------------
-  void XSpode::computeProbabilities()
-  {
-    double totalCount =
-      std::accumulate(classCounts_.begin(), classCounts_.end(), 0.0);
-
-    // p(c) => classPriors_
-    classPriors_.resize(statesClass_, 0.0);
-    if (totalCount <= 0.0) {
-      // fallback => uniform
-      double unif = 1.0 / static_cast<double>(statesClass_);
-      for (int c = 0; c < statesClass_; c++) {
-        classPriors_[c] = unif;
-      }
-    } else {
-      for (int c = 0; c < statesClass_; c++) {
-        classPriors_[c] =
-          (classCounts_[c] + alpha_) / (totalCount + alpha_ * statesClass_);
-      }
-    }
-
-    // p(x_sp | c)
-    spFeatureProbs_.resize(spFeatureCounts_.size());
-    // denominator for spVal * statesClass_ + c is just classCounts_[c] + alpha_ *
-    // (#states of sp)
-    int spCard = states_[superParent_];
-    for (int spVal = 0; spVal < spCard; spVal++) {
-      for (int c = 0; c < statesClass_; c++) {
-        double denom = classCounts_[c] + alpha_ * spCard;
-        double num = spFeatureCounts_[spVal * statesClass_ + c] + alpha_;
-        spFeatureProbs_[spVal * statesClass_ + c] = (denom <= 0.0 ? 0.0 : num / denom);
-      }
-    }
-
-    // p(x_child | c, x_sp)
-    childProbs_.resize(childCounts_.size());
-    for (int f = 0; f < nFeatures_; f++) {
-      if (f == superParent_)
-        continue;
-      int offset = childOffsets_[f];
-      int childCard = states_[f];
-
-      // For each spVal, c, childVal in childCounts_:
-      for (int spVal = 0; spVal < spCard; spVal++) {
-        for (int childVal = 0; childVal < childCard; childVal++) {
-          for (int c = 0; c < statesClass_; c++) {
-            int idx = offset + spVal * (childCard * statesClass_) +
-              childVal * statesClass_ + c;
-
-            double num = childCounts_[idx] + alpha_;
-            // denominator = spFeatureCounts_[spVal * statesClass_ + c] + alpha_ *
-            // (#states of child)
-            double denom =
-              spFeatureCounts_[spVal * statesClass_ + c] + alpha_ * childCard;
-            childProbs_[idx] = (denom <= 0.0 ? 0.0 : num / denom);
-          }
-        }
-      }
-    }
-  }
-
-  // --------------------------------------
-  // predict_proba
-  // --------------------------------------
-  //
-  // For a single instance x of dimension nFeatures_:
-  //  P(c | x) ∝ p(c) × p(x_sp | c) × ∏(child ≠ sp) p(x_child | c, x_sp).
-  //
-  // --------------------------------------
-  std::vector<double> XSpode::predict_proba(const std::vector<int>& instance) const
-  {
-    if (!fitted) {
-      throw std::logic_error(CLASSIFIER_NOT_FITTED);
-    }
-    std::vector<double> probs(statesClass_, 0.0);
-    // Multiply p(c) × p(x_sp | c)
-    int spVal = instance[superParent_];
-    for (int c = 0; c < statesClass_; c++) {
-      double pc = classPriors_[c];
-      double pSpC = spFeatureProbs_[spVal * statesClass_ + c];
-      probs[c] = pc * pSpC * initializer_;
-    }
-
-    // Multiply by each child’s probability p(x_child | c, x_sp)
-    for (int feature = 0; feature < nFeatures_; feature++) {
-      if (feature == superParent_)
-        continue; // skip sp
-      int sf = instance[feature];
-      int offset = childOffsets_[feature];
-      int childCard = states_[feature]; // not used directly, but for clarity
-      // Index into childProbs_ = offset + spVal*(childCard*statesClass_) +
-      // childVal*statesClass_ + c
-      int base = offset + spVal * (childCard * statesClass_) + sf * statesClass_;
-      for (int c = 0; c < statesClass_; c++) {
-        probs[c] *= childProbs_[base + c];
-      }
-    }
-
-    // Normalize
-    normalize(probs);
-    return probs;
-  }
-  std::vector<std::vector<double>> XSpode::predict_proba(std::vector<std::vector<int>>& test_data)
-  {
-    int test_size = test_data[0].size();
-    int sample_size = test_data.size();
-    auto probabilities = std::vector<std::vector<double>>(
-      test_size, std::vector<double>(statesClass_));
-
-    int chunk_size = std::min(150, int(test_size / semaphore_.getMaxCount()) + 1);
-    std::vector<std::thread> threads;
-    auto worker = [&](const std::vector<std::vector<int>>& samples, int begin,
-      int chunk, int sample_size,
-      std::vector<std::vector<double>>& predictions) {
-        std::string threadName =
-          "(V)PWorker-" + std::to_string(begin) + "-" + std::to_string(chunk);
-#if defined(__linux__)
-        pthread_setname_np(pthread_self(), threadName.c_str());
-#else
-        pthread_setname_np(threadName.c_str());
-#endif
-
-        std::vector<int> instance(sample_size);
-        for (int sample = begin; sample < begin + chunk; ++sample) {
-          for (int feature = 0; feature < sample_size; ++feature) {
-            instance[feature] = samples[feature][sample];
-          }
-          predictions[sample] = predict_proba(instance);
-        }
-        semaphore_.release();
-      };
-    for (int begin = 0; begin < test_size; begin += chunk_size) {
-      int chunk = std::min(chunk_size, test_size - begin);
-      semaphore_.acquire();
-      threads.emplace_back(worker, test_data, begin, chunk, sample_size, std::ref(probabilities));
-    }
-    for (auto& thread : threads) {
-      thread.join();
-    }
-    return probabilities;
-  }
-
-  // --------------------------------------
-  // Utility: normalize
-  // --------------------------------------
-  void XSpode::normalize(std::vector<double>& v) const
-  {
-    double sum = 0.0;
-    for (auto val : v) {
-      sum += val;
-    }
-    if (sum <= 0.0) {
-      return;
-    }
-    for (auto& val : v) {
-      val /= sum;
-    }
-  }
-
-  // --------------------------------------
-  // representation of the model
-  // --------------------------------------
-  std::string XSpode::to_string() const
-  {
-    std::ostringstream oss;
-    oss << "----- XSpode Model -----" << std::endl
-      << "nFeatures_  = " << nFeatures_ << std::endl
-      << "superParent_ = " << superParent_ << std::endl
-      << "statesClass_ = " << statesClass_ << std::endl
-      << std::endl;
-
-    oss << "States: [";
-    for (int s : states_)
-      oss << s << " ";
-    oss << "]" << std::endl;
-    oss << "classCounts_: [";
-    for (double c : classCounts_)
-      oss << c << " ";
-    oss << "]" << std::endl;
-    oss << "classPriors_: [";
-    for (double c : classPriors_)
-      oss << c << " ";
-    oss << "]" << std::endl;
-    oss << "spFeatureCounts_: size = " << spFeatureCounts_.size() << std::endl
-      << "[";
-    for (double c : spFeatureCounts_)
-      oss << c << " ";
-    oss << "]" << std::endl;
-    oss << "spFeatureProbs_: size = " << spFeatureProbs_.size() << std::endl
-      << "[";
-    for (double c : spFeatureProbs_)
-      oss << c << " ";
-    oss << "]" << std::endl;
-    oss << "childCounts_: size = " << childCounts_.size() << std::endl << "[";
-    for (double cc : childCounts_)
-      oss << cc << " ";
-    oss << "]" << std::endl;
-
-    for (double cp : childProbs_)
-      oss << cp << " ";
-    oss << "]" << std::endl;
-    oss << "childOffsets_: [";
-    for (int co : childOffsets_)
-      oss << co << " ";
-    oss << "]" << std::endl;
-    oss << std::string(40,'-') << std::endl;
-    return oss.str();
-  }
-  int XSpode::getNumberOfNodes() const { return nFeatures_ + 1; }
-  int XSpode::getClassNumStates() const { return statesClass_; }
-  int XSpode::getNFeatures() const { return nFeatures_; }
-  int XSpode::getNumberOfStates() const
-  {
-    return std::accumulate(states_.begin(), states_.end(), 0) * nFeatures_;
-  }
-  int XSpode::getNumberOfEdges() const
-  {
-    return 2 * nFeatures_ + 1;
-  }
-
-  // ------------------------------------------------------
-  // Predict overrides (classifier interface)
-  // ------------------------------------------------------
-  int XSpode::predict(const std::vector<int>& instance) const
-  {
-    auto p = predict_proba(instance);
-    return static_cast<int>(std::distance(p.begin(), std::max_element(p.begin(), p.end())));
-  }
-  std::vector<int> XSpode::predict(std::vector<std::vector<int>>& test_data)
-  {
-    auto probabilities = predict_proba(test_data);
-    std::vector<int> predictions(probabilities.size(), 0);
-
-    for (size_t i = 0; i < probabilities.size(); i++) {
-      predictions[i] = std::distance(
-        probabilities[i].begin(),
-        std::max_element(probabilities[i].begin(), probabilities[i].end()));
-    }
-    return predictions;
-  }
-  torch::Tensor XSpode::predict(torch::Tensor& X)
-  {
-    auto X_ = TensorUtils::to_matrix(X);
-    auto result_v = predict(X_);
-    return torch::tensor(result_v, torch::kInt32);
-  }
-  torch::Tensor XSpode::predict_proba(torch::Tensor& X)
-  {
-    auto X_ = TensorUtils::to_matrix(X);
-    auto result_v = predict_proba(X_);
-    int n_samples = X.size(1);
-    torch::Tensor result =
-      torch::zeros({ n_samples, statesClass_ }, torch::kDouble);
-    for (int i = 0; i < result_v.size(); ++i) {
-      result.index_put_({ i, "..." }, torch::tensor(result_v[i]));
-    }
-    return result;
-  }
-  float XSpode::score(torch::Tensor& X, torch::Tensor& y)
-  {
-    torch::Tensor y_pred = predict(X);
-    return (y_pred == y).sum().item<float>() / y.size(0);
-  }
-  float XSpode::score(std::vector<std::vector<int>>& X, std::vector<int>& y)
-  {
-    auto y_pred = this->predict(X);
-    int correct = 0;
-    for (int i = 0; i < y_pred.size(); ++i) {
-      if (y_pred[i] == y[i]) {
-        correct++;
-      }
-    }
-    return (double)correct / y_pred.size();
-  }
-} // namespace bayesnet

bayesnet/classifiers/XSPODE.h

@@ -1,76 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#ifndef XSPODE_H
-#define XSPODE_H
-
-#include <vector>
-#include <torch/torch.h>
-#include "Classifier.h"
-#include "bayesnet/utils/CountingSemaphore.h"
-
-namespace bayesnet {
-
-    class XSpode : public Classifier {
-    public:
-        explicit XSpode(int spIndex);
-        std::vector<double> predict_proba(const std::vector<int>& instance) const;
-        std::vector<std::vector<double>> predict_proba(std::vector<std::vector<int>>& X) override;
-        int predict(const std::vector<int>& instance) const;
-        void normalize(std::vector<double>& v) const;
-        std::string to_string() const;
-        int getNFeatures() const;
-        int getNumberOfNodes() const override;
-        int getNumberOfEdges() const override;
-        int getNumberOfStates() const override;
-        int getClassNumStates() const override;
-        std::vector<int>& getStates();
-        std::vector<std::string> graph(const std::string& title) const override { return std::vector<std::string>({ title }); }
-        void fitx(torch::Tensor& X, torch::Tensor& y, torch::Tensor& weights_, const Smoothing_t smoothing);
-        void setHyperparameters(const nlohmann::json& hyperparameters_) override;
-
-        //
-        // Classifier interface
-        //
-        torch::Tensor predict(torch::Tensor& X) override;
-        std::vector<int> predict(std::vector<std::vector<int>>& X) override;
-        torch::Tensor predict_proba(torch::Tensor& X) override;
-        float score(torch::Tensor& X, torch::Tensor& y) override;
-        float score(std::vector<std::vector<int>>& X, std::vector<int>& y) override;
-    protected:
-        void buildModel(const torch::Tensor& weights) override;
-        void trainModel(const torch::Tensor& weights, const bayesnet::Smoothing_t smoothing) override;
-    private:
-        void addSample(const std::vector<int>& instance, double weight);
-        void computeProbabilities();
-        int superParent_;
-        int nFeatures_;
-        int statesClass_;
-        std::vector<int> states_;          // [states_feat0, ..., states_feat(N-1)] (class not included in this array)
-
-        // Class counts
-        std::vector<double> classCounts_;  // [c], accumulative
-        std::vector<double> classPriors_;  // [c], after normalization
-
-        // For p(x_sp = spVal | c)
-        std::vector<double> spFeatureCounts_; // [spVal * statesClass_ + c]
-        std::vector<double> spFeatureProbs_;  // same shape, after normalization
-
-        // For p(x_child = childVal | x_sp = spVal, c)
-        // childCounts_ is big enough to hold all child features except sp:
-        //   For each child f, we store childOffsets_[f] as the start index, then
-        //   childVal, spVal, c => the data.
-        std::vector<double> childCounts_;
-        std::vector<double> childProbs_;
-        std::vector<int>    childOffsets_;
-
-        double alpha_ = 1.0;
-        double initializer_; // for numerical stability
-        CountingSemaphore& semaphore_;
-    };
-}
-
-#endif // XSPODE_H

bayesnet/ensembles/AODELd.cc

@@ -20,8 +20,7 @@ namespace bayesnet {
         // Fills std::vectors Xv & yv with the data from tensors X_ (discretized) & y
         states = fit_local_discretization(y);
         // We have discretized the input data
-        // 1st we need to fit the model to build the normal AODE structure, Ensemble::fit  
+        // 1st we need to fit the model to build the normal TAN structure, TAN::fit initializes the base Bayesian network
-        // calls buildModel to initialize the base models
         Ensemble::fit(dataset, features, className, states, smoothing);
         return *this;
 

bayesnet/ensembles/Boost.cc

@@ -3,266 +3,244 @@
 // SPDX-FileType: SOURCE
 // SPDX-License-Identifier: MIT
 // ***************************************************************
-#include "Boost.h"
+#include <folding.hpp>
 #include "bayesnet/feature_selection/CFS.h"
 #include "bayesnet/feature_selection/FCBF.h"
 #include "bayesnet/feature_selection/IWSS.h"
-#include <folding.hpp>
+#include "Boost.h"
 
 namespace bayesnet {
-Boost::Boost(bool predict_voting) : Ensemble(predict_voting) {
+    Boost::Boost(bool predict_voting) : Ensemble(predict_voting)
-    validHyperparameters = {"alpha_block", "order",        "convergence",    "convergence_best", "bisection",
+    {
-                            "threshold",   "maxTolerance", "predict_voting", "select_features",  "block_update"};
+        validHyperparameters = { "order", "convergence", "convergence_best", "bisection", "threshold", "maxTolerance",
-}
+        "predict_voting", "select_features", "block_update" };
-void Boost::setHyperparameters(const nlohmann::json &hyperparameters_) {
+    }
-    auto hyperparameters = hyperparameters_;
+    void Boost::setHyperparameters(const nlohmann::json& hyperparameters_)
-    if (hyperparameters.contains("order")) {
+    {
-        std::vector<std::string> algos = {Orders.ASC, Orders.DESC, Orders.RAND};
+        auto hyperparameters = hyperparameters_;
-        order_algorithm = hyperparameters["order"];
+        if (hyperparameters.contains("order")) {
-        if (std::find(algos.begin(), algos.end(), order_algorithm) == algos.end()) {
+            std::vector<std::string> algos = { Orders.ASC, Orders.DESC, Orders.RAND };
-            throw std::invalid_argument("Invalid order algorithm, valid values [" + Orders.ASC + ", " + Orders.DESC +
+            order_algorithm = hyperparameters["order"];
-                                        ", " + Orders.RAND + "]");
+            if (std::find(algos.begin(), algos.end(), order_algorithm) == algos.end()) {
+                throw std::invalid_argument("Invalid order algorithm, valid values [" + Orders.ASC + ", " + Orders.DESC + ", " + Orders.RAND + "]");
+            }
+            hyperparameters.erase("order");
         }
-        hyperparameters.erase("order");
+        if (hyperparameters.contains("convergence")) {
-    }
+            convergence = hyperparameters["convergence"];
-    if (hyperparameters.contains("alpha_block")) {
+            hyperparameters.erase("convergence");
-        alpha_block = hyperparameters["alpha_block"];
-        hyperparameters.erase("alpha_block");
-    }
-    if (hyperparameters.contains("convergence")) {
-        convergence = hyperparameters["convergence"];
-        hyperparameters.erase("convergence");
-    }
-    if (hyperparameters.contains("convergence_best")) {
-        convergence_best = hyperparameters["convergence_best"];
-        hyperparameters.erase("convergence_best");
-    }
-    if (hyperparameters.contains("bisection")) {
-        bisection = hyperparameters["bisection"];
-        hyperparameters.erase("bisection");
-    }
-    if (hyperparameters.contains("threshold")) {
-        threshold = hyperparameters["threshold"];
-        hyperparameters.erase("threshold");
-    }
-    if (hyperparameters.contains("maxTolerance")) {
-        maxTolerance = hyperparameters["maxTolerance"];
-        if (maxTolerance < 1 || maxTolerance > 6)
-            throw std::invalid_argument("Invalid maxTolerance value, must be greater in [1, 6]");
-        hyperparameters.erase("maxTolerance");
-    }
-    if (hyperparameters.contains("predict_voting")) {
-        predict_voting = hyperparameters["predict_voting"];
-        hyperparameters.erase("predict_voting");
-    }
-    if (hyperparameters.contains("select_features")) {
-        auto selectedAlgorithm = hyperparameters["select_features"];
-        std::vector<std::string> algos = {SelectFeatures.IWSS, SelectFeatures.CFS, SelectFeatures.FCBF};
-        selectFeatures = true;
-        select_features_algorithm = selectedAlgorithm;
-        if (std::find(algos.begin(), algos.end(), selectedAlgorithm) == algos.end()) {
-            throw std::invalid_argument("Invalid selectFeatures value, valid values [" + SelectFeatures.IWSS + ", " +
-                                        SelectFeatures.CFS + ", " + SelectFeatures.FCBF + "]");
         }
-        hyperparameters.erase("select_features");
+        if (hyperparameters.contains("convergence_best")) {
-    }
+            convergence_best = hyperparameters["convergence_best"];
-    if (hyperparameters.contains("block_update")) {
+            hyperparameters.erase("convergence_best");
-        block_update = hyperparameters["block_update"];
-        hyperparameters.erase("block_update");
-    }
-    if (block_update && alpha_block) {
-        throw std::invalid_argument("alpha_block and block_update cannot be true at the same time");
-    }
-    if (block_update && !bisection) {
-        throw std::invalid_argument("block_update needs bisection to be true");
-    }
-    Classifier::setHyperparameters(hyperparameters);
-}
-void Boost::add_model(std::unique_ptr<Classifier> model, double significance) {
-    models.push_back(std::move(model));
-    n_models++;
-    significanceModels.push_back(significance);
-}
-void Boost::remove_last_model() {
-    models.pop_back();
-    significanceModels.pop_back();
-    n_models--;
-}
-void Boost::buildModel(const torch::Tensor &weights) {
-    // Models shall be built in trainModel
-    models.clear();
-    significanceModels.clear();
-    n_models = 0;
-    // Prepare the validation dataset
-    auto y_ = dataset.index({-1, "..."});
-    if (convergence) {
-        // Prepare train & validation sets from train data
-        auto fold = folding::StratifiedKFold(5, y_, 271);
-        auto [train, test] = fold.getFold(0);
-        auto train_t = torch::tensor(train);
-        auto test_t = torch::tensor(test);
-        // Get train and validation sets
-        X_train = dataset.index({torch::indexing::Slice(0, dataset.size(0) - 1), train_t});
-        y_train = dataset.index({-1, train_t});
-        X_test = dataset.index({torch::indexing::Slice(0, dataset.size(0) - 1), test_t});
-        y_test = dataset.index({-1, test_t});
-        dataset = X_train;
-        m = X_train.size(1);
-        auto n_classes = states.at(className).size();
-        // Build dataset with train data
-        buildDataset(y_train);
-        metrics = Metrics(dataset, features, className, n_classes);
-    } else {
-        // Use all data to train
-        X_train = dataset.index({torch::indexing::Slice(0, dataset.size(0) - 1), "..."});
-        y_train = y_;
-    }
-}
-std::vector<int> Boost::featureSelection(torch::Tensor &weights_) {
-    int maxFeatures = 0;
-    if (select_features_algorithm == SelectFeatures.CFS) {
-        featureSelector = new CFS(dataset, features, className, maxFeatures, states.at(className).size(), weights_);
-    } else if (select_features_algorithm == SelectFeatures.IWSS) {
-        if (threshold < 0 || threshold > 0.5) {
-            throw std::invalid_argument("Invalid threshold value for " + SelectFeatures.IWSS + " [0, 0.5]");
         }
-        featureSelector =
+        if (hyperparameters.contains("bisection")) {
-            new IWSS(dataset, features, className, maxFeatures, states.at(className).size(), weights_, threshold);
+            bisection = hyperparameters["bisection"];
-    } else if (select_features_algorithm == SelectFeatures.FCBF) {
+            hyperparameters.erase("bisection");
-        if (threshold < 1e-7 || threshold > 1) {
-            throw std::invalid_argument("Invalid threshold value for " + SelectFeatures.FCBF + " [1e-7, 1]");
         }
-        featureSelector =
+        if (hyperparameters.contains("threshold")) {
-            new FCBF(dataset, features, className, maxFeatures, states.at(className).size(), weights_, threshold);
+            threshold = hyperparameters["threshold"];
+            hyperparameters.erase("threshold");
+        }
+        if (hyperparameters.contains("maxTolerance")) {
+            maxTolerance = hyperparameters["maxTolerance"];
+            if (maxTolerance < 1 || maxTolerance > 4)
+                throw std::invalid_argument("Invalid maxTolerance value, must be greater in [1, 4]");
+            hyperparameters.erase("maxTolerance");
+        }
+        if (hyperparameters.contains("predict_voting")) {
+            predict_voting = hyperparameters["predict_voting"];
+            hyperparameters.erase("predict_voting");
+        }
+        if (hyperparameters.contains("select_features")) {
+            auto selectedAlgorithm = hyperparameters["select_features"];
+            std::vector<std::string> algos = { SelectFeatures.IWSS, SelectFeatures.CFS, SelectFeatures.FCBF };
+            selectFeatures = true;
+            select_features_algorithm = selectedAlgorithm;
+            if (std::find(algos.begin(), algos.end(), selectedAlgorithm) == algos.end()) {
+                throw std::invalid_argument("Invalid selectFeatures value, valid values [" + SelectFeatures.IWSS + ", " + SelectFeatures.CFS + ", " + SelectFeatures.FCBF + "]");
+            }
+            hyperparameters.erase("select_features");
+        }
+        if (hyperparameters.contains("block_update")) {
+            block_update = hyperparameters["block_update"];
+            hyperparameters.erase("block_update");
+        }
+        Classifier::setHyperparameters(hyperparameters);
     }
-    featureSelector->fit();
+    void Boost::buildModel(const torch::Tensor& weights)
-    auto featuresUsed = featureSelector->getFeatures();
+    {
-    delete featureSelector;
+        // Models shall be built in trainModel
-    return featuresUsed;
+        models.clear();
-}
+        significanceModels.clear();
-std::tuple<torch::Tensor &, double, bool> Boost::update_weights(torch::Tensor &ytrain, torch::Tensor &ypred,
+        n_models = 0;
-                                                                torch::Tensor &weights) {
+        // Prepare the validation dataset
-    bool terminate = false;
+        auto y_ = dataset.index({ -1, "..." });
-    double alpha_t = 0;
+        if (convergence) {
-    auto mask_wrong = ypred != ytrain;
+            // Prepare train & validation sets from train data
-    auto mask_right = ypred == ytrain;
+            auto fold = folding::StratifiedKFold(5, y_, 271);
-    auto masked_weights = weights * mask_wrong.to(weights.dtype());
+            auto [train, test] = fold.getFold(0);
-    double epsilon_t = masked_weights.sum().item<double>();
+            auto train_t = torch::tensor(train);
-    // std::cout << "epsilon_t: " << epsilon_t << " count wrong: " << mask_wrong.sum().item<int>() << " count right: "
+            auto test_t = torch::tensor(test);
-    // << mask_right.sum().item<int>() << std::endl;
+            // Get train and validation sets
-    if (epsilon_t > 0.5) {
+            X_train = dataset.index({ torch::indexing::Slice(0, dataset.size(0) - 1), train_t });
-        // Inverse the weights policy (plot ln(wt))
+            y_train = dataset.index({ -1, train_t });
-        // "In each round of AdaBoost, there is a sanity check to ensure that the current base
+            X_test = dataset.index({ torch::indexing::Slice(0, dataset.size(0) - 1), test_t });
-        // learner is better than random guess" (Zhi-Hua Zhou, 2012)
+            y_test = dataset.index({ -1, test_t });
-        terminate = true;
+            dataset = X_train;
-    } else {
+            m = X_train.size(1);
-        double wt = (1 - epsilon_t) / epsilon_t;
+            auto n_classes = states.at(className).size();
-        alpha_t = epsilon_t == 0 ? 1 : 0.5 * log(wt);
+            // Build dataset with train data
-        // Step 3.2: Update weights for next classifier
+            buildDataset(y_train);
-        // Step 3.2.1: Update weights of wrong samples
+            metrics = Metrics(dataset, features, className, n_classes);
-        weights += mask_wrong.to(weights.dtype()) * exp(alpha_t) * weights;
+        } else {
-        // Step 3.2.2: Update weights of right samples
+            // Use all data to train
-        weights += mask_right.to(weights.dtype()) * exp(-alpha_t) * weights;
+            X_train = dataset.index({ torch::indexing::Slice(0, dataset.size(0) - 1), "..." });
-        // Step 3.3: Normalise the weights
+            y_train = y_;
-        double totalWeights = torch::sum(weights).item<double>();
+        }
-        weights = weights / totalWeights;
     }
-    return {weights, alpha_t, terminate};
+    std::vector<int> Boost::featureSelection(torch::Tensor& weights_)
-}
+    {
-std::tuple<torch::Tensor &, double, bool> Boost::update_weights_block(int k, torch::Tensor &ytrain,
+        int maxFeatures = 0;
-                                                                      torch::Tensor &weights) {
+        if (select_features_algorithm == SelectFeatures.CFS) {
-    /* Update Block algorithm
+            featureSelector = new CFS(dataset, features, className, maxFeatures, states.at(className).size(), weights_);
-        k = # of models in block
+        } else if (select_features_algorithm == SelectFeatures.IWSS) {
-        n_models = # of models in ensemble to make predictions
+            if (threshold < 0 || threshold >0.5) {
-        n_models_bak = # models saved
+                throw std::invalid_argument("Invalid threshold value for " + SelectFeatures.IWSS + " [0, 0.5]");
-        models = vector of models to make predictions
+            }
-        models_bak = models not used to make predictions
+            featureSelector = new IWSS(dataset, features, className, maxFeatures, states.at(className).size(), weights_, threshold);
-        significances_bak = backup of significances vector
+        } else if (select_features_algorithm == SelectFeatures.FCBF) {
+            if (threshold < 1e-7 || threshold > 1) {
+                throw std::invalid_argument("Invalid threshold value for " + SelectFeatures.FCBF + " [1e-7, 1]");
+            }
+            featureSelector = new FCBF(dataset, features, className, maxFeatures, states.at(className).size(), weights_, threshold);
+        }
+        featureSelector->fit();
+        auto featuresUsed = featureSelector->getFeatures();
+        delete featureSelector;
+        return featuresUsed;
+    }
+    std::tuple<torch::Tensor&, double, bool> Boost::update_weights(torch::Tensor& ytrain, torch::Tensor& ypred, torch::Tensor& weights)
+    {
+        bool terminate = false;
+        double alpha_t = 0;
+        auto mask_wrong = ypred != ytrain;
+        auto mask_right = ypred == ytrain;
+        auto masked_weights = weights * mask_wrong.to(weights.dtype());
+        double epsilon_t = masked_weights.sum().item<double>();
+        if (epsilon_t > 0.5) {
+            // Inverse the weights policy (plot ln(wt))
+            // "In each round of AdaBoost, there is a sanity check to ensure that the current base 
+            // learner is better than random guess" (Zhi-Hua Zhou, 2012)
+            terminate = true;
+        } else {
+            double wt = (1 - epsilon_t) / epsilon_t;
+            alpha_t = epsilon_t == 0 ? 1 : 0.5 * log(wt);
+            // Step 3.2: Update weights for next classifier
+            // Step 3.2.1: Update weights of wrong samples
+            weights += mask_wrong.to(weights.dtype()) * exp(alpha_t) * weights;
+            // Step 3.2.2: Update weights of right samples
+            weights += mask_right.to(weights.dtype()) * exp(-alpha_t) * weights;
+            // Step 3.3: Normalise the weights
+            double totalWeights = torch::sum(weights).item<double>();
+            weights = weights / totalWeights;
+        }
+        return { weights, alpha_t, terminate };
+    }
+    std::tuple<torch::Tensor&, double, bool> Boost::update_weights_block(int k, torch::Tensor& ytrain, torch::Tensor& weights)
+    {
+        /* Update Block algorithm
+            k = # of models in block
+            n_models = # of models in ensemble to make predictions
+            n_models_bak = # models saved
+            models = vector of models to make predictions
+            models_bak = models not used to make predictions
+            significances_bak = backup of significances vector
 
-        Case list
+            Case list
-        A) k = 1, n_models = 1		=> n = 0 , n_models = n + k
+            A) k = 1, n_models = 1		=> n = 0 , n_models = n + k
-        B) k = 1, n_models = n + 1	=> n_models = n + k
+            B) k = 1, n_models = n + 1	=> n_models = n + k
-        C) k > 1, n_models = k + 1 	=> n= 1, n_models = n + k
+            C) k > 1, n_models = k + 1 	=> n= 1, n_models = n + k
-        D) k > 1, n_models = k		=> n = 0, n_models = n + k
+            D) k > 1, n_models = k		=> n = 0, n_models = n + k
-        E) k > 1, n_models = k + n	=> n_models = n + k
+            E) k > 1, n_models = k + n	=> n_models = n + k
 
-        A, D) n=0, k > 0, n_models == k
+            A, D) n=0, k > 0, n_models == k
-        1. n_models_bak <- n_models
+            1. n_models_bak <- n_models
-        2. significances_bak <- significances
+            2. significances_bak <- significances
-        3. significances = vector(k, 1)
+            3. significances = vector(k, 1)
-        4. Don’t move any classifiers out of models
+            4. Don’t move any classifiers out of models
-        5. n_models <- k
+            5. n_models <- k
-        6. Make prediction, compute alpha, update weights
+            6. Make prediction, compute alpha, update weights
-        7. Don’t restore any classifiers to models
+            7. Don’t restore any classifiers to models
-        8. significances <- significances_bak
+            8. significances <- significances_bak
-        9. Update last k significances
+            9. Update last k significances
-        10. n_models <- n_models_bak
+            10. n_models <- n_models_bak
 
-        B, C, E) n > 0, k > 0, n_models == n + k
+            B, C, E) n > 0, k > 0, n_models == n + k
-        1. n_models_bak <- n_models
+            1. n_models_bak <- n_models
-        2. significances_bak <- significances
+            2. significances_bak <- significances
-        3. significances = vector(k, 1)
+            3. significances = vector(k, 1)
-        4. Move first n classifiers to models_bak
+            4. Move first n classifiers to models_bak
-        5. n_models <- k
+            5. n_models <- k
-        6. Make prediction, compute alpha, update weights
+            6. Make prediction, compute alpha, update weights
-        7. Insert classifiers in models_bak to be the first n models
+            7. Insert classifiers in models_bak to be the first n models
-        8. significances <- significances_bak
+            8. significances <- significances_bak
-        9. Update last k significances
+            9. Update last k significances
-        10. n_models <- n_models_bak
+            10. n_models <- n_models_bak
-    */
+        */
-    //
+        //
-    // Make predict with only the last k models
+        // Make predict with only the last k models
-    //
+        //
-    std::unique_ptr<Classifier> model;
+        std::unique_ptr<Classifier> model;
-    std::vector<std::unique_ptr<Classifier>> models_bak;
+        std::vector<std::unique_ptr<Classifier>> models_bak;
-    // 1. n_models_bak <- n_models 2. significances_bak <- significances
+        // 1. n_models_bak <- n_models 2. significances_bak <- significances
-    auto significance_bak = significanceModels;
+        auto significance_bak = significanceModels;
-    auto n_models_bak = n_models;
+        auto n_models_bak = n_models;
-    // 3. significances = vector(k, 1)
+        // 3. significances = vector(k, 1)
-    significanceModels = std::vector<double>(k, 1.0);
+        significanceModels = std::vector<double>(k, 1.0);
-    // 4. Move first n classifiers to models_bak
+        // 4. Move first n classifiers to models_bak
-    // backup the first n_models - k models (if n_models == k, don't backup any)
+        // backup the first n_models - k models (if n_models == k, don't backup any)
-    for (int i = 0; i < n_models - k; ++i) {
+        for (int i = 0; i < n_models - k; ++i) {
-        model = std::move(models[0]);
+            model = std::move(models[0]);
-        models.erase(models.begin());
+            models.erase(models.begin());
-        models_bak.push_back(std::move(model));
+            models_bak.push_back(std::move(model));
-    }
-    assert(models.size() == k);
-    // 5. n_models <- k
-    n_models = k;
-    // 6. Make prediction, compute alpha, update weights
-    auto ypred = predict(X_train);
-    //
-    // Update weights
-    //
-    double alpha_t;
-    bool terminate;
-    std::tie(weights, alpha_t, terminate) = update_weights(y_train, ypred, weights);
-    //
-    // Restore the models if needed
-    //
-    // 7. Insert classifiers in models_bak to be the first n models
-    // if n_models_bak == k, don't restore any, because none of them were moved
-    if (k != n_models_bak) {
-        // Insert in the same order as they were extracted
-        int bak_size = models_bak.size();
-        for (int i = 0; i < bak_size; ++i) {
-            model = std::move(models_bak[bak_size - 1 - i]);
-            models_bak.erase(models_bak.end() - 1);
-            models.insert(models.begin(), std::move(model));
         }
+        assert(models.size() == k);
+        // 5. n_models <- k
+        n_models = k;
+        // 6. Make prediction, compute alpha, update weights
+        auto ypred = predict(X_train);
+        //
+        // Update weights
+        //
+        double alpha_t;
+        bool terminate;
+        std::tie(weights, alpha_t, terminate) = update_weights(y_train, ypred, weights);
+        //
+        // Restore the models if needed
+        //
+        // 7. Insert classifiers in models_bak to be the first n models
+        // if n_models_bak == k, don't restore any, because none of them were moved
+        if (k != n_models_bak) {
+            // Insert in the same order as they were extracted
+            int bak_size = models_bak.size();
+            for (int i = 0; i < bak_size; ++i) {
+                model = std::move(models_bak[bak_size - 1 - i]);
+                models_bak.erase(models_bak.end() - 1);
+                models.insert(models.begin(), std::move(model));
+            }
+        }
+        // 8. significances <- significances_bak
+        significanceModels = significance_bak;
+        //
+        // Update the significance of the last k models
+        //
+        // 9. Update last k significances
+        for (int i = 0; i < k; ++i) {
+            significanceModels[n_models_bak - k + i] = alpha_t;
+        }
+        // 10. n_models <- n_models_bak
+        n_models = n_models_bak;
+        return { weights, alpha_t, terminate };
     }
-    // 8. significances <- significances_bak
+}
-    significanceModels = significance_bak;
-    //
-    // Update the significance of the last k models
-    //
-    // 9. Update last k significances
-    for (int i = 0; i < k; ++i) {
-        significanceModels[n_models_bak - k + i] = alpha_t;
-    }
-    // 10. n_models <- n_models_bak
-    n_models = n_models_bak;
-    return {weights, alpha_t, terminate};
-}
-} // namespace bayesnet

bayesnet/ensembles/Boost.h

@@ -27,31 +27,26 @@ namespace bayesnet {
     class Boost : public Ensemble {
     public:
         explicit Boost(bool predict_voting = false);
-        virtual ~Boost() override = default;
+        virtual ~Boost() = default;
         void setHyperparameters(const nlohmann::json& hyperparameters_) override;
     protected:
         std::vector<int> featureSelection(torch::Tensor& weights_);
         void buildModel(const torch::Tensor& weights) override;
         std::tuple<torch::Tensor&, double, bool> update_weights(torch::Tensor& ytrain, torch::Tensor& ypred, torch::Tensor& weights);
         std::tuple<torch::Tensor&, double, bool> update_weights_block(int k, torch::Tensor& ytrain, torch::Tensor& weights);
-        void add_model(std::unique_ptr<Classifier> model, double significance);
-        void remove_last_model();
-        //
-        // Attributes
-        //
         torch::Tensor X_train, y_train, X_test, y_test;
         // Hyperparameters
         bool bisection = true; // if true, use bisection stratety to add k models at once to the ensemble
         int maxTolerance = 3;
-        std::string order_algorithm = Orders.DESC; // order to process the KBest features asc, desc, rand
+        std::string order_algorithm; // order to process the KBest features asc, desc, rand
         bool convergence = true; //if true, stop when the model does not improve
         bool convergence_best = false; // wether to keep the best accuracy to the moment or the last accuracy as prior accuracy
         bool selectFeatures = false; // if true, use feature selection
-        std::string select_features_algorithm; // Selected feature selection algorithm
+        std::string select_features_algorithm = Orders.DESC; // Selected feature selection algorithm
         FeatureSelect* featureSelector = nullptr;
         double threshold = -1;
-        bool block_update = false; // if true, use block update algorithm, only meaningful if bisection is true
+        bool block_update = false;
-        bool alpha_block = false; // if true, the alpha is computed with the ensemble built so far and the new model
+
     };
 }
-#endif
+#endif

bayesnet/ensembles/BoostA2DE.cc

@@ -4,9 +4,14 @@
 // SPDX-License-Identifier: MIT
 // ***************************************************************
 
+#include <set>
+#include <functional>
 #include <limits.h>
 #include <tuple>
 #include <folding.hpp>
+#include "bayesnet/feature_selection/CFS.h"
+#include "bayesnet/feature_selection/FCBF.h"
+#include "bayesnet/feature_selection/IWSS.h"
 #include "BoostA2DE.h"
 
 namespace bayesnet {
@@ -54,9 +59,6 @@ namespace bayesnet {
         std::vector<int> featuresUsed;
         if (selectFeatures) {
             featuresUsed = initializeModels(smoothing);
-            if (featuresUsed.size() == 0) {
-                return;
-            }
             auto ypred = predict(X_train);
             std::tie(weights_, alpha_t, finished) = update_weights(y_train, ypred, weights_);
             // Update significance of the models
@@ -162,4 +164,4 @@ namespace bayesnet {
     {
         return Ensemble::graph(title);
     }
-}
+}

bayesnet/ensembles/BoostAODE.cc

@@ -6,12 +6,10 @@
 
 #include <random> 
 #include <set>
+#include <functional>
 #include <limits.h>
 #include <tuple>
 #include "BoostAODE.h"
-#include "bayesnet/classifiers/SPODE.h"
-#include <loguru.hpp>
-#include <loguru.cpp>
 
 namespace bayesnet {
 
@@ -48,16 +46,14 @@ namespace bayesnet {
         torch::Tensor weights_ = torch::full({ m }, 1.0 / m, torch::kFloat64);
         bool finished = false;
         std::vector<int> featuresUsed;
-        n_models = 0;
         if (selectFeatures) {
             featuresUsed = initializeModels(smoothing);
             auto ypred = predict(X_train);
             std::tie(weights_, alpha_t, finished) = update_weights(y_train, ypred, weights_);
             // Update significance of the models
             for (int i = 0; i < n_models; ++i) {
-                significanceModels.push_back(alpha_t);
+                significanceModels[i] = alpha_t;
             }
-            // VLOG_SCOPE_F(1, "SelectFeatures. alpha_t: %f n_models: %d", alpha_t, n_models);
             if (finished) {
                 return;
             }
@@ -96,25 +92,7 @@ namespace bayesnet {
                 model->fit(dataset, features, className, states, weights_, smoothing);
                 alpha_t = 0.0;
                 if (!block_update) {
-                    torch::Tensor ypred;
+                    auto ypred = model->predict(X_train);
-                    if (alpha_block) {
-                        //
-                        // Compute the prediction with the current ensemble + model
-                        //
-                        // Add the model to the ensemble
-                        n_models++;
-                        models.push_back(std::move(model));
-                        significanceModels.push_back(1);
-                        // Compute the prediction
-                        ypred = predict(X_train);
-                        // Remove the model from the ensemble
-                        model = std::move(models.back());
-                        models.pop_back();
-                        significanceModels.pop_back();
-                        n_models--;
-                    } else {
-                        ypred = model->predict(X_train);
-                    }
                     // Step 3.1: Compute the classifier amout of say
                     std::tie(weights_, alpha_t, finished) = update_weights(y_train, ypred, weights_);
                 }
@@ -124,7 +102,7 @@ namespace bayesnet {
                 models.push_back(std::move(model));
                 significanceModels.push_back(alpha_t);
                 n_models++;
-                // VLOG_SCOPE_F(2, "finished: %d numItemsPack: %d n_models: %d featuresUsed: %zu", finished, numItemsPack, n_models, featuresUsed.size());
+                // VLOG_SCOPE_F(2, "numItemsPack: %d n_models: %d featuresUsed: %zu", numItemsPack, n_models, featuresUsed.size());
             }
             if (block_update) {
                 std::tie(weights_, alpha_t, finished) = update_weights_block(k, y_train, weights_);
@@ -167,7 +145,7 @@ namespace bayesnet {
                 }
             } else {
                 notes.push_back("Convergence threshold reached & 0 models eliminated");
-                // VLG_SCOPE_F(4, "Convergence threshold reached & 0 models eliminated n_models=%d numItemsPack=%d", n_models, numItemsPack);
+                // VLOG_SCOPE_F(4, "Convergence threshold reached & 0 models eliminated n_models=%d numItemsPack=%d", n_models, numItemsPack);
             }
         }
         if (featuresUsed.size() != features.size()) {
@@ -180,4 +158,4 @@ namespace bayesnet {
     {
         return Ensemble::graph(title);
     }
-}
+}

bayesnet/ensembles/BoostAODE.h

@@ -8,6 +8,7 @@
 #define BOOSTAODE_H
 #include <string>
 #include <vector>
+#include "bayesnet/classifiers/SPODE.h"
 #include "Boost.h"
 
 namespace bayesnet {
@@ -22,4 +23,4 @@ namespace bayesnet {
         std::vector<int> initializeModels(const Smoothing_t smoothing);
     };
 }
-#endif
+#endif

bayesnet/ensembles/Ensemble.cc

@@ -4,6 +4,7 @@
 // SPDX-License-Identifier: MIT
 // ***************************************************************
 #include "Ensemble.h"
+#include "bayesnet/utils/CountingSemaphore.h"
 
 namespace bayesnet {
 
@@ -85,7 +86,6 @@ namespace bayesnet {
         torch::Tensor y_pred = torch::zeros({ X.size(1), n_states }, torch::kFloat32);
         for (auto i = 0; i < n_models; ++i) {
             auto ypredict = models[i]->predict_proba(X);
-            /*std::cout << "model " << i << " prediction: " << ypredict << " significance " << significanceModels[i] << std::endl;*/
             y_pred += ypredict * significanceModels[i];
         }
         auto sum = std::reduce(significanceModels.begin(), significanceModels.end());
@@ -194,4 +194,4 @@ namespace bayesnet {
         }
         return nstates;
     }
-}
+}

bayesnet/ensembles/Ensemble.h

@@ -33,15 +33,9 @@ namespace bayesnet {
         }
         std::string dump_cpt() const override
         {
-            std::string output;
+            return "";
-            for (auto& model : models) {
-                output += model->dump_cpt();
-                output += std::string(80, '-') + "\n";
-            }
-            return output;
         }
     protected:
-        void trainModel(const torch::Tensor& weights, const Smoothing_t smoothing) override;
         torch::Tensor predict_average_voting(torch::Tensor& X);
         std::vector<std::vector<double>> predict_average_voting(std::vector<std::vector<int>>& X);
         torch::Tensor predict_average_proba(torch::Tensor& X);
@@ -49,10 +43,10 @@ namespace bayesnet {
         torch::Tensor compute_arg_max(torch::Tensor& X);
         std::vector<int> compute_arg_max(std::vector<std::vector<double>>& X);
         torch::Tensor voting(torch::Tensor& votes);
-        // Attributes
         unsigned n_models;
         std::vector<std::unique_ptr<Classifier>> models;
         std::vector<double> significanceModels;
+        void trainModel(const torch::Tensor& weights, const Smoothing_t smoothing) override;
         bool predict_voting;
     };
 }

bayesnet/ensembles/XBA2DE.cc

@@ -1,168 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2025 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#include <folding.hpp>
-#include <limits.h>
-#include "XBA2DE.h"
-#include "bayesnet/classifiers/XSP2DE.h"
-#include "bayesnet/utils/TensorUtils.h"
-
-namespace bayesnet {
-
-XBA2DE::XBA2DE(bool predict_voting) : Boost(predict_voting) {}
-std::vector<int> XBA2DE::initializeModels(const Smoothing_t smoothing) {
-    torch::Tensor weights_ = torch::full({m}, 1.0 / m, torch::kFloat64);
-    std::vector<int> featuresSelected = featureSelection(weights_);
-    if (featuresSelected.size() < 2) {
-        notes.push_back("No features selected in initialization");
-        status = ERROR;
-        return std::vector<int>();
-    }
-    for (int i = 0; i < featuresSelected.size() - 1; i++) {
-        for (int j = i + 1; j < featuresSelected.size(); j++) {
-            std::unique_ptr<Classifier> model = std::make_unique<XSp2de>(featuresSelected[i], featuresSelected[j]);
-            model->fit(dataset, features, className, states, weights_, smoothing);
-            add_model(std::move(model), 1.0);
-        }
-    }
-    notes.push_back("Used features in initialization: " + std::to_string(featuresSelected.size()) + " of " +
-                    std::to_string(features.size()) + " with " + select_features_algorithm);
-    return featuresSelected;
-}
-void XBA2DE::trainModel(const torch::Tensor &weights, const Smoothing_t smoothing) {
-    //
-    // Logging setup
-    //
-    // loguru::set_thread_name("XBA2DE");
-    // loguru::g_stderr_verbosity = loguru::Verbosity_OFF;
-    // loguru::add_file("boostA2DE.log", loguru::Truncate, loguru::Verbosity_MAX);
-
-    // Algorithm based on the adaboost algorithm for classification
-    // as explained in Ensemble methods (Zhi-Hua Zhou, 2012)
-    X_train_ = TensorUtils::to_matrix(X_train);
-    y_train_ = TensorUtils::to_vector<int>(y_train);
-    if (convergence) {
-        X_test_ = TensorUtils::to_matrix(X_test);
-        y_test_ = TensorUtils::to_vector<int>(y_test);
-    }
-    fitted = true;
-    double alpha_t = 0;
-    torch::Tensor weights_ = torch::full({m}, 1.0 / m, torch::kFloat64);
-    bool finished = false;
-    std::vector<int> featuresUsed;
-    if (selectFeatures) {
-        featuresUsed = initializeModels(smoothing);
-        if (featuresUsed.size() == 0) {
-            return;
-        }
-        auto ypred = predict(X_train);
-        std::tie(weights_, alpha_t, finished) = update_weights(y_train, ypred, weights_);
-        // Update significance of the models
-        for (int i = 0; i < n_models; ++i) {
-            significanceModels[i] = alpha_t;
-        }
-        if (finished) {
-            return;
-        }
-    }
-    int numItemsPack = 0; // The counter of the models inserted in the current pack
-    // Variables to control the accuracy finish condition
-    double priorAccuracy = 0.0;
-    double improvement = 1.0;
-    double convergence_threshold = 1e-4;
-    int tolerance = 0; // number of times the accuracy is lower than the convergence_threshold
-    // Step 0: Set the finish condition
-    // epsilon sub t > 0.5 => inverse the weights policy
-    // validation error is not decreasing
-    // run out of features
-    bool ascending = order_algorithm == Orders.ASC;
-    std::mt19937 g{173};
-    std::vector<std::pair<int, int>> pairSelection;
-    while (!finished) {
-        // Step 1: Build ranking with mutual information
-        pairSelection = metrics.SelectKPairs(weights_, featuresUsed, ascending, 0); // Get all the pairs sorted
-        if (order_algorithm == Orders.RAND) {
-            std::shuffle(pairSelection.begin(), pairSelection.end(), g);
-        }
-        int k = bisection ? pow(2, tolerance) : 1;
-        int counter = 0; // The model counter of the current pack
-        // VLOG_SCOPE_F(1, "counter=%d k=%d featureSelection.size: %zu", counter, k, featureSelection.size());
-        while (counter++ < k && pairSelection.size() > 0) {
-            auto feature_pair = pairSelection[0];
-            pairSelection.erase(pairSelection.begin());
-            std::unique_ptr<Classifier> model;
-            model = std::make_unique<XSp2de>(feature_pair.first, feature_pair.second);
-            model->fit(dataset, features, className, states, weights_, smoothing);
-            alpha_t = 0.0;
-            if (!block_update) {
-                auto ypred = model->predict(X_train);
-                // Step 3.1: Compute the classifier amout of say
-                std::tie(weights_, alpha_t, finished) = update_weights(y_train, ypred, weights_);
-            }
-            // Step 3.4: Store classifier and its accuracy to weigh its future vote
-            numItemsPack++;
-            models.push_back(std::move(model));
-            significanceModels.push_back(alpha_t);
-            n_models++;
-            // VLOG_SCOPE_F(2, "numItemsPack: %d n_models: %d featuresUsed: %zu", numItemsPack, n_models,
-            // featuresUsed.size());
-        }
-        if (block_update) {
-            std::tie(weights_, alpha_t, finished) = update_weights_block(k, y_train, weights_);
-        }
-        if (convergence && !finished) {
-            auto y_val_predict = predict(X_test);
-            double accuracy = (y_val_predict == y_test).sum().item<double>() / (double)y_test.size(0);
-            if (priorAccuracy == 0) {
-                priorAccuracy = accuracy;
-            } else {
-                improvement = accuracy - priorAccuracy;
-            }
-            if (improvement < convergence_threshold) {
-                // VLOG_SCOPE_F(3, "  (improvement<threshold) tolerance: %d numItemsPack: %d improvement: %f prior: %f
-                // current: %f", tolerance, numItemsPack, improvement, priorAccuracy, accuracy);
-                tolerance++;
-            } else {
-                // VLOG_SCOPE_F(3, "* (improvement>=threshold) Reset. tolerance: %d numItemsPack: %d improvement: %f
-                // prior: %f current: %f", tolerance, numItemsPack, improvement, priorAccuracy, accuracy);
-                tolerance = 0; // Reset the counter if the model performs better
-                numItemsPack = 0;
-            }
-            if (convergence_best) {
-                // Keep the best accuracy until now as the prior accuracy
-                priorAccuracy = std::max(accuracy, priorAccuracy);
-            } else {
-                // Keep the last accuray obtained as the prior accuracy
-                priorAccuracy = accuracy;
-            }
-        }
-        // VLOG_SCOPE_F(1, "tolerance: %d featuresUsed.size: %zu features.size: %zu", tolerance, featuresUsed.size(),
-        // features.size());
-        finished = finished || tolerance > maxTolerance || pairSelection.size() == 0;
-    }
-    if (tolerance > maxTolerance) {
-        if (numItemsPack < n_models) {
-            notes.push_back("Convergence threshold reached & " + std::to_string(numItemsPack) + " models eliminated");
-            // VLOG_SCOPE_F(4, "Convergence threshold reached & %d models eliminated of %d", numItemsPack, n_models);
-            for (int i = 0; i < numItemsPack; ++i) {
-                significanceModels.pop_back();
-                models.pop_back();
-                n_models--;
-            }
-        } else {
-            notes.push_back("Convergence threshold reached & 0 models eliminated");
-            // VLOG_SCOPE_F(4, "Convergence threshold reached & 0 models eliminated n_models=%d numItemsPack=%d",
-            // n_models, numItemsPack);
-        }
-    }
-    if (pairSelection.size() > 0) {
-        notes.push_back("Pairs not used in train: " + std::to_string(pairSelection.size()));
-        status = WARNING;
-    }
-    notes.push_back("Number of models: " + std::to_string(n_models));
-}
-std::vector<std::string> XBA2DE::graph(const std::string &title) const { return Ensemble::graph(title); }
-} // namespace bayesnet

bayesnet/ensembles/XBA2DE.h

@@ -1,28 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2025 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#ifndef XBA2DE_H
-#define XBA2DE_H
-#include <string>
-#include <vector>
-#include "Boost.h"
-namespace bayesnet {
-    class XBA2DE : public Boost {
-    public:
-        explicit XBA2DE(bool predict_voting = false);
-        virtual ~XBA2DE() = default;
-        std::vector<std::string> graph(const std::string& title = "XBA2DE") const override;
-        std::string getVersion() override { return version; };
-    protected:
-        void trainModel(const torch::Tensor& weights, const Smoothing_t smoothing) override;
-    private:
-        std::vector<int> initializeModels(const Smoothing_t smoothing);
-        std::vector<std::vector<int>> X_train_, X_test_;
-        std::vector<int> y_train_, y_test_;
-        std::string version = "0.9.7";
-    };
-}
-#endif

bayesnet/ensembles/XBAODE.cc

@@ -1,184 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2025 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-#include "XBAODE.h"
-#include "bayesnet/classifiers/XSPODE.h"
-#include "bayesnet/utils/TensorUtils.h"
-#include <limits.h>
-#include <random>
-#include <tuple>
-
-namespace bayesnet {
-XBAODE::XBAODE() : Boost(false) {
-    validHyperparameters = {"alpha_block", "order",        "convergence",    "convergence_best", "bisection",
-                            "threshold",   "maxTolerance", "predict_voting", "select_features"};
-}
-std::vector<int> XBAODE::initializeModels(const Smoothing_t smoothing) {
-    torch::Tensor weights_ = torch::full({m}, 1.0 / m, torch::kFloat64);
-    std::vector<int> featuresSelected = featureSelection(weights_);
-    for (const int &feature : featuresSelected) {
-        std::unique_ptr<Classifier> model = std::make_unique<XSpode>(feature);
-        model->fit(dataset, features, className, states, weights_, smoothing);
-        add_model(std::move(model), 1.0);
-    }
-    notes.push_back("Used features in initialization: " + std::to_string(featuresSelected.size()) + " of " +
-                    std::to_string(features.size()) + " with " + select_features_algorithm);
-    return featuresSelected;
-}
-void XBAODE::trainModel(const torch::Tensor &weights, const bayesnet::Smoothing_t smoothing) {
-    X_train_ = TensorUtils::to_matrix(X_train);
-    y_train_ = TensorUtils::to_vector<int>(y_train);
-    if (convergence) {
-        X_test_ = TensorUtils::to_matrix(X_test);
-        y_test_ = TensorUtils::to_vector<int>(y_test);
-    }
-    fitted = true;
-    double alpha_t;
-    torch::Tensor weights_ = torch::full({m}, 1.0 / m, torch::kFloat64);
-    bool finished = false;
-    std::vector<int> featuresUsed;
-    n_models = 0;
-    if (selectFeatures) {
-        featuresUsed = initializeModels(smoothing);
-        auto ypred = predict(X_train_);
-        auto ypred_t = torch::tensor(ypred);
-        std::tie(weights_, alpha_t, finished) = update_weights(y_train, ypred_t, weights_);
-        // Update significance of the models
-        for (const int &feature : featuresUsed) {
-            significanceModels.pop_back();
-        }
-        for (const int &feature : featuresUsed) {
-            significanceModels.push_back(alpha_t);
-        }
-        // VLOG_SCOPE_F(1, "SelectFeatures. alpha_t: %f n_models: %d", alpha_t,
-        // n_models);
-        if (finished) {
-            return;
-        }
-    }
-    int numItemsPack = 0; // The counter of the models inserted in the current pack
-    // Variables to control the accuracy finish condition
-    double priorAccuracy = 0.0;
-    double improvement = 1.0;
-    double convergence_threshold = 1e-4;
-    int tolerance = 0; // number of times the accuracy is lower than the convergence_threshold
-    // Step 0: Set the finish condition
-    // epsilon sub t > 0.5 => inverse the weights_ policy
-    // validation error is not decreasing
-    // run out of features
-    bool ascending = order_algorithm == bayesnet::Orders.ASC;
-    std::mt19937 g{173};
-    while (!finished) {
-        // Step 1: Build ranking with mutual information
-        auto featureSelection = metrics.SelectKBestWeighted(weights_, ascending, n); // Get all the features sorted
-        if (order_algorithm == bayesnet::Orders.RAND) {
-            std::shuffle(featureSelection.begin(), featureSelection.end(), g);
-        }
-        // Remove used features
-        featureSelection.erase(remove_if(featureSelection.begin(), featureSelection.end(),
-                                         [&](auto x) {
-                                             return std::find(featuresUsed.begin(), featuresUsed.end(), x) !=
-                                                    featuresUsed.end();
-                                         }),
-                               featureSelection.end());
-        int k = bisection ? pow(2, tolerance) : 1;
-        int counter = 0; // The model counter of the current pack
-        // VLOG_SCOPE_F(1, "counter=%d k=%d featureSelection.size: %zu", counter, k,
-        // featureSelection.size());
-        while (counter++ < k && featureSelection.size() > 0) {
-            auto feature = featureSelection[0];
-            featureSelection.erase(featureSelection.begin());
-            std::unique_ptr<Classifier> model;
-            model = std::make_unique<XSpode>(feature);
-            model->fit(dataset, features, className, states, weights_, smoothing);
-            /*dynamic_cast<XSpode*>(model.get())->fitx(X_train, y_train, weights_,
-             * smoothing); // using exclusive XSpode fit method*/
-            // DEBUG
-            /*std::cout << dynamic_cast<XSpode*>(model.get())->to_string() <<
-             * std::endl;*/
-            // DEBUG
-            std::vector<int> ypred;
-            if (alpha_block) {
-                //
-                // Compute the prediction with the current ensemble + model
-                //
-                // Add the model to the ensemble
-                add_model(std::move(model), 1.0);
-                // Compute the prediction
-                ypred = predict(X_train_);
-                model = std::move(models.back());
-                // Remove the model from the ensemble
-                remove_last_model();
-            } else {
-                ypred = model->predict(X_train_);
-            }
-            // Step 3.1: Compute the classifier amout of say
-            auto ypred_t = torch::tensor(ypred);
-            std::tie(weights_, alpha_t, finished) = update_weights(y_train, ypred_t, weights_);
-            // Step 3.4: Store classifier and its accuracy to weigh its future vote
-            numItemsPack++;
-            featuresUsed.push_back(feature);
-            add_model(std::move(model), alpha_t);
-            // VLOG_SCOPE_F(2, "finished: %d numItemsPack: %d n_models: %d
-            // featuresUsed: %zu", finished, numItemsPack, n_models,
-            // featuresUsed.size());
-        } // End of the pack
-        if (convergence && !finished) {
-            auto y_val_predict = predict(X_test);
-            double accuracy = (y_val_predict == y_test).sum().item<double>() / (double)y_test.size(0);
-            if (priorAccuracy == 0) {
-                priorAccuracy = accuracy;
-            } else {
-                improvement = accuracy - priorAccuracy;
-            }
-            if (improvement < convergence_threshold) {
-                // VLOG_SCOPE_F(3, "  (improvement<threshold) tolerance: %d
-                // numItemsPack: %d improvement: %f prior: %f current: %f", tolerance,
-                // numItemsPack, improvement, priorAccuracy, accuracy);
-                tolerance++;
-            } else {
-                // VLOG_SCOPE_F(3, "* (improvement>=threshold) Reset. tolerance: %d
-                // numItemsPack: %d improvement: %f prior: %f current: %f", tolerance,
-                // numItemsPack, improvement, priorAccuracy, accuracy);
-                tolerance = 0; // Reset the counter if the model performs better
-                numItemsPack = 0;
-            }
-            if (convergence_best) {
-                // Keep the best accuracy until now as the prior accuracy
-                priorAccuracy = std::max(accuracy, priorAccuracy);
-            } else {
-                // Keep the last accuray obtained as the prior accuracy
-                priorAccuracy = accuracy;
-            }
-        }
-        // VLOG_SCOPE_F(1, "tolerance: %d featuresUsed.size: %zu features.size:
-        // %zu", tolerance, featuresUsed.size(), features.size());
-        finished = finished || tolerance > maxTolerance || featuresUsed.size() == features.size();
-    }
-    if (tolerance > maxTolerance) {
-        if (numItemsPack < n_models) {
-            notes.push_back("Convergence threshold reached & " + std::to_string(numItemsPack) + " models eliminated");
-            // VLOG_SCOPE_F(4, "Convergence threshold reached & %d models eliminated
-            // of %d", numItemsPack, n_models);
-            for (int i = featuresUsed.size() - 1; i >= featuresUsed.size() - numItemsPack; --i) {
-                remove_last_model();
-            }
-            // VLOG_SCOPE_F(4, "*Convergence threshold %d models left & %d features
-            // used.", n_models, featuresUsed.size());
-        } else {
-            notes.push_back("Convergence threshold reached & 0 models eliminated");
-            // VLOG_SCOPE_F(4, "Convergence threshold reached & 0 models eliminated
-            // n_models=%d numItemsPack=%d", n_models, numItemsPack);
-        }
-    }
-    if (featuresUsed.size() != features.size()) {
-        notes.push_back("Used features in train: " + std::to_string(featuresUsed.size()) + " of " +
-                        std::to_string(features.size()));
-        status = bayesnet::WARNING;
-    }
-    notes.push_back("Number of models: " + std::to_string(n_models));
-    return;
-}
-} // namespace bayesnet

bayesnet/ensembles/XBAODE.h

@@ -1,27 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2025 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#ifndef XBAODE_H
-#define XBAODE_H
-#include <vector>
-#include <cmath>
-#include "Boost.h"
-
-namespace bayesnet {
-    class XBAODE : public Boost {
-    public:
-        XBAODE();
-        std::string getVersion() override { return version; };
-    protected:
-        void trainModel(const torch::Tensor& weights, const bayesnet::Smoothing_t smoothing) override;
-    private:
-        std::vector<int> initializeModels(const Smoothing_t smoothing);
-        std::vector<std::vector<int>> X_train_, X_test_;
-        std::vector<int> y_train_, y_test_;
-        std::string version = "0.9.7";
-    };
-}
-#endif // XBAODE_H

bayesnet/network/Network.cc

@@ -209,7 +209,7 @@ namespace bayesnet {
             pthread_setname_np(threadName.c_str());
 #endif
             double numStates = static_cast<double>(node.second->getNumStates());
-            double smoothing_factor;
+            double smoothing_factor = 0.0;
             switch (smoothing) {
                 case Smoothing_t::ORIGINAL:
                     smoothing_factor = 1.0 / n_samples;
@@ -221,7 +221,7 @@ namespace bayesnet {
                     smoothing_factor = 1 / numStates;
                     break;
                 default:
-                    smoothing_factor = 0.0; // No smoothing 
+                    throw std::invalid_argument("Smoothing method not recognized " + std::to_string(static_cast<int>(smoothing)));
             }
             node.second->computeCPT(samples, features, smoothing_factor, weights);
             semaphore.release();
@@ -234,6 +234,16 @@ namespace bayesnet {
         for (auto& thread : threads) {
             thread.join();
         }
+        // std::fstream file;
+        // file.open("cpt.txt", std::fstream::out | std::fstream::app);
+        // file << std::string(80, '*') << std::endl;
+        // for (const auto& item : graph("Test")) {
+        //     file << item << std::endl;
+        // }
+        // file << std::string(80, '-') << std::endl;
+        // file << dump_cpt() << std::endl;
+        // file << std::string(80, '=') << std::endl;
+        // file.close();
         fitted = true;
     }
     torch::Tensor Network::predict_tensor(const torch::Tensor& samples, const bool proba)

bayesnet/network/Network.h

@@ -10,10 +10,14 @@
 #include <vector>
 #include "bayesnet/config.h"
 #include "Node.h"
-#include "Smoothing.h"
 
 namespace bayesnet {
-
+    enum class Smoothing_t {
+        NONE = -1,
+        ORIGINAL = 0,
+        LAPLACE,
+        CESTNIK
+    };
     class Network {
     public:
         Network();

bayesnet/network/Node.cc

@@ -93,42 +93,36 @@ namespace bayesnet {
     void Node::computeCPT(const torch::Tensor& dataset, const std::vector<std::string>& features, const double smoothing, const torch::Tensor& weights)
     {
         dimensions.clear();
-        dimensions.reserve(parents.size() + 1);
         // Get dimensions of the CPT
         dimensions.push_back(numStates);
-        for (const auto& parent : parents) {
+        transform(parents.begin(), parents.end(), back_inserter(dimensions), [](const auto& parent) { return parent->getNumStates(); });
-            dimensions.push_back(parent->getNumStates());
+        // Create a tensor of zeros with the dimensions of the CPT
-        }
+        cpTable = torch::zeros(dimensions, torch::kDouble).to(device) + smoothing;
-        //transform(parents.begin(), parents.end(), back_inserter(dimensions), [](const auto& parent) { return parent->getNumStates(); });
-        // Create a tensor initialized with smoothing
-        cpTable = torch::full(dimensions, smoothing, torch::kDouble);
-        // Create a map for quick feature index lookup
-        std::unordered_map<std::string, int> featureIndexMap;
-        for (size_t i = 0; i < features.size(); ++i) {
-            featureIndexMap[features[i]] = i;
-        }
         // Fill table with counts
-        // Get the index of this node's feature
+        auto pos = find(features.begin(), features.end(), name);
-        int name_index = featureIndexMap[name];
+        if (pos == features.end()) {
-        // Get parent indices in dataset
+            throw std::logic_error("Feature " + name + " not found in dataset");
-        std::vector<int> parent_indices;
-        parent_indices.reserve(parents.size());
-        for (const auto& parent : parents) {
-            parent_indices.push_back(featureIndexMap[parent->getName()]);
         }
+        int name_index = pos - features.begin();
         c10::List<c10::optional<at::Tensor>> coordinates;
         for (int n_sample = 0; n_sample < dataset.size(1); ++n_sample) {
             coordinates.clear();
             auto sample = dataset.index({ "...", n_sample });
             coordinates.push_back(sample[name_index]);
-            for (size_t i = 0; i < parent_indices.size(); ++i) {
+            for (auto parent : parents) {
-                coordinates.push_back(sample[parent_indices[i]]);
+                pos = find(features.begin(), features.end(), parent->getName());
+                if (pos == features.end()) {
+                    throw std::logic_error("Feature parent " + parent->getName() + " not found in dataset");
+                }
+                int parent_index = pos - features.begin();
+                coordinates.push_back(sample[parent_index]);
             }
             // Increment the count of the corresponding coordinate
             cpTable.index_put_({ coordinates }, weights.index({ n_sample }), true);
         }
-        // Normalize the counts (dividing each row by the sum of the row)
+        // Normalize the counts
-        cpTable /= cpTable.sum(0, true);
+        // Divide each row by the sum of the row
+        cpTable = cpTable / cpTable.sum(0);
     }
     double Node::getFactorValue(std::map<std::string, int>& evidence)
     {

bayesnet/network/Smoothing.h

@@ -1,17 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#ifndef SMOOTHING_H
-#define SMOOTHING_H
-namespace bayesnet {
-    enum class Smoothing_t {
-        NONE = -1,
-        ORIGINAL = 0,
-        LAPLACE,
-        CESTNIK
-    };
-}
-#endif // SMOOTHING_H

bayesnet/utils/CountingSemaphore.h

@@ -32,14 +32,6 @@ public:
             cv_.notify_one();
         }
     }
-    uint getCount() const
-    {
-        return count_;
-    }
-    uint getMaxCount() const
-    {
-        return max_count_;
-    }
 private:
     CountingSemaphore()
         : max_count_(std::max(1u, static_cast<uint>(0.95 * std::thread::hardware_concurrency()))),

bayesnet/utils/Mst.cc

@@ -53,14 +53,14 @@ namespace bayesnet {
         }
     }
 
-    void MST::insertElement(std::list<int>& variables, int variable)
+    void insertElement(std::list<int>& variables, int variable)
     {
         if (std::find(variables.begin(), variables.end(), variable) == variables.end()) {
             variables.push_front(variable);
         }
     }
 
-    std::vector<std::pair<int, int>> MST::reorder(std::vector<std::pair<float, std::pair<int, int>>> T, int root_original)
+    std::vector<std::pair<int, int>> reorder(std::vector<std::pair<float, std::pair<int, int>>> T, int root_original)
     {
         // Create the edges of a DAG from the MST
         // replacing unordered_set with list because unordered_set cannot guarantee the order of the elements inserted

bayesnet/utils/Mst.h

@@ -14,8 +14,6 @@ namespace bayesnet {
     public:
         MST() = default;
         MST(const std::vector<std::string>& features, const torch::Tensor& weights, const int root);
-        void insertElement(std::list<int>& variables, int variable);
-        std::vector<std::pair<int, int>> reorder(std::vector<std::pair<float, std::pair<int, int>>> T, int root_original);
         std::vector<std::pair<int, int>> maximumSpanningTree();
     private:
         torch::Tensor weights;

bayesnet/utils/TensorUtils.h

@@ -1,51 +0,0 @@
-#ifndef TENSORUTILS_H
-#define TENSORUTILS_H
-#include <torch/torch.h>
-#include <vector>
-namespace bayesnet {
-    class TensorUtils {
-    public:
-        static std::vector<std::vector<int>> to_matrix(const torch::Tensor& X)
-        {
-            // Ensure tensor is contiguous in memory
-            auto X_contig = X.contiguous();
-
-            // Access tensor data pointer directly
-            auto data_ptr = X_contig.data_ptr<int>();
-
-            // IF you are using int64_t as the data type, use the following line
-            //auto data_ptr = X_contig.data_ptr<int64_t>();
-            //std::vector<std::vector<int64_t>> data(X.size(0), std::vector<int64_t>(X.size(1)));
-
-            // Prepare output container
-            std::vector<std::vector<int>> data(X.size(0), std::vector<int>(X.size(1)));
-
-            // Fill the 2D vector in a single loop using pointer arithmetic
-            int rows = X.size(0);
-            int cols = X.size(1);
-            for (int i = 0; i < rows; ++i) {
-                std::copy(data_ptr + i * cols, data_ptr + (i + 1) * cols, data[i].begin());
-            }
-            return data;
-        }
-        template <typename T>
-        static std::vector<T> to_vector(const torch::Tensor& y)
-        {
-            // Ensure the tensor is contiguous in memory
-            auto y_contig = y.contiguous();
-
-            // Access data pointer
-            auto data_ptr = y_contig.data_ptr<T>();
-
-            // Prepare output container
-            std::vector<T> data(y.size(0));
-
-            // Copy data efficiently
-            std::copy(data_ptr, data_ptr + y.size(0), data.begin());
-
-            return data;
-        }
-    };
-}
-
-#endif // TENSORUTILS_H

cmake/modules/CodeCoverage.cmake

@@ -137,7 +137,7 @@
 
 include(CMakeParseArguments)
 
-option(CODE_COVERAGE_VERBOSE "Verbose information" TRUE)
+option(CODE_COVERAGE_VERBOSE "Verbose information" FALSE)
 
 # Check prereqs
 find_program( GCOV_PATH gcov )
@@ -160,11 +160,7 @@ foreach(LANG ${LANGUAGES})
     endif()
   elseif(NOT "${CMAKE_${LANG}_COMPILER_ID}" MATCHES "GNU"
          AND NOT "${CMAKE_${LANG}_COMPILER_ID}" MATCHES "(LLVM)?[Ff]lang")
-         if ("${LANG}" MATCHES "CUDA")
+    message(FATAL_ERROR "Compiler is not GNU or Flang! Aborting...")
-             message(STATUS "Ignoring CUDA")
-        else()
-            message(FATAL_ERROR "Compiler is not GNU or Flang! Aborting...")
-        endif()
   endif()
 endforeach()
 

diagrams/BayesNet.puml

@@ -1,16 +1,36 @@
 @startuml
 title clang-uml class diagram model
-class "bayesnet::Node" as C_0010428199432536647474
+class "bayesnet::Metrics" as C_0000736965376885623323
-class C_0010428199432536647474 #aliceblue;line:blue;line.dotted;text:blue {
+class C_0000736965376885623323 #aliceblue;line:blue;line.dotted;text:blue {
++Metrics() = default : void
++Metrics(const torch::Tensor & samples, const std::vector<std::string> & features, const std::string & className, const int classNumStates) : void
++Metrics(const std::vector<std::vector<int>> & vsamples, const std::vector<int> & labels, const std::vector<std::string> & features, const std::string & className, const int classNumStates) : void
+..
++SelectKBestWeighted(const torch::Tensor & weights, bool ascending = false, unsigned int k = 0) : std::vector<int>
++conditionalEdge(const torch::Tensor & weights) : torch::Tensor
++conditionalEdgeWeights(std::vector<float> & weights) : std::vector<float>
+#doCombinations<T>(const std::vector<T> & source) : std::vector<std::pair<T, T> >
+#entropy(const torch::Tensor & feature, const torch::Tensor & weights) : double
++getScoresKBest() const : std::vector<double>
++maximumSpanningTree(const std::vector<std::string> & features, const torch::Tensor & weights, const int root) : std::vector<std::pair<int,int>>
++mutualInformation(const torch::Tensor & firstFeature, const torch::Tensor & secondFeature, const torch::Tensor & weights) : double
+#pop_first<T>(std::vector<T> & v) : T
+__
+#className : std::string
+#features : std::vector<std::string>
+#samples : torch::Tensor
+}
+class "bayesnet::Node" as C_0001303524929067080934
+class C_0001303524929067080934 #aliceblue;line:blue;line.dotted;text:blue {
 +Node(const std::string &) : void
 ..
 +addChild(Node *) : void
 +addParent(Node *) : void
 +clear() : void
-+computeCPT(const torch::Tensor & dataset, const std::vector<std::string> & features, const double smoothing, const torch::Tensor & weights) : void
++computeCPT(const torch::Tensor & dataset, const std::vector<std::string> & features, const double laplaceSmoothing, const torch::Tensor & weights) : void
 +getCPT() : torch::Tensor &
 +getChildren() : std::vector<Node *> &
-+getFactorValue(std::map<std::string,int> &) : double
++getFactorValue(std::map<std::string,int> &) : float
 +getName() const : std::string
 +getNumStates() const : int
 +getParents() : std::vector<Node *> &
@@ -21,29 +41,24 @@ class C_0010428199432536647474 #aliceblue;line:blue;line.dotted;text:blue {
 +setNumStates(int) : void
 __
 }
-enum "bayesnet::Smoothing_t" as C_0013393078277439680282
+class "bayesnet::Network" as C_0001186707649890429575
-enum C_0013393078277439680282 {
+class C_0001186707649890429575 #aliceblue;line:blue;line.dotted;text:blue {
-NONE
-ORIGINAL
-LAPLACE
-CESTNIK
-}
-class "bayesnet::Network" as C_0009493661199123436603
-class C_0009493661199123436603 #aliceblue;line:blue;line.dotted;text:blue {
 +Network() : void
++Network(float) : void
 +Network(const Network &) : void
 +~Network() = default : void
 ..
 +addEdge(const std::string &, const std::string &) : void
 +addNode(const std::string &) : void
 +dump_cpt() const : std::string
-+fit(const torch::Tensor & samples, const torch::Tensor & weights, const std::vector<std::string> & featureNames, const std::string & className, const std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : void
++fit(const torch::Tensor & samples, const torch::Tensor & weights, const std::vector<std::string> & featureNames, const std::string & className, const std::map<std::string,std::vector<int>> & states) : void
-+fit(const torch::Tensor & X, const torch::Tensor & y, const torch::Tensor & weights, const std::vector<std::string> & featureNames, const std::string & className, const std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : void
++fit(const torch::Tensor & X, const torch::Tensor & y, const torch::Tensor & weights, const std::vector<std::string> & featureNames, const std::string & className, const std::map<std::string,std::vector<int>> & states) : void
-+fit(const std::vector<std::vector<int>> & input_data, const std::vector<int> & labels, const std::vector<double> & weights, const std::vector<std::string> & featureNames, const std::string & className, const std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : void
++fit(const std::vector<std::vector<int>> & input_data, const std::vector<int> & labels, const std::vector<double> & weights, const std::vector<std::string> & featureNames, const std::string & className, const std::map<std::string,std::vector<int>> & states) : void
 +getClassName() const : std::string
 +getClassNumStates() const : int
 +getEdges() const : std::vector<std::pair<std::string,std::string>>
 +getFeatures() const : std::vector<std::string>
++getMaxThreads() const : float
 +getNodes() : std::map<std::string,std::unique_ptr<Node>> &
 +getNumEdges() const : int
 +getSamples() : torch::Tensor &
@@ -61,21 +76,21 @@ class C_0009493661199123436603 #aliceblue;line:blue;line.dotted;text:blue {
 +version() : std::string
 __
 }
-enum "bayesnet::status_t" as C_0005907365846270811004
+enum "bayesnet::status_t" as C_0000738420730783851375
-enum C_0005907365846270811004 {
+enum C_0000738420730783851375 {
 NORMAL
 WARNING
 ERROR
 }
-abstract "bayesnet::BaseClassifier" as C_0002617087915615796317
+abstract "bayesnet::BaseClassifier" as C_0000327135989451974539
-abstract C_0002617087915615796317 #aliceblue;line:blue;line.dotted;text:blue {
+abstract C_0000327135989451974539 #aliceblue;line:blue;line.dotted;text:blue {
 +~BaseClassifier() = default : void
 ..
 {abstract} +dump_cpt() const = 0 : std::string
-{abstract} +fit(torch::Tensor & X, torch::Tensor & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) = 0 : BaseClassifier &
+{abstract} +fit(torch::Tensor & X, torch::Tensor & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) = 0 : BaseClassifier &
-{abstract} +fit(torch::Tensor & dataset, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) = 0 : BaseClassifier &
+{abstract} +fit(torch::Tensor & dataset, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) = 0 : BaseClassifier &
-{abstract} +fit(torch::Tensor & dataset, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const torch::Tensor & weights, const Smoothing_t smoothing) = 0 : BaseClassifier &
+{abstract} +fit(torch::Tensor & dataset, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const torch::Tensor & weights) = 0 : BaseClassifier &
-{abstract} +fit(std::vector<std::vector<int>> & X, std::vector<int> & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) = 0 : BaseClassifier &
+{abstract} +fit(std::vector<std::vector<int>> & X, std::vector<int> & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) = 0 : BaseClassifier &
 {abstract} +getClassNumStates() const = 0 : int
 {abstract} +getNotes() const = 0 : std::vector<std::string>
 {abstract} +getNumberOfEdges() const = 0 : int
@@ -94,35 +109,12 @@ abstract C_0002617087915615796317 #aliceblue;line:blue;line.dotted;text:blue {
 {abstract} +setHyperparameters(const nlohmann::json & hyperparameters) = 0 : void
 {abstract} +show() const = 0 : std::vector<std::string>
 {abstract} +topological_order() = 0 : std::vector<std::string>
-{abstract} #trainModel(const torch::Tensor & weights, const Smoothing_t smoothing) = 0 : void
+{abstract} #trainModel(const torch::Tensor & weights) = 0 : void
 __
 #validHyperparameters : std::vector<std::string>
 }
-class "bayesnet::Metrics" as C_0005895723015084986588
+abstract "bayesnet::Classifier" as C_0002043996622900301644
-class C_0005895723015084986588 #aliceblue;line:blue;line.dotted;text:blue {
+abstract C_0002043996622900301644 #aliceblue;line:blue;line.dotted;text:blue {
-+Metrics() = default : void
-+Metrics(const torch::Tensor & samples, const std::vector<std::string> & features, const std::string & className, const int classNumStates) : void
-+Metrics(const std::vector<std::vector<int>> & vsamples, const std::vector<int> & labels, const std::vector<std::string> & features, const std::string & className, const int classNumStates) : void
-..
-+SelectKBestWeighted(const torch::Tensor & weights, bool ascending = false, unsigned int k = 0) : std::vector<int>
-+SelectKPairs(const torch::Tensor & weights, std::vector<int> & featuresExcluded, bool ascending = false, unsigned int k = 0) : std::vector<std::pair<int,int>>
-+conditionalEdge(const torch::Tensor & weights) : torch::Tensor
-+conditionalEntropy(const torch::Tensor & firstFeature, const torch::Tensor & secondFeature, const torch::Tensor & labels, const torch::Tensor & weights) : double
-+conditionalMutualInformation(const torch::Tensor & firstFeature, const torch::Tensor & secondFeature, const torch::Tensor & labels, const torch::Tensor & weights) : double
-#doCombinations<T>(const std::vector<T> & source) : std::vector<std::pair<T, T> >
-+entropy(const torch::Tensor & feature, const torch::Tensor & weights) : double
-+getScoresKBest() const : std::vector<double>
-+getScoresKPairs() const : std::vector<std::pair<std::pair<int,int>,double>>
-+maximumSpanningTree(const std::vector<std::string> & features, const torch::Tensor & weights, const int root) : std::vector<std::pair<int,int>>
-+mutualInformation(const torch::Tensor & firstFeature, const torch::Tensor & secondFeature, const torch::Tensor & weights) : double
-#pop_first<T>(std::vector<T> & v) : T
-__
-#className : std::string
-#features : std::vector<std::string>
-#samples : torch::Tensor
-}
-abstract "bayesnet::Classifier" as C_0016351972983202413152
-abstract C_0016351972983202413152 #aliceblue;line:blue;line.dotted;text:blue {
 +Classifier(Network model) : void
 +~Classifier() = default : void
 ..
@@ -131,10 +123,10 @@ abstract C_0016351972983202413152 #aliceblue;line:blue;line.dotted;text:blue {
 {abstract} #buildModel(const torch::Tensor & weights) = 0 : void
 #checkFitParameters() : void
 +dump_cpt() const : std::string
-+fit(torch::Tensor & X, torch::Tensor & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : Classifier &
++fit(torch::Tensor & X, torch::Tensor & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) : Classifier &
-+fit(std::vector<std::vector<int>> & X, std::vector<int> & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : Classifier &
++fit(std::vector<std::vector<int>> & X, std::vector<int> & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) : Classifier &
-+fit(torch::Tensor & dataset, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : Classifier &
++fit(torch::Tensor & dataset, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) : Classifier &
-+fit(torch::Tensor & dataset, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const torch::Tensor & weights, const Smoothing_t smoothing) : Classifier &
++fit(torch::Tensor & dataset, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const torch::Tensor & weights) : Classifier &
 +getClassNumStates() const : int
 +getNotes() const : std::vector<std::string>
 +getNumberOfEdges() const : int
@@ -151,7 +143,7 @@ abstract C_0016351972983202413152 #aliceblue;line:blue;line.dotted;text:blue {
 +setHyperparameters(const nlohmann::json & hyperparameters) : void
 +show() const : std::vector<std::string>
 +topological_order() : std::vector<std::string>
-#trainModel(const torch::Tensor & weights, const Smoothing_t smoothing) : void
+#trainModel(const torch::Tensor & weights) : void
 __
 #className : std::string
 #dataset : torch::Tensor
@@ -165,8 +157,8 @@ __
 #states : std::map<std::string,std::vector<int>>
 #status : status_t
 }
-class "bayesnet::KDB" as C_0008902920152122000044
+class "bayesnet::KDB" as C_0001112865019015250005
-class C_0008902920152122000044 #aliceblue;line:blue;line.dotted;text:blue {
+class C_0001112865019015250005 #aliceblue;line:blue;line.dotted;text:blue {
 +KDB(int k, float theta = 0.03) : void
 +~KDB() = default : void
 ..
@@ -175,26 +167,8 @@ class C_0008902920152122000044 #aliceblue;line:blue;line.dotted;text:blue {
 +setHyperparameters(const nlohmann::json & hyperparameters_) : void
 __
 }
-class "bayesnet::SPODE" as C_0004096182510460307610
+class "bayesnet::TAN" as C_0001760994424884323017
-class C_0004096182510460307610 #aliceblue;line:blue;line.dotted;text:blue {
+class C_0001760994424884323017 #aliceblue;line:blue;line.dotted;text:blue {
-+SPODE(int root) : void
-+~SPODE() = default : void
-..
-#buildModel(const torch::Tensor & weights) : void
-+graph(const std::string & name = "SPODE") const : std::vector<std::string>
-__
-}
-class "bayesnet::SPnDE" as C_0016268916386101512883
-class C_0016268916386101512883 #aliceblue;line:blue;line.dotted;text:blue {
-+SPnDE(std::vector<int> parents) : void
-+~SPnDE() = default : void
-..
-#buildModel(const torch::Tensor & weights) : void
-+graph(const std::string & name = "SPnDE") const : std::vector<std::string>
-__
-}
-class "bayesnet::TAN" as C_0014087955399074584137
-class C_0014087955399074584137 #aliceblue;line:blue;line.dotted;text:blue {
 +TAN() : void
 +~TAN() = default : void
 ..
@@ -202,8 +176,8 @@ class C_0014087955399074584137 #aliceblue;line:blue;line.dotted;text:blue {
 +graph(const std::string & name = "TAN") const : std::vector<std::string>
 __
 }
-class "bayesnet::Proposal" as C_0017759964713298103839
+class "bayesnet::Proposal" as C_0002219995589162262979
-class C_0017759964713298103839 #aliceblue;line:blue;line.dotted;text:blue {
+class C_0002219995589162262979 #aliceblue;line:blue;line.dotted;text:blue {
 +Proposal(torch::Tensor & pDataset, std::vector<std::string> & features_, std::string & className_) : void
 +~Proposal() : void
 ..
@@ -216,42 +190,74 @@ __
 #discretizers : map<std::string,mdlp::CPPFImdlp *>
 #y : torch::Tensor
 }
-class "bayesnet::KDBLd" as C_0002756018222998454702
+class "bayesnet::TANLd" as C_0001668829096702037834
-class C_0002756018222998454702 #aliceblue;line:blue;line.dotted;text:blue {
+class C_0001668829096702037834 #aliceblue;line:blue;line.dotted;text:blue {
-+KDBLd(int k) : void
-+~KDBLd() = default : void
-..
-+fit(torch::Tensor & X, torch::Tensor & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : KDBLd &
-+graph(const std::string & name = "KDB") const : std::vector<std::string>
-+predict(torch::Tensor & X) : torch::Tensor
-{static} +version() : std::string
-__
-}
-class "bayesnet::SPODELd" as C_0010957245114062042836
-class C_0010957245114062042836 #aliceblue;line:blue;line.dotted;text:blue {
-+SPODELd(int root) : void
-+~SPODELd() = default : void
-..
-+commonFit(const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : SPODELd &
-+fit(torch::Tensor & X, torch::Tensor & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : SPODELd &
-+fit(torch::Tensor & dataset, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : SPODELd &
-+graph(const std::string & name = "SPODELd") const : std::vector<std::string>
-+predict(torch::Tensor & X) : torch::Tensor
-{static} +version() : std::string
-__
-}
-class "bayesnet::TANLd" as C_0013350632773616302678
-class C_0013350632773616302678 #aliceblue;line:blue;line.dotted;text:blue {
 +TANLd() : void
 +~TANLd() = default : void
 ..
-+fit(torch::Tensor & X, torch::Tensor & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states, const Smoothing_t smoothing) : TANLd &
++fit(torch::Tensor & X, torch::Tensor & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) : TANLd &
-+graph(const std::string & name = "TANLd") const : std::vector<std::string>
++graph(const std::string & name = "TAN") const : std::vector<std::string>
 +predict(torch::Tensor & X) : torch::Tensor
+{static} +version() : std::string
 __
 }
-class "bayesnet::Ensemble" as C_0015881931090842884611
+abstract "bayesnet::FeatureSelect" as C_0001695326193250580823
-class C_0015881931090842884611 #aliceblue;line:blue;line.dotted;text:blue {
+abstract C_0001695326193250580823 #aliceblue;line:blue;line.dotted;text:blue {
++FeatureSelect(const torch::Tensor & samples, const std::vector<std::string> & features, const std::string & className, const int maxFeatures, const int classNumStates, const torch::Tensor & weights) : void
++~FeatureSelect() : void
+..
+#computeMeritCFS() : double
+#computeSuFeatures(const int a, const int b) : double
+#computeSuLabels() : void
+{abstract} +fit() = 0 : void
++getFeatures() const : std::vector<int>
++getScores() const : std::vector<double>
+#initialize() : void
+#symmetricalUncertainty(int a, int b) : double
+__
+#fitted : bool
+#maxFeatures : int
+#selectedFeatures : std::vector<int>
+#selectedScores : std::vector<double>
+#suFeatures : std::map<std::pair<int,int>,double>
+#suLabels : std::vector<double>
+#weights : const torch::Tensor &
+}
+class "bayesnet::CFS" as C_0000011627355691342494
+class C_0000011627355691342494 #aliceblue;line:blue;line.dotted;text:blue {
++CFS(const torch::Tensor & samples, const std::vector<std::string> & features, const std::string & className, const int maxFeatures, const int classNumStates, const torch::Tensor & weights) : void
++~CFS() : void
+..
++fit() : void
+__
+}
+class "bayesnet::FCBF" as C_0000144682015341746929
+class C_0000144682015341746929 #aliceblue;line:blue;line.dotted;text:blue {
++FCBF(const torch::Tensor & samples, const std::vector<std::string> & features, const std::string & className, const int maxFeatures, const int classNumStates, const torch::Tensor & weights, const double threshold) : void
++~FCBF() : void
+..
++fit() : void
+__
+}
+class "bayesnet::IWSS" as C_0000008268514674428553
+class C_0000008268514674428553 #aliceblue;line:blue;line.dotted;text:blue {
++IWSS(const torch::Tensor & samples, const std::vector<std::string> & features, const std::string & className, const int maxFeatures, const int classNumStates, const torch::Tensor & weights, const double threshold) : void
++~IWSS() : void
+..
++fit() : void
+__
+}
+class "bayesnet::SPODE" as C_0000512022813807538451
+class C_0000512022813807538451 #aliceblue;line:blue;line.dotted;text:blue {
++SPODE(int root) : void
++~SPODE() = default : void
+..
+#buildModel(const torch::Tensor & weights) : void
++graph(const std::string & name = "SPODE") const : std::vector<std::string>
+__
+}
+class "bayesnet::Ensemble" as C_0001985241386355360576
+class C_0001985241386355360576 #aliceblue;line:blue;line.dotted;text:blue {
 +Ensemble(bool predict_voting = true) : void
 +~Ensemble() = default : void
 ..
@@ -274,7 +280,7 @@ class C_0015881931090842884611 #aliceblue;line:blue;line.dotted;text:blue {
 +score(torch::Tensor & X, torch::Tensor & y) : float
 +show() const : std::vector<std::string>
 +topological_order() : std::vector<std::string>
-#trainModel(const torch::Tensor & weights, const Smoothing_t smoothing) : void
+#trainModel(const torch::Tensor & weights) : void
 #voting(torch::Tensor & votes) : torch::Tensor
 __
 #models : std::vector<std::unique_ptr<Classifier>>
@@ -282,223 +288,41 @@ __
 #predict_voting : bool
 #significanceModels : std::vector<double>
 }
-class "bayesnet::A2DE" as C_0001410789567057647859
+class "bayesnet::(anonymous_45089536)" as C_0001186398587753535158
-class C_0001410789567057647859 #aliceblue;line:blue;line.dotted;text:blue {
+class C_0001186398587753535158 #aliceblue;line:blue;line.dotted;text:blue {
-+A2DE(bool predict_voting = false) : void
-+~A2DE() : void
-..
-#buildModel(const torch::Tensor & weights) : void
-+graph(const std::string & title = "A2DE") const : std::vector<std::string>
-+setHyperparameters(const nlohmann::json & hyperparameters) : void
-__
-}
-class "bayesnet::AODE" as C_0006288892608974306258
-class C_0006288892608974306258 #aliceblue;line:blue;line.dotted;text:blue {
-+AODE(bool predict_voting = false) : void
-+~AODE() : void
-..
-#buildModel(const torch::Tensor & weights) : void
-+graph(const std::string & title = "AODE") const : std::vector<std::string>
-+setHyperparameters(const nlohmann::json & hyperparameters) : void
-__
-}
-abstract "bayesnet::FeatureSelect" as C_0013562609546004646591
-abstract C_0013562609546004646591 #aliceblue;line:blue;line.dotted;text:blue {
-+FeatureSelect(const torch::Tensor & samples, const std::vector<std::string> & features, const std::string & className, const int maxFeatures, const int classNumStates, const torch::Tensor & weights) : void
-+~FeatureSelect() : void
-..
-#computeMeritCFS() : double
-#computeSuFeatures(const int a, const int b) : double
-#computeSuLabels() : void
-{abstract} +fit() = 0 : void
-+getFeatures() const : std::vector<int>
-+getScores() const : std::vector<double>
-#initialize() : void
-#symmetricalUncertainty(int a, int b) : double
-__
-#fitted : bool
-#maxFeatures : int
-#selectedFeatures : std::vector<int>
-#selectedScores : std::vector<double>
-#suFeatures : std::map<std::pair<int,int>,double>
-#suLabels : std::vector<double>
-#weights : const torch::Tensor &
-}
-class "bayesnet::(anonymous_60342586)" as C_0005584545181746538542
-class C_0005584545181746538542 #aliceblue;line:blue;line.dotted;text:blue {
 __
 +CFS : std::string
 +FCBF : std::string
 +IWSS : std::string
 }
-class "bayesnet::(anonymous_60343240)" as C_0016227156982041949444
+class "bayesnet::(anonymous_45090163)" as C_0000602764946063116717
-class C_0016227156982041949444 #aliceblue;line:blue;line.dotted;text:blue {
+class C_0000602764946063116717 #aliceblue;line:blue;line.dotted;text:blue {
 __
 +ASC : std::string
 +DESC : std::string
 +RAND : std::string
 }
-class "bayesnet::Boost" as C_0009819322948617116148
+class "bayesnet::BoostAODE" as C_0000358471592399852382
-class C_0009819322948617116148 #aliceblue;line:blue;line.dotted;text:blue {
+class C_0000358471592399852382 #aliceblue;line:blue;line.dotted;text:blue {
-+Boost(bool predict_voting = false) : void
-+~Boost() = default : void
-..
-#buildModel(const torch::Tensor & weights) : void
-#featureSelection(torch::Tensor & weights_) : std::vector<int>
-+setHyperparameters(const nlohmann::json & hyperparameters_) : void
-#update_weights(torch::Tensor & ytrain, torch::Tensor & ypred, torch::Tensor & weights) : std::tuple<torch::Tensor &,double,bool>
-#update_weights_block(int k, torch::Tensor & ytrain, torch::Tensor & weights) : std::tuple<torch::Tensor &,double,bool>
-__
-#X_test : torch::Tensor
-#X_train : torch::Tensor
-#bisection : bool
-#block_update : bool
-#convergence : bool
-#convergence_best : bool
-#featureSelector : FeatureSelect *
-#maxTolerance : int
-#order_algorithm : std::string
-#selectFeatures : bool
-#select_features_algorithm : std::string
-#threshold : double
-#y_test : torch::Tensor
-#y_train : torch::Tensor
-}
-class "bayesnet::AODELd" as C_0003898187834670349177
-class C_0003898187834670349177 #aliceblue;line:blue;line.dotted;text:blue {
-+AODELd(bool predict_voting = true) : void
-+~AODELd() = default : void
-..
-#buildModel(const torch::Tensor & weights) : void
-+fit(torch::Tensor & X_, torch::Tensor & y_, const std::vector<std::string> & features_, const std::string & className_, std::map<std::string,std::vector<int>> & states_, const Smoothing_t smoothing) : AODELd &
-+graph(const std::string & name = "AODELd") const : std::vector<std::string>
-#trainModel(const torch::Tensor & weights, const Smoothing_t smoothing) : void
-__
-}
-class "bayesnet::(anonymous_60275628)" as C_0009086919615463763584
-class C_0009086919615463763584 #aliceblue;line:blue;line.dotted;text:blue {
-__
-+CFS : std::string
-+FCBF : std::string
-+IWSS : std::string
-}
-class "bayesnet::(anonymous_60276282)" as C_0015251985607563196159
-class C_0015251985607563196159 #aliceblue;line:blue;line.dotted;text:blue {
-__
-+ASC : std::string
-+DESC : std::string
-+RAND : std::string
-}
-class "bayesnet::BoostA2DE" as C_0000272055465257861326
-class C_0000272055465257861326 #aliceblue;line:blue;line.dotted;text:blue {
-+BoostA2DE(bool predict_voting = false) : void
-+~BoostA2DE() = default : void
-..
-+graph(const std::string & title = "BoostA2DE") const : std::vector<std::string>
-#trainModel(const torch::Tensor & weights, const Smoothing_t smoothing) : void
-__
-}
-class "bayesnet::(anonymous_60275502)" as C_0016033655851510053155
-class C_0016033655851510053155 #aliceblue;line:blue;line.dotted;text:blue {
-__
-+CFS : std::string
-+FCBF : std::string
-+IWSS : std::string
-}
-class "bayesnet::(anonymous_60276156)" as C_0000379522761622473555
-class C_0000379522761622473555 #aliceblue;line:blue;line.dotted;text:blue {
-__
-+ASC : std::string
-+DESC : std::string
-+RAND : std::string
-}
-class "bayesnet::BoostAODE" as C_0002867772739198819061
-class C_0002867772739198819061 #aliceblue;line:blue;line.dotted;text:blue {
 +BoostAODE(bool predict_voting = false) : void
 +~BoostAODE() = default : void
 ..
+#buildModel(const torch::Tensor & weights) : void
 +graph(const std::string & title = "BoostAODE") const : std::vector<std::string>
-#trainModel(const torch::Tensor & weights, const Smoothing_t smoothing) : void
++setHyperparameters(const nlohmann::json & hyperparameters_) : void
+#trainModel(const torch::Tensor & weights) : void
 __
 }
-class "bayesnet::CFS" as C_0000093018845530739957
+class "bayesnet::MST" as C_0000131858426172291700
-class C_0000093018845530739957 #aliceblue;line:blue;line.dotted;text:blue {
+class C_0000131858426172291700 #aliceblue;line:blue;line.dotted;text:blue {
-+CFS(const torch::Tensor & samples, const std::vector<std::string> & features, const std::string & className, const int maxFeatures, const int classNumStates, const torch::Tensor & weights) : void
-+~CFS() : void
-..
-+fit() : void
-__
-}
-class "bayesnet::FCBF" as C_0001157456122733975432
-class C_0001157456122733975432 #aliceblue;line:blue;line.dotted;text:blue {
-+FCBF(const torch::Tensor & samples, const std::vector<std::string> & features, const std::string & className, const int maxFeatures, const int classNumStates, const torch::Tensor & weights, const double threshold) : void
-+~FCBF() : void
-..
-+fit() : void
-__
-}
-class "bayesnet::IWSS" as C_0000066148117395428429
-class C_0000066148117395428429 #aliceblue;line:blue;line.dotted;text:blue {
-+IWSS(const torch::Tensor & samples, const std::vector<std::string> & features, const std::string & className, const int maxFeatures, const int classNumStates, const torch::Tensor & weights, const double threshold) : void
-+~IWSS() : void
-..
-+fit() : void
-__
-}
-class "bayesnet::(anonymous_60730495)" as C_0004857727320042830573
-class C_0004857727320042830573 #aliceblue;line:blue;line.dotted;text:blue {
-__
-+CFS : std::string
-+FCBF : std::string
-+IWSS : std::string
-}
-class "bayesnet::(anonymous_60731150)" as C_0000076541533312623385
-class C_0000076541533312623385 #aliceblue;line:blue;line.dotted;text:blue {
-__
-+ASC : std::string
-+DESC : std::string
-+RAND : std::string
-}
-class "bayesnet::(anonymous_60653004)" as C_0001444063444142949758
-class C_0001444063444142949758 #aliceblue;line:blue;line.dotted;text:blue {
-__
-+CFS : std::string
-+FCBF : std::string
-+IWSS : std::string
-}
-class "bayesnet::(anonymous_60653658)" as C_0007139277546931322856
-class C_0007139277546931322856 #aliceblue;line:blue;line.dotted;text:blue {
-__
-+ASC : std::string
-+DESC : std::string
-+RAND : std::string
-}
-class "bayesnet::(anonymous_60731375)" as C_0010493853592456211189
-class C_0010493853592456211189 #aliceblue;line:blue;line.dotted;text:blue {
-__
-+CFS : std::string
-+FCBF : std::string
-+IWSS : std::string
-}
-class "bayesnet::(anonymous_60732030)" as C_0007011438637915849564
-class C_0007011438637915849564 #aliceblue;line:blue;line.dotted;text:blue {
-__
-+ASC : std::string
-+DESC : std::string
-+RAND : std::string
-}
-class "bayesnet::MST" as C_0001054867409378333602
-class C_0001054867409378333602 #aliceblue;line:blue;line.dotted;text:blue {
 +MST() = default : void
 +MST(const std::vector<std::string> & features, const torch::Tensor & weights, const int root) : void
 ..
-+insertElement(std::list<int> & variables, int variable) : void
 +maximumSpanningTree() : std::vector<std::pair<int,int>>
-+reorder(std::vector<std::pair<float,std::pair<int,int>>> T, int root_original) : std::vector<std::pair<int,int>>
 __
 }
-class "bayesnet::Graph" as C_0009576333456015187741
+class "bayesnet::Graph" as C_0001197041682001898467
-class C_0009576333456015187741 #aliceblue;line:blue;line.dotted;text:blue {
+class C_0001197041682001898467 #aliceblue;line:blue;line.dotted;text:blue {
 +Graph(int V) : void
 ..
 +addEdge(int u, int v, float wt) : void
@@ -508,73 +332,81 @@ class C_0009576333456015187741 #aliceblue;line:blue;line.dotted;text:blue {
 +union_set(int u, int v) : void
 __
 }
-C_0010428199432536647474 --> C_0010428199432536647474 : -parents
+class "bayesnet::KDBLd" as C_0000344502277874806837
-C_0010428199432536647474 --> C_0010428199432536647474 : -children
+class C_0000344502277874806837 #aliceblue;line:blue;line.dotted;text:blue {
-C_0009493661199123436603 ..> C_0013393078277439680282
++KDBLd(int k) : void
-C_0009493661199123436603 o-- C_0010428199432536647474 : -nodes
++~KDBLd() = default : void
-C_0002617087915615796317 ..> C_0013393078277439680282
+..
-C_0002617087915615796317 ..> C_0005907365846270811004
++fit(torch::Tensor & X, torch::Tensor & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) : KDBLd &
-C_0016351972983202413152 ..> C_0013393078277439680282
++graph(const std::string & name = "KDB") const : std::vector<std::string>
-C_0016351972983202413152 o-- C_0009493661199123436603 : #model
++predict(torch::Tensor & X) : torch::Tensor
-C_0016351972983202413152 o-- C_0005895723015084986588 : #metrics
+{static} +version() : std::string
-C_0016351972983202413152 o-- C_0005907365846270811004 : #status
+__
-C_0002617087915615796317 <|-- C_0016351972983202413152
+}
+class "bayesnet::AODE" as C_0000786111576121788282
+class C_0000786111576121788282 #aliceblue;line:blue;line.dotted;text:blue {
++AODE(bool predict_voting = false) : void
++~AODE() : void
+..
+#buildModel(const torch::Tensor & weights) : void
++graph(const std::string & title = "AODE") const : std::vector<std::string>
++setHyperparameters(const nlohmann::json & hyperparameters) : void
+__
+}
+class "bayesnet::SPODELd" as C_0001369655639257755354
+class C_0001369655639257755354 #aliceblue;line:blue;line.dotted;text:blue {
++SPODELd(int root) : void
++~SPODELd() = default : void
+..
++commonFit(const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) : SPODELd &
++fit(torch::Tensor & X, torch::Tensor & y, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) : SPODELd &
++fit(torch::Tensor & dataset, const std::vector<std::string> & features, const std::string & className, std::map<std::string,std::vector<int>> & states) : SPODELd &
++graph(const std::string & name = "SPODE") const : std::vector<std::string>
++predict(torch::Tensor & X) : torch::Tensor
+{static} +version() : std::string
+__
+}
+class "bayesnet::AODELd" as C_0000487273479333793647
+class C_0000487273479333793647 #aliceblue;line:blue;line.dotted;text:blue {
++AODELd(bool predict_voting = true) : void
++~AODELd() = default : void
+..
+#buildModel(const torch::Tensor & weights) : void
++fit(torch::Tensor & X_, torch::Tensor & y_, const std::vector<std::string> & features_, const std::string & className_, std::map<std::string,std::vector<int>> & states_) : AODELd &
++graph(const std::string & name = "AODELd") const : std::vector<std::string>
+#trainModel(const torch::Tensor & weights) : void
+__
+}
+C_0001303524929067080934 --> C_0001303524929067080934 : -parents
+C_0001303524929067080934 --> C_0001303524929067080934 : -children
+C_0001186707649890429575 o-- C_0001303524929067080934 : -nodes
+C_0000327135989451974539 ..> C_0000738420730783851375
+C_0002043996622900301644 o-- C_0001186707649890429575 : #model
+C_0002043996622900301644 o-- C_0000736965376885623323 : #metrics
+C_0002043996622900301644 o-- C_0000738420730783851375 : #status
+C_0000327135989451974539 <|-- C_0002043996622900301644
+C_0002043996622900301644 <|-- C_0001112865019015250005
+C_0002043996622900301644 <|-- C_0001760994424884323017
+C_0002219995589162262979 ..> C_0001186707649890429575
+C_0001760994424884323017 <|-- C_0001668829096702037834
+C_0002219995589162262979 <|-- C_0001668829096702037834
+C_0000736965376885623323 <|-- C_0001695326193250580823
+C_0001695326193250580823 <|-- C_0000011627355691342494
+C_0001695326193250580823 <|-- C_0000144682015341746929
+C_0001695326193250580823 <|-- C_0000008268514674428553
+C_0002043996622900301644 <|-- C_0000512022813807538451
+C_0001985241386355360576 o-- C_0002043996622900301644 : #models
+C_0002043996622900301644 <|-- C_0001985241386355360576
+C_0000358471592399852382 --> C_0001695326193250580823 : -featureSelector
+C_0001985241386355360576 <|-- C_0000358471592399852382
+C_0001112865019015250005 <|-- C_0000344502277874806837
+C_0002219995589162262979 <|-- C_0000344502277874806837
+C_0001985241386355360576 <|-- C_0000786111576121788282
+C_0000512022813807538451 <|-- C_0001369655639257755354
+C_0002219995589162262979 <|-- C_0001369655639257755354
+C_0001985241386355360576 <|-- C_0000487273479333793647
+C_0002219995589162262979 <|-- C_0000487273479333793647
 
-C_0016351972983202413152 <|-- C_0008902920152122000044
+'Generated with clang-uml, version 0.5.1
-
+'LLVM version clang version 17.0.6 (Fedora 17.0.6-2.fc39)
-C_0016351972983202413152 <|-- C_0004096182510460307610
-
-C_0016351972983202413152 <|-- C_0016268916386101512883
-
-C_0016351972983202413152 <|-- C_0014087955399074584137
-
-C_0017759964713298103839 ..> C_0009493661199123436603
-C_0002756018222998454702 ..> C_0013393078277439680282
-C_0008902920152122000044 <|-- C_0002756018222998454702
-
-C_0017759964713298103839 <|-- C_0002756018222998454702
-
-C_0010957245114062042836 ..> C_0013393078277439680282
-C_0004096182510460307610 <|-- C_0010957245114062042836
-
-C_0017759964713298103839 <|-- C_0010957245114062042836
-
-C_0013350632773616302678 ..> C_0013393078277439680282
-C_0014087955399074584137 <|-- C_0013350632773616302678
-
-C_0017759964713298103839 <|-- C_0013350632773616302678
-
-C_0015881931090842884611 ..> C_0013393078277439680282
-C_0015881931090842884611 o-- C_0016351972983202413152 : #models
-C_0016351972983202413152 <|-- C_0015881931090842884611
-
-C_0015881931090842884611 <|-- C_0001410789567057647859
-
-C_0015881931090842884611 <|-- C_0006288892608974306258
-
-C_0005895723015084986588 <|-- C_0013562609546004646591
-
-C_0009819322948617116148 --> C_0013562609546004646591 : #featureSelector
-C_0015881931090842884611 <|-- C_0009819322948617116148
-
-C_0003898187834670349177 ..> C_0013393078277439680282
-C_0015881931090842884611 <|-- C_0003898187834670349177
-
-C_0017759964713298103839 <|-- C_0003898187834670349177
-
-C_0000272055465257861326 ..> C_0013393078277439680282
-C_0009819322948617116148 <|-- C_0000272055465257861326
-
-C_0002867772739198819061 ..> C_0013393078277439680282
-C_0009819322948617116148 <|-- C_0002867772739198819061
-
-C_0013562609546004646591 <|-- C_0000093018845530739957
-
-C_0013562609546004646591 <|-- C_0001157456122733975432
-
-C_0013562609546004646591 <|-- C_0000066148117395428429
-
-
-'Generated with clang-uml, version 0.5.5
-'LLVM version clang version 18.1.8 (Fedora 18.1.8-5.fc41)
 @enduml

diagrams/dependency.svg

@@ -1,314 +1,128 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
  "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<!-- Generated by graphviz version 12.1.0 (20240811.2233)
+<!-- Generated by graphviz version 8.1.0 (20230707.0739)
  -->
 <!-- Title: BayesNet Pages: 1 -->
-<svg width="3725pt" height="432pt"
+<svg width="1632pt" height="288pt"
- viewBox="0.00 0.00 3724.84 431.80" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+ viewBox="0.00 0.00 1631.95 287.80" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 427.8)">
+<g id="graph0" class="graph" transform="scale(1 1) rotate(0) translate(4 283.8)">
 <title>BayesNet</title>
-<polygon fill="white" stroke="none" points="-4,4 -4,-427.8 3720.84,-427.8 3720.84,4 -4,4"/>
+<polygon fill="white" stroke="none" points="-4,4 -4,-283.8 1627.95,-283.8 1627.95,4 -4,4"/>
-<!-- node0 -->
-<g id="node1" class="node">
-<title>node0</title>
-<polygon fill="none" stroke="black" points="1655.43,-398.35 1655.43,-413.26 1625.69,-423.8 1583.63,-423.8 1553.89,-413.26 1553.89,-398.35 1583.63,-387.8 1625.69,-387.8 1655.43,-398.35"/>
-<text text-anchor="middle" x="1604.66" y="-401.53" font-family="Times,serif" font-size="12.00">BayesNet</text>
-</g>
 <!-- node1 -->
-<g id="node2" class="node">
+<g id="node1" class="node">
 <title>node1</title>
-<polygon fill="none" stroke="black" points="413.32,-257.8 372.39,-273.03 206.66,-279.8 40.93,-273.03 0,-257.8 114.69,-245.59 298.64,-245.59 413.32,-257.8"/>
+<polygon fill="none" stroke="black" points="826.43,-254.35 826.43,-269.26 796.69,-279.8 754.63,-279.8 724.89,-269.26 724.89,-254.35 754.63,-243.8 796.69,-243.8 826.43,-254.35"/>
-<text text-anchor="middle" x="206.66" y="-257.53" font-family="Times,serif" font-size="12.00">/home/rmontanana/Code/libtorch/lib/libc10.so</text>
+<text text-anchor="middle" x="775.66" y="-257.53" font-family="Times,serif" font-size="12.00">BayesNet</text>
-</g>
-<!-- node0&#45;&gt;node1 -->
-<g id="edge1" class="edge">
-<title>node0&#45;&gt;node1</title>
-<path fill="none" stroke="black" d="M1553.59,-400.53C1451.65,-391.91 1215.69,-371.61 1017.66,-351.8 773.36,-327.37 488.07,-295.22 329.31,-277.01"/>
-<polygon fill="black" stroke="black" points="329.93,-273.56 319.6,-275.89 329.14,-280.51 329.93,-273.56"/>
 </g>
 <!-- node2 -->
-<g id="node3" class="node">
+<g id="node2" class="node">
 <title>node2</title>
-<polygon fill="none" stroke="black" points="894.21,-257.8 848.35,-273.03 662.66,-279.8 476.98,-273.03 431.12,-257.8 559.61,-245.59 765.71,-245.59 894.21,-257.8"/>
+<polygon fill="none" stroke="black" points="413.32,-185.8 372.39,-201.03 206.66,-207.8 40.93,-201.03 0,-185.8 114.69,-173.59 298.64,-173.59 413.32,-185.8"/>
-<text text-anchor="middle" x="662.66" y="-257.53" font-family="Times,serif" font-size="12.00">/home/rmontanana/Code/libtorch/lib/libc10_cuda.so</text>
+<text text-anchor="middle" x="206.66" y="-185.53" font-family="Times,serif" font-size="12.00">/home/rmontanana/Code/libtorch/lib/libc10.so</text>
 </g>
-<!-- node0&#45;&gt;node2 -->
+<!-- node1&#45;&gt;node2 -->
-<g id="edge2" class="edge">
+<g id="edge1" class="edge">
-<title>node0&#45;&gt;node2</title>
+<title>node1&#45;&gt;node2</title>
-<path fill="none" stroke="black" d="M1555.34,-397.37C1408.12,-375.18 969.52,-309.06 767.13,-278.55"/>
+<path fill="none" stroke="black" d="M724.41,-254.5C634.7,-243.46 447.04,-220.38 324.01,-205.24"/>
-<polygon fill="black" stroke="black" points="767.81,-275.12 757.4,-277.09 766.77,-282.04 767.81,-275.12"/>
+<polygon fill="black" stroke="black" points="324.77,-201.69 314.42,-203.94 323.92,-208.63 324.77,-201.69"/>
 </g>
 <!-- node3 -->
-<g id="node4" class="node">
+<g id="node3" class="node">
 <title>node3</title>
-<polygon fill="none" stroke="black" points="1338.68,-257.8 1296.49,-273.03 1125.66,-279.8 954.84,-273.03 912.65,-257.8 1030.86,-245.59 1220.46,-245.59 1338.68,-257.8"/>
+<polygon fill="none" stroke="black" points="857.68,-185.8 815.49,-201.03 644.66,-207.8 473.84,-201.03 431.65,-185.8 549.86,-173.59 739.46,-173.59 857.68,-185.8"/>
-<text text-anchor="middle" x="1125.66" y="-257.53" font-family="Times,serif" font-size="12.00">/home/rmontanana/Code/libtorch/lib/libkineto.a</text>
+<text text-anchor="middle" x="644.66" y="-185.53" font-family="Times,serif" font-size="12.00">/home/rmontanana/Code/libtorch/lib/libkineto.a</text>
 </g>
-<!-- node0&#45;&gt;node3 -->
+<!-- node1&#45;&gt;node3 -->
-<g id="edge3" class="edge">
+<g id="edge2" class="edge">
-<title>node0&#45;&gt;node3</title>
+<title>node1&#45;&gt;node3</title>
-<path fill="none" stroke="black" d="M1566.68,-393.54C1484.46,-369.17 1289.3,-311.32 1188.44,-281.41"/>
+<path fill="none" stroke="black" d="M747.56,-245.79C729.21,-235.98 704.97,-223.03 684.63,-212.16"/>
-<polygon fill="black" stroke="black" points="1189.53,-278.09 1178.95,-278.6 1187.54,-284.8 1189.53,-278.09"/>
+<polygon fill="black" stroke="black" points="686.47,-208.64 676,-207.02 683.17,-214.82 686.47,-208.64"/>
 </g>
 <!-- node4 -->
-<g id="node5" class="node">
+<g id="node4" class="node">
 <title>node4</title>
-<polygon fill="none" stroke="black" points="1552.26,-257.8 1532.93,-273.03 1454.66,-279.8 1376.4,-273.03 1357.07,-257.8 1411.23,-245.59 1498.1,-245.59 1552.26,-257.8"/>
+<polygon fill="none" stroke="black" points="939.33,-182.35 939.33,-197.26 920.78,-207.8 894.54,-207.8 875.99,-197.26 875.99,-182.35 894.54,-171.8 920.78,-171.8 939.33,-182.35"/>
-<text text-anchor="middle" x="1454.66" y="-257.53" font-family="Times,serif" font-size="12.00">/usr/lib64/libcuda.so</text>
+<text text-anchor="middle" x="907.66" y="-185.53" font-family="Times,serif" font-size="12.00">mdlp</text>
 </g>
-<!-- node0&#45;&gt;node4 -->
+<!-- node1&#45;&gt;node4 -->
-<g id="edge4" class="edge">
+<g id="edge3" class="edge">
-<title>node0&#45;&gt;node4</title>
+<title>node1&#45;&gt;node4</title>
-<path fill="none" stroke="black" d="M1586.27,-387.39C1559.5,-362.05 1509.72,-314.92 1479.65,-286.46"/>
+<path fill="none" stroke="black" d="M803.66,-245.96C824.66,-234.82 853.45,-219.56 875.41,-207.91"/>
-<polygon fill="black" stroke="black" points="1482.13,-283.99 1472.46,-279.65 1477.31,-289.07 1482.13,-283.99"/>
+<polygon fill="black" stroke="black" points="876.78,-210.61 883.97,-202.84 873.5,-204.43 876.78,-210.61"/>
-</g>
-<!-- node5 -->
-<g id="node6" class="node">
-<title>node5</title>
-<polygon fill="none" stroke="black" points="1873.26,-257.8 1843.23,-273.03 1721.66,-279.8 1600.09,-273.03 1570.06,-257.8 1654.19,-245.59 1789.13,-245.59 1873.26,-257.8"/>
-<text text-anchor="middle" x="1721.66" y="-257.53" font-family="Times,serif" font-size="12.00">/usr/local/cuda/lib64/libcudart.so</text>
-</g>
-<!-- node0&#45;&gt;node5 -->
-<g id="edge5" class="edge">
-<title>node0&#45;&gt;node5</title>
-<path fill="none" stroke="black" d="M1619.76,-387.77C1628.83,-377.46 1640.53,-363.98 1650.66,-351.8 1668.32,-330.59 1687.84,-306.03 1701.94,-288.1"/>
-<polygon fill="black" stroke="black" points="1704.43,-290.59 1707.84,-280.56 1698.92,-286.27 1704.43,-290.59"/>
-</g>
-<!-- node6 -->
-<g id="node7" class="node">
-<title>node6</title>
-<polygon fill="none" stroke="black" points="2231.79,-257.8 2198.1,-273.03 2061.66,-279.8 1925.23,-273.03 1891.53,-257.8 1985.95,-245.59 2137.38,-245.59 2231.79,-257.8"/>
-<text text-anchor="middle" x="2061.66" y="-257.53" font-family="Times,serif" font-size="12.00">/usr/local/cuda/lib64/libnvToolsExt.so</text>
-</g>
-<!-- node0&#45;&gt;node6 -->
-<g id="edge6" class="edge">
-<title>node0&#45;&gt;node6</title>
-<path fill="none" stroke="black" d="M1642.06,-393.18C1721.31,-368.56 1906.71,-310.95 2002.32,-281.24"/>
-<polygon fill="black" stroke="black" points="2003.28,-284.61 2011.79,-278.3 2001.21,-277.92 2003.28,-284.61"/>
-</g>
-<!-- node7 -->
-<g id="node8" class="node">
-<title>node7</title>
-<polygon fill="none" stroke="black" points="2541.44,-257.8 2512.56,-273.03 2395.66,-279.8 2278.76,-273.03 2249.89,-257.8 2330.79,-245.59 2460.54,-245.59 2541.44,-257.8"/>
-<text text-anchor="middle" x="2395.66" y="-257.53" font-family="Times,serif" font-size="12.00">/usr/local/cuda/lib64/libnvrtc.so</text>
-</g>
-<!-- node0&#45;&gt;node7 -->
-<g id="edge7" class="edge">
-<title>node0&#45;&gt;node7</title>
-<path fill="none" stroke="black" d="M1651.19,-396.45C1780.36,-373.26 2144.76,-307.85 2311.05,-277.99"/>
-<polygon fill="black" stroke="black" points="2311.47,-281.47 2320.7,-276.26 2310.24,-274.58 2311.47,-281.47"/>
-</g>
-<!-- node8 -->
-<g id="node9" class="node">
-<title>node8</title>
-<polygon fill="none" stroke="black" points="1642.01,-326.35 1642.01,-341.26 1620.13,-351.8 1589.19,-351.8 1567.31,-341.26 1567.31,-326.35 1589.19,-315.8 1620.13,-315.8 1642.01,-326.35"/>
-<text text-anchor="middle" x="1604.66" y="-329.53" font-family="Times,serif" font-size="12.00">fimdlp</text>
-</g>
-<!-- node0&#45;&gt;node8 -->
-<g id="edge8" class="edge">
-<title>node0&#45;&gt;node8</title>
-<path fill="none" stroke="black" d="M1604.66,-387.5C1604.66,-380.21 1604.66,-371.53 1604.66,-363.34"/>
-<polygon fill="black" stroke="black" points="1608.16,-363.42 1604.66,-353.42 1601.16,-363.42 1608.16,-363.42"/>
-</g>
-<!-- node19 -->
-<g id="node10" class="node">
-<title>node19</title>
-<polygon fill="none" stroke="black" points="2709.74,-267.37 2634.66,-279.8 2559.58,-267.37 2588.26,-247.24 2681.06,-247.24 2709.74,-267.37"/>
-<text text-anchor="middle" x="2634.66" y="-257.53" font-family="Times,serif" font-size="12.00">torch_library</text>
-</g>
-<!-- node0&#45;&gt;node19 -->
-<g id="edge29" class="edge">
-<title>node0&#45;&gt;node19</title>
-<path fill="none" stroke="black" d="M1655.87,-399.32C1798.23,-383.79 2210.64,-336.94 2550.66,-279.8 2559.43,-278.33 2568.68,-276.62 2577.72,-274.86"/>
-<polygon fill="black" stroke="black" points="2578.38,-278.3 2587.5,-272.92 2577.01,-271.43 2578.38,-278.3"/>
-</g>
-<!-- node8&#45;&gt;node1 -->
-<g id="edge9" class="edge">
-<title>node8&#45;&gt;node1</title>
-<path fill="none" stroke="black" d="M1566.84,-331.58C1419.81,-326.72 872.06,-307.69 421.66,-279.8 401.07,-278.53 379.38,-277.02 358.03,-275.43"/>
-<polygon fill="black" stroke="black" points="358.3,-271.94 348.06,-274.67 357.77,-278.92 358.3,-271.94"/>
-</g>
-<!-- node8&#45;&gt;node2 -->
-<g id="edge10" class="edge">
-<title>node8&#45;&gt;node2</title>
-<path fill="none" stroke="black" d="M1566.86,-330C1445.11,-320.95 1057.97,-292.18 831.67,-275.36"/>
-<polygon fill="black" stroke="black" points="832.09,-271.89 821.86,-274.63 831.57,-278.87 832.09,-271.89"/>
-</g>
-<!-- node8&#45;&gt;node3 -->
-<g id="edge11" class="edge">
-<title>node8&#45;&gt;node3</title>
-<path fill="none" stroke="black" d="M1567.08,-327.31C1495.4,-316.84 1336.86,-293.67 1230.62,-278.14"/>
-<polygon fill="black" stroke="black" points="1231.44,-274.72 1221.04,-276.74 1230.42,-281.65 1231.44,-274.72"/>
-</g>
-<!-- node8&#45;&gt;node4 -->
-<g id="edge12" class="edge">
-<title>node8&#45;&gt;node4</title>
-<path fill="none" stroke="black" d="M1578.53,-320.61C1555.96,-310.08 1522.92,-294.66 1496.64,-282.4"/>
-<polygon fill="black" stroke="black" points="1498.12,-279.22 1487.58,-278.17 1495.16,-285.57 1498.12,-279.22"/>
-</g>
-<!-- node8&#45;&gt;node5 -->
-<g id="edge13" class="edge">
-<title>node8&#45;&gt;node5</title>
-<path fill="none" stroke="black" d="M1627.78,-318.97C1644.15,-309.18 1666.44,-295.84 1685.2,-284.62"/>
-<polygon fill="black" stroke="black" points="1686.83,-287.73 1693.61,-279.59 1683.23,-281.72 1686.83,-287.73"/>
-</g>
-<!-- node8&#45;&gt;node6 -->
-<g id="edge14" class="edge">
-<title>node8&#45;&gt;node6</title>
-<path fill="none" stroke="black" d="M1642.45,-327.02C1712.36,-316.31 1863.89,-293.1 1964.32,-277.71"/>
-<polygon fill="black" stroke="black" points="1964.84,-281.18 1974.2,-276.2 1963.78,-274.26 1964.84,-281.18"/>
-</g>
-<!-- node8&#45;&gt;node7 -->
-<g id="edge15" class="edge">
-<title>node8&#45;&gt;node7</title>
-<path fill="none" stroke="black" d="M1642.33,-330.01C1740.75,-322.64 2013.75,-301.7 2240.66,-279.8 2254.16,-278.5 2268.32,-277.06 2282.35,-275.58"/>
-<polygon fill="black" stroke="black" points="2282.49,-279.08 2292.06,-274.54 2281.75,-272.12 2282.49,-279.08"/>
-</g>
-<!-- node8&#45;&gt;node19 -->
-<g id="edge16" class="edge">
-<title>node8&#45;&gt;node19</title>
-<path fill="none" stroke="black" d="M1642.25,-332.63C1770.06,-331.64 2199.48,-324.94 2550.66,-279.8 2560.1,-278.59 2570.07,-276.92 2579.71,-275.1"/>
-<polygon fill="black" stroke="black" points="2580.21,-278.57 2589.34,-273.21 2578.86,-271.7 2580.21,-278.57"/>
-</g>
-<!-- node20 -->
-<g id="node11" class="node">
-<title>node20</title>
-<polygon fill="none" stroke="black" points="2606.81,-185.8 2533.89,-201.03 2238.66,-207.8 1943.43,-201.03 1870.52,-185.8 2074.82,-173.59 2402.5,-173.59 2606.81,-185.8"/>
-<text text-anchor="middle" x="2238.66" y="-185.53" font-family="Times,serif" font-size="12.00">&#45;Wl,&#45;&#45;no&#45;as&#45;needed,&quot;/home/rmontanana/Code/libtorch/lib/libtorch.so&quot; &#45;Wl,&#45;&#45;as&#45;needed</text>
-</g>
-<!-- node19&#45;&gt;node20 -->
-<g id="edge17" class="edge">
-<title>node19&#45;&gt;node20</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2583.63,-250.21C2572.76,-248.03 2561.34,-245.79 2550.66,-243.8 2482.14,-231.05 2404.92,-217.93 2344.44,-207.93"/>
-<polygon fill="black" stroke="black" points="2345.28,-204.52 2334.84,-206.34 2344.14,-211.42 2345.28,-204.52"/>
 </g>
 <!-- node9 -->
-<g id="node12" class="node">
+<g id="node5" class="node">
 <title>node9</title>
-<polygon fill="none" stroke="black" points="2542.56,-123.37 2445.66,-135.8 2348.77,-123.37 2385.78,-103.24 2505.55,-103.24 2542.56,-123.37"/>
+<polygon fill="none" stroke="black" points="1107.74,-195.37 1032.66,-207.8 957.58,-195.37 986.26,-175.24 1079.06,-175.24 1107.74,-195.37"/>
-<text text-anchor="middle" x="2445.66" y="-113.53" font-family="Times,serif" font-size="12.00">torch_cpu_library</text>
+<text text-anchor="middle" x="1032.66" y="-185.53" font-family="Times,serif" font-size="12.00">torch_library</text>
 </g>
-<!-- node19&#45;&gt;node9 -->
+<!-- node1&#45;&gt;node9 -->
-<g id="edge18" class="edge">
+<g id="edge4" class="edge">
-<title>node19&#45;&gt;node9</title>
+<title>node1&#45;&gt;node9</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2635.72,-246.84C2636.4,-227.49 2634.61,-192.58 2615.66,-171.8 2601.13,-155.87 2551.93,-141.56 2510.18,-131.84"/>
+<path fill="none" stroke="black" d="M815.25,-250.02C860.25,-237.77 933.77,-217.74 982.68,-204.42"/>
-<polygon fill="black" stroke="black" points="2511.2,-128.48 2500.67,-129.68 2509.65,-135.31 2511.2,-128.48"/>
+<polygon fill="black" stroke="black" points="983.3,-207.61 992.02,-201.6 981.46,-200.85 983.3,-207.61"/>
-</g>
-<!-- node13 -->
-<g id="node16" class="node">
-<title>node13</title>
-<polygon fill="none" stroke="black" points="3056.45,-195.37 2953.66,-207.8 2850.87,-195.37 2890.13,-175.24 3017.19,-175.24 3056.45,-195.37"/>
-<text text-anchor="middle" x="2953.66" y="-185.53" font-family="Times,serif" font-size="12.00">torch_cuda_library</text>
-</g>
-<!-- node19&#45;&gt;node13 -->
-<g id="edge22" class="edge">
-<title>node19&#45;&gt;node13</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2685.21,-249.71C2741.11,-237.45 2831.21,-217.67 2891.42,-204.46"/>
-<polygon fill="black" stroke="black" points="2891.8,-207.96 2900.82,-202.4 2890.3,-201.13 2891.8,-207.96"/>
 </g>
 <!-- node10 -->
-<g id="node13" class="node">
+<g id="node6" class="node">
 <title>node10</title>
-<polygon fill="none" stroke="black" points="2362.4,-27.9 2285.6,-43.12 1974.66,-49.9 1663.72,-43.12 1586.93,-27.9 1802.1,-15.68 2147.22,-15.68 2362.4,-27.9"/>
+<polygon fill="none" stroke="black" points="1159.81,-113.8 1086.89,-129.03 791.66,-135.8 496.43,-129.03 423.52,-113.8 627.82,-101.59 955.5,-101.59 1159.81,-113.8"/>
-<text text-anchor="middle" x="1974.66" y="-27.63" font-family="Times,serif" font-size="12.00">&#45;Wl,&#45;&#45;no&#45;as&#45;needed,&quot;/home/rmontanana/Code/libtorch/lib/libtorch_cpu.so&quot; &#45;Wl,&#45;&#45;as&#45;needed</text>
+<text text-anchor="middle" x="791.66" y="-113.53" font-family="Times,serif" font-size="12.00">&#45;Wl,&#45;&#45;no&#45;as&#45;needed,&quot;/home/rmontanana/Code/libtorch/lib/libtorch.so&quot; &#45;Wl,&#45;&#45;as&#45;needed</text>
 </g>
 <!-- node9&#45;&gt;node10 -->
-<g id="edge19" class="edge">
+<g id="edge5" class="edge">
 <title>node9&#45;&gt;node10</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2381.16,-105.31C2301.63,-91.15 2165.65,-66.92 2073.05,-50.43"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M985.62,-175.14C949.2,-164.56 898.31,-149.78 857.79,-138.01"/>
-<polygon fill="black" stroke="black" points="2073.93,-47.03 2063.48,-48.72 2072.71,-53.92 2073.93,-47.03"/>
+<polygon fill="black" stroke="black" points="859.04,-134.44 848.46,-135.01 857.09,-141.16 859.04,-134.44"/>
 </g>
-<!-- node11 -->
+<!-- node5 -->
-<g id="node14" class="node">
+<g id="node7" class="node">
-<title>node11</title>
+<title>node5</title>
-<polygon fill="none" stroke="black" points="2510.72,-37.46 2445.66,-49.9 2380.61,-37.46 2405.46,-17.34 2485.87,-17.34 2510.72,-37.46"/>
+<polygon fill="none" stroke="black" points="1371.56,-123.37 1274.66,-135.8 1177.77,-123.37 1214.78,-103.24 1334.55,-103.24 1371.56,-123.37"/>
-<text text-anchor="middle" x="2445.66" y="-27.63" font-family="Times,serif" font-size="12.00">caffe2::mkl</text>
+<text text-anchor="middle" x="1274.66" y="-113.53" font-family="Times,serif" font-size="12.00">torch_cpu_library</text>
 </g>
-<!-- node9&#45;&gt;node11 -->
+<!-- node9&#45;&gt;node5 -->
-<g id="edge20" class="edge">
+<g id="edge6" class="edge">
-<title>node9&#45;&gt;node11</title>
+<title>node9&#45;&gt;node5</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2445.66,-102.95C2445.66,-91.68 2445.66,-75.4 2445.66,-61.37"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1079.61,-175.22C1120.66,-163.35 1180.2,-146.13 1222.68,-133.84"/>
-<polygon fill="black" stroke="black" points="2449.16,-61.78 2445.66,-51.78 2442.16,-61.78 2449.16,-61.78"/>
+<polygon fill="black" stroke="black" points="1223.46,-136.97 1232.09,-130.83 1221.51,-130.24 1223.46,-136.97"/>
 </g>
-<!-- node12 -->
+<!-- node6 -->
-<g id="node15" class="node">
+<g id="node8" class="node">
-<title>node12</title>
+<title>node6</title>
-<polygon fill="none" stroke="black" points="2794.95,-41.76 2661.66,-63.8 2528.37,-41.76 2579.28,-6.09 2744.04,-6.09 2794.95,-41.76"/>
+<polygon fill="none" stroke="black" points="1191.4,-27.9 1114.6,-43.12 803.66,-49.9 492.72,-43.12 415.93,-27.9 631.1,-15.68 976.22,-15.68 1191.4,-27.9"/>
-<text text-anchor="middle" x="2661.66" y="-34.75" font-family="Times,serif" font-size="12.00">dummy</text>
+<text text-anchor="middle" x="803.66" y="-27.63" font-family="Times,serif" font-size="12.00">&#45;Wl,&#45;&#45;no&#45;as&#45;needed,&quot;/home/rmontanana/Code/libtorch/lib/libtorch_cpu.so&quot; &#45;Wl,&#45;&#45;as&#45;needed</text>
-<text text-anchor="middle" x="2661.66" y="-20.5" font-family="Times,serif" font-size="12.00">(protobuf::libprotobuf)</text>
 </g>
-<!-- node9&#45;&gt;node12 -->
+<!-- node5&#45;&gt;node6 -->
-<g id="edge21" class="edge">
+<g id="edge7" class="edge">
-<title>node9&#45;&gt;node12</title>
+<title>node5&#45;&gt;node6</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2481.82,-102.76C2512.55,-90.82 2557.5,-73.36 2594.77,-58.89"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1210.16,-105.31C1130.55,-91.13 994.37,-66.87 901.77,-50.38"/>
-<polygon fill="black" stroke="black" points="2595.6,-62.32 2603.65,-55.44 2593.06,-55.79 2595.6,-62.32"/>
+<polygon fill="black" stroke="black" points="902.44,-46.77 891.98,-48.46 901.22,-53.66 902.44,-46.77"/>
 </g>
-<!-- node13&#45;&gt;node9 -->
+<!-- node7 -->
-<g id="edge28" class="edge">
+<g id="node9" class="node">
-<title>node13&#45;&gt;node9</title>
+<title>node7</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2880.59,-179.79C2799.97,-169.71 2666.42,-152.57 2551.66,-135.8 2540.2,-134.13 2528.06,-132.27 2516.24,-130.41"/>
+<polygon fill="none" stroke="black" points="1339.72,-37.46 1274.66,-49.9 1209.61,-37.46 1234.46,-17.34 1314.87,-17.34 1339.72,-37.46"/>
-<polygon fill="black" stroke="black" points="2516.96,-126.98 2506.54,-128.86 2515.87,-133.89 2516.96,-126.98"/>
+<text text-anchor="middle" x="1274.66" y="-27.63" font-family="Times,serif" font-size="12.00">caffe2::mkl</text>
 </g>
-<!-- node14 -->
+<!-- node5&#45;&gt;node7 -->
-<g id="node17" class="node">
+<g id="edge8" class="edge">
-<title>node14</title>
+<title>node5&#45;&gt;node7</title>
-<polygon fill="none" stroke="black" points="3346.69,-113.8 3268.85,-129.03 2953.66,-135.8 2638.48,-129.03 2560.63,-113.8 2778.75,-101.59 3128.58,-101.59 3346.69,-113.8"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1274.66,-102.95C1274.66,-91.56 1274.66,-75.07 1274.66,-60.95"/>
-<text text-anchor="middle" x="2953.66" y="-113.53" font-family="Times,serif" font-size="12.00">&#45;Wl,&#45;&#45;no&#45;as&#45;needed,&quot;/home/rmontanana/Code/libtorch/lib/libtorch_cuda.so&quot; &#45;Wl,&#45;&#45;as&#45;needed</text>
+<polygon fill="black" stroke="black" points="1278.16,-61.27 1274.66,-51.27 1271.16,-61.27 1278.16,-61.27"/>
 </g>
-<!-- node13&#45;&gt;node14 -->
+<!-- node8 -->
-<g id="edge23" class="edge">
+<g id="node10" class="node">
-<title>node13&#45;&gt;node14</title>
+<title>node8</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M2953.66,-174.97C2953.66,-167.13 2953.66,-157.01 2953.66,-147.53"/>
+<polygon fill="none" stroke="black" points="1623.95,-41.76 1490.66,-63.8 1357.37,-41.76 1408.28,-6.09 1573.04,-6.09 1623.95,-41.76"/>
-<polygon fill="black" stroke="black" points="2957.16,-147.59 2953.66,-137.59 2950.16,-147.59 2957.16,-147.59"/>
+<text text-anchor="middle" x="1490.66" y="-34.75" font-family="Times,serif" font-size="12.00">dummy</text>
+<text text-anchor="middle" x="1490.66" y="-20.5" font-family="Times,serif" font-size="12.00">(protobuf::libprotobuf)</text>
 </g>
-<!-- node15 -->
+<!-- node5&#45;&gt;node8 -->
-<g id="node18" class="node">
+<g id="edge9" class="edge">
-<title>node15</title>
+<title>node5&#45;&gt;node8</title>
-<polygon fill="none" stroke="black" points="3514.74,-123.37 3439.66,-135.8 3364.58,-123.37 3393.26,-103.24 3486.06,-103.24 3514.74,-123.37"/>
+<path fill="none" stroke="black" stroke-dasharray="5,2" d="M1310.82,-102.76C1341.68,-90.77 1386.88,-73.21 1424.25,-58.7"/>
-<text text-anchor="middle" x="3439.66" y="-113.53" font-family="Times,serif" font-size="12.00">torch::cudart</text>
+<polygon fill="black" stroke="black" points="1425.01,-61.77 1433.06,-54.89 1422.47,-55.25 1425.01,-61.77"/>
-</g>
-<!-- node13&#45;&gt;node15 -->
-<g id="edge24" class="edge">
-<title>node13&#45;&gt;node15</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3028.35,-180.51C3109.24,-171.17 3241.96,-154.78 3355.66,-135.8 3364.43,-134.34 3373.69,-132.63 3382.72,-130.88"/>
-<polygon fill="black" stroke="black" points="3383.38,-134.31 3392.51,-128.93 3382.02,-127.45 3383.38,-134.31"/>
-</g>
-<!-- node17 -->
-<g id="node20" class="node">
-<title>node17</title>
-<polygon fill="none" stroke="black" points="3716.84,-123.37 3624.66,-135.8 3532.48,-123.37 3567.69,-103.24 3681.63,-103.24 3716.84,-123.37"/>
-<text text-anchor="middle" x="3624.66" y="-113.53" font-family="Times,serif" font-size="12.00">torch::nvtoolsext</text>
-</g>
-<!-- node13&#45;&gt;node17 -->
-<g id="edge26" class="edge">
-<title>node13&#45;&gt;node17</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3033.64,-183.25C3144.1,-175.14 3349.47,-158.53 3523.66,-135.8 3534.84,-134.35 3546.67,-132.57 3558.15,-130.72"/>
-<polygon fill="black" stroke="black" points="3558.68,-134.18 3567.98,-129.1 3557.54,-127.27 3558.68,-134.18"/>
-</g>
-<!-- node16 -->
-<g id="node19" class="node">
-<title>node16</title>
-<polygon fill="none" stroke="black" points="3510.78,-27.9 3496.7,-43.12 3439.66,-49.9 3382.63,-43.12 3368.54,-27.9 3408.01,-15.68 3471.31,-15.68 3510.78,-27.9"/>
-<text text-anchor="middle" x="3439.66" y="-27.63" font-family="Times,serif" font-size="12.00">CUDA::cudart</text>
-</g>
-<!-- node15&#45;&gt;node16 -->
-<g id="edge25" class="edge">
-<title>node15&#45;&gt;node16</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3439.66,-102.95C3439.66,-91.68 3439.66,-75.4 3439.66,-61.37"/>
-<polygon fill="black" stroke="black" points="3443.16,-61.78 3439.66,-51.78 3436.16,-61.78 3443.16,-61.78"/>
-</g>
-<!-- node18 -->
-<g id="node21" class="node">
-<title>node18</title>
-<polygon fill="none" stroke="black" points="3714.32,-27.9 3696.56,-43.12 3624.66,-49.9 3552.77,-43.12 3535.01,-27.9 3584.76,-15.68 3664.56,-15.68 3714.32,-27.9"/>
-<text text-anchor="middle" x="3624.66" y="-27.63" font-family="Times,serif" font-size="12.00">CUDA::nvToolsExt</text>
-</g>
-<!-- node17&#45;&gt;node18 -->
-<g id="edge27" class="edge">
-<title>node17&#45;&gt;node18</title>
-<path fill="none" stroke="black" stroke-dasharray="5,2" d="M3624.66,-102.95C3624.66,-91.68 3624.66,-75.4 3624.66,-61.37"/>
-<polygon fill="black" stroke="black" points="3628.16,-61.78 3624.66,-51.78 3621.16,-61.78 3628.16,-61.78"/>
 </g>
 </g>
 </svg>

sample/CMakeLists.txt

@@ -5,23 +5,15 @@ project(bayesnet_sample)
 set(CMAKE_CXX_STANDARD 17)
 
 find_package(Torch REQUIRED)
-find_library(BayesNet NAMES libBayesNet BayesNet libBayesNet.a  REQUIRED)
+find_library(BayesNet NAMES BayesNet.a libBayesNet.a REQUIRED)
-find_path(Bayesnet_INCLUDE_DIRS REQUIRED NAMES bayesnet)
-find_library(FImdlp NAMES libfimdlp.a  PATHS REQUIRED)
-
-message(STATUS "FImdlp=${FImdlp}")
-message(STATUS "FImdlp_INCLUDE_DIRS=${FImdlp_INCLUDE_DIRS}")
-message(STATUS "BayesNet=${BayesNet}")
-message(STATUS "Bayesnet_INCLUDE_DIRS=${Bayesnet_INCLUDE_DIRS}")
 
 include_directories(
     ../tests/lib/Files
+    lib/mdlp
     lib/json/include
     /usr/local/include
-    /usr/local/include/fimdlp/
 )
 
+add_subdirectory(lib/mdlp)
 add_executable(bayesnet_sample sample.cc) 
-target_link_libraries(bayesnet_sample ${FImdlp} "${TORCH_LIBRARIES}" "${BayesNet}")
+target_link_libraries(bayesnet_sample mdlp "${TORCH_LIBRARIES}" "${BayesNet}")
-add_executable(bayesnet_sample_xspode sample_xspode.cc) 
-target_link_libraries(bayesnet_sample_xspode ${FImdlp} "${TORCH_LIBRARIES}" "${BayesNet}")

sample/lib/mdlp/CMakeLists.txt

@@ -0,0 +1,11 @@
+cmake_minimum_required(VERSION 3.20)
+project(mdlp)
+
+if (POLICY CMP0135)
+    cmake_policy(SET CMP0135 NEW)
+endif ()
+
+set(CMAKE_CXX_STANDARD 11)
+
+add_library(mdlp CPPFImdlp.cpp Metrics.cpp)
+

sample/lib/mdlp/CPPFImdlp.cpp

@@ -0,0 +1,222 @@
+#include <numeric>
+#include <algorithm>
+#include <set>
+#include <cmath>
+#include "CPPFImdlp.h"
+#include "Metrics.h"
+
+namespace mdlp {
+
+    CPPFImdlp::CPPFImdlp(size_t min_length_, int max_depth_, float proposed) : min_length(min_length_),
+        max_depth(max_depth_),
+        proposed_cuts(proposed)
+    {
+    }
+
+    CPPFImdlp::CPPFImdlp() = default;
+
+    CPPFImdlp::~CPPFImdlp() = default;
+
+    size_t CPPFImdlp::compute_max_num_cut_points() const
+    {
+        // Set the actual maximum number of cut points as a number or as a percentage of the number of samples
+        if (proposed_cuts == 0) {
+            return numeric_limits<size_t>::max();
+        }
+        if (proposed_cuts < 0 || proposed_cuts > static_cast<float>(X.size())) {
+            throw invalid_argument("wrong proposed num_cuts value");
+        }
+        if (proposed_cuts < 1)
+            return static_cast<size_t>(round(static_cast<float>(X.size()) * proposed_cuts));
+        return static_cast<size_t>(proposed_cuts);
+    }
+
+    void CPPFImdlp::fit(samples_t& X_, labels_t& y_)
+    {
+        X = X_;
+        y = y_;
+        num_cut_points = compute_max_num_cut_points();
+        depth = 0;
+        discretizedData.clear();
+        cutPoints.clear();
+        if (X.size() != y.size()) {
+            throw invalid_argument("X and y must have the same size");
+        }
+        if (X.empty() || y.empty()) {
+            throw invalid_argument("X and y must have at least one element");
+        }
+        if (min_length < 3) {
+            throw invalid_argument("min_length must be greater than 2");
+        }
+        if (max_depth < 1) {
+            throw invalid_argument("max_depth must be greater than 0");
+        }
+        indices = sortIndices(X_, y_);
+        metrics.setData(y, indices);
+        computeCutPoints(0, X.size(), 1);
+        sort(cutPoints.begin(), cutPoints.end());
+        if (num_cut_points > 0) {
+            // Select the best (with lower entropy) cut points
+            while (cutPoints.size() > num_cut_points) {
+                resizeCutPoints();
+            }
+        }
+    }
+
+    pair<precision_t, size_t> CPPFImdlp::valueCutPoint(size_t start, size_t cut, size_t end)
+    {
+        size_t n;
+        size_t m;
+        size_t idxPrev = cut - 1 >= start ? cut - 1 : cut;
+        size_t idxNext = cut + 1 < end ? cut + 1 : cut;
+        bool backWall; // true if duplicates reach beginning of the interval
+        precision_t previous;
+        precision_t actual;
+        precision_t next;
+        previous = X[indices[idxPrev]];
+        actual = X[indices[cut]];
+        next = X[indices[idxNext]];
+        // definition 2 of the paper => X[t-1] < X[t]
+        // get the first equal value of X in the interval
+        while (idxPrev > start && actual == previous) {
+            previous = X[indices[--idxPrev]];
+        }
+        backWall = idxPrev == start && actual == previous;
+        // get the last equal value of X in the interval
+        while (idxNext < end - 1 && actual == next) {
+            next = X[indices[++idxNext]];
+        }
+        // # of duplicates before cutpoint
+        n = cut - 1 - idxPrev;
+        // # of duplicates after cutpoint
+        m = idxNext - cut - 1;
+        // Decide which values to use
+        cut = cut + (backWall ? m + 1 : -n);
+        actual = X[indices[cut]];
+        return { (actual + previous) / 2, cut };
+    }
+
+    void CPPFImdlp::computeCutPoints(size_t start, size_t end, int depth_)
+    {
+        size_t cut;
+        pair<precision_t, size_t> result;
+        // Check if the interval length and the depth are Ok
+        if (end - start < min_length || depth_ > max_depth)
+            return;
+        depth = depth_ > depth ? depth_ : depth;
+        cut = getCandidate(start, end);
+        if (cut == numeric_limits<size_t>::max())
+            return;
+        if (mdlp(start, cut, end)) {
+            result = valueCutPoint(start, cut, end);
+            cut = result.second;
+            cutPoints.push_back(result.first);
+            computeCutPoints(start, cut, depth_ + 1);
+            computeCutPoints(cut, end, depth_ + 1);
+        }
+    }
+
+    size_t CPPFImdlp::getCandidate(size_t start, size_t end)
+    {
+        /* Definition 1: A binary discretization for A is determined by selecting the cut point TA for which
+        E(A, TA; S) is minimal amongst all the candidate cut points. */
+        size_t candidate = numeric_limits<size_t>::max();
+        size_t elements = end - start;
+        bool sameValues = true;
+        precision_t entropy_left;
+        precision_t entropy_right;
+        precision_t minEntropy;
+        // Check if all the values of the variable in the interval are the same
+        for (size_t idx = start + 1; idx < end; idx++) {
+            if (X[indices[idx]] != X[indices[start]]) {
+                sameValues = false;
+                break;
+            }
+        }
+        if (sameValues)
+            return candidate;
+        minEntropy = metrics.entropy(start, end);
+        for (size_t idx = start + 1; idx < end; idx++) {
+            // Cutpoints are always on boundaries (definition 2)
+            if (y[indices[idx]] == y[indices[idx - 1]])
+                continue;
+            entropy_left = precision_t(idx - start) / static_cast<precision_t>(elements) * metrics.entropy(start, idx);
+            entropy_right = precision_t(end - idx) / static_cast<precision_t>(elements) * metrics.entropy(idx, end);
+            if (entropy_left + entropy_right < minEntropy) {
+                minEntropy = entropy_left + entropy_right;
+                candidate = idx;
+            }
+        }
+        return candidate;
+    }
+
+    bool CPPFImdlp::mdlp(size_t start, size_t cut, size_t end)
+    {
+        int k;
+        int k1;
+        int k2;
+        precision_t ig;
+        precision_t delta;
+        precision_t ent;
+        precision_t ent1;
+        precision_t ent2;
+        auto N = precision_t(end - start);
+        k = metrics.computeNumClasses(start, end);
+        k1 = metrics.computeNumClasses(start, cut);
+        k2 = metrics.computeNumClasses(cut, end);
+        ent = metrics.entropy(start, end);
+        ent1 = metrics.entropy(start, cut);
+        ent2 = metrics.entropy(cut, end);
+        ig = metrics.informationGain(start, cut, end);
+        delta = static_cast<precision_t>(log2(pow(3, precision_t(k)) - 2) -
+            (precision_t(k) * ent - precision_t(k1) * ent1 - precision_t(k2) * ent2));
+        precision_t term = 1 / N * (log2(N - 1) + delta);
+        return ig > term;
+    }
+
+    // Argsort from https://stackoverflow.com/questions/1577475/c-sorting-and-keeping-track-of-indexes
+    indices_t CPPFImdlp::sortIndices(samples_t& X_, labels_t& y_)
+    {
+        indices_t idx(X_.size());
+        iota(idx.begin(), idx.end(), 0);
+        stable_sort(idx.begin(), idx.end(), [&X_, &y_](size_t i1, size_t i2) {
+            if (X_[i1] == X_[i2])
+                return y_[i1] < y_[i2];
+            else
+                return X_[i1] < X_[i2];
+            });
+        return idx;
+    }
+
+    void CPPFImdlp::resizeCutPoints()
+    {
+        //Compute entropy of each of the whole cutpoint set and discards the biggest value
+        precision_t maxEntropy = 0;
+        precision_t entropy;
+        size_t maxEntropyIdx = 0;
+        size_t begin = 0;
+        size_t end;
+        for (size_t idx = 0; idx < cutPoints.size(); idx++) {
+            end = begin;
+            while (X[indices[end]] < cutPoints[idx] && end < X.size())
+                end++;
+            entropy = metrics.entropy(begin, end);
+            if (entropy > maxEntropy) {
+                maxEntropy = entropy;
+                maxEntropyIdx = idx;
+            }
+            begin = end;
+        }
+        cutPoints.erase(cutPoints.begin() + static_cast<long>(maxEntropyIdx));
+    }
+    labels_t& CPPFImdlp::transform(const samples_t& data)
+    {
+        discretizedData.clear();
+        discretizedData.reserve(data.size());
+        for (const precision_t& item : data) {
+            auto upper = upper_bound(cutPoints.begin(), cutPoints.end(), item);
+            discretizedData.push_back(upper - cutPoints.begin());
+        }
+        return discretizedData;
+    }
+}

sample/lib/mdlp/CPPFImdlp.h

@@ -0,0 +1,51 @@
+// ***************************************************************
+// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
+// SPDX-FileType: SOURCE
+// SPDX-License-Identifier: MIT
+// ***************************************************************
+
+#ifndef CPPFIMDLP_H
+#define CPPFIMDLP_H
+
+#include "typesFImdlp.h"
+#include "Metrics.h"
+#include <limits>
+#include <utility>
+#include <string>
+
+namespace mdlp {
+    class CPPFImdlp {
+    protected:
+        size_t min_length = 3;
+        int depth = 0;
+        int max_depth = numeric_limits<int>::max();
+        float proposed_cuts = 0;
+        indices_t indices = indices_t();
+        samples_t X = samples_t();
+        labels_t y = labels_t();
+        Metrics metrics = Metrics(y, indices);
+        cutPoints_t cutPoints;
+        size_t num_cut_points = numeric_limits<size_t>::max();
+        labels_t discretizedData = labels_t();
+
+        static indices_t sortIndices(samples_t&, labels_t&);
+
+        void computeCutPoints(size_t, size_t, int);
+        void resizeCutPoints();
+        bool mdlp(size_t, size_t, size_t);
+        size_t getCandidate(size_t, size_t);
+        size_t compute_max_num_cut_points() const;
+        pair<precision_t, size_t> valueCutPoint(size_t, size_t, size_t);
+
+    public:
+        CPPFImdlp();
+        CPPFImdlp(size_t, int, float);
+        ~CPPFImdlp();
+        void fit(samples_t&, labels_t&);
+        inline cutPoints_t getCutPoints() const { return cutPoints; };
+        labels_t& transform(const samples_t&);
+        inline int get_depth() const { return depth; };
+        static inline string version() { return "1.1.2"; };
+    };
+}
+#endif

sample/lib/mdlp/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2022 Ricardo Montañana Gómez
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

sample/lib/mdlp/Metrics.cpp

@@ -0,0 +1,78 @@
+#include "Metrics.h"
+#include <set>
+#include <cmath>
+
+using namespace std;
+namespace mdlp {
+    Metrics::Metrics(labels_t& y_, indices_t& indices_): y(y_), indices(indices_),
+        numClasses(computeNumClasses(0, indices.size()))
+    {
+    }
+
+    int Metrics::computeNumClasses(size_t start, size_t end)
+    {
+        set<int> nClasses;
+        for (auto i = start; i < end; ++i) {
+            nClasses.insert(y[indices[i]]);
+        }
+        return static_cast<int>(nClasses.size());
+    }
+
+    void Metrics::setData(const labels_t& y_, const indices_t& indices_)
+    {
+        indices = indices_;
+        y = y_;
+        numClasses = computeNumClasses(0, indices.size());
+        entropyCache.clear();
+        igCache.clear();
+    }
+
+    precision_t Metrics::entropy(size_t start, size_t end)
+    {
+        precision_t p;
+        precision_t ventropy = 0;
+        int nElements = 0;
+        labels_t counts(numClasses + 1, 0);
+        if (end - start < 2)
+            return 0;
+        if (entropyCache.find({ start, end }) != entropyCache.end()) {
+            return entropyCache[{start, end}];
+        }
+        for (auto i = &indices[start]; i != &indices[end]; ++i) {
+            counts[y[*i]]++;
+            nElements++;
+        }
+        for (auto count : counts) {
+            if (count > 0) {
+                p = static_cast<precision_t>(count) / static_cast<precision_t>(nElements);
+                ventropy -= p * log2(p);
+            }
+        }
+        entropyCache[{start, end}] = ventropy;
+        return ventropy;
+    }
+
+    precision_t Metrics::informationGain(size_t start, size_t cut, size_t end)
+    {
+        precision_t iGain;
+        precision_t entropyInterval;
+        precision_t entropyLeft;
+        precision_t entropyRight;
+        size_t nElementsLeft = cut - start;
+        size_t nElementsRight = end - cut;
+        size_t nElements = end - start;
+        if (igCache.find(make_tuple(start, cut, end)) != igCache.end()) {
+            return igCache[make_tuple(start, cut, end)];
+        }
+        entropyInterval = entropy(start, end);
+        entropyLeft = entropy(start, cut);
+        entropyRight = entropy(cut, end);
+        iGain = entropyInterval -
+            (static_cast<precision_t>(nElementsLeft) * entropyLeft +
+                static_cast<precision_t>(nElementsRight) * entropyRight) /
+            static_cast<precision_t>(nElements);
+        igCache[make_tuple(start, cut, end)] = iGain;
+        return iGain;
+    }
+
+}

sample/lib/mdlp/Metrics.h

@@ -0,0 +1,28 @@
+// ***************************************************************
+// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
+// SPDX-FileType: SOURCE
+// SPDX-License-Identifier: MIT
+// ***************************************************************
+
+#ifndef CCMETRICS_H
+#define CCMETRICS_H
+
+#include "typesFImdlp.h"
+
+namespace mdlp {
+    class Metrics {
+    protected:
+        labels_t& y;
+        indices_t& indices;
+        int numClasses;
+        cacheEnt_t entropyCache = cacheEnt_t();
+        cacheIg_t igCache = cacheIg_t();
+    public:
+        Metrics(labels_t&, indices_t&);
+        void setData(const labels_t&, const indices_t&);
+        int computeNumClasses(size_t, size_t);
+        precision_t entropy(size_t, size_t);
+        precision_t informationGain(size_t, size_t, size_t);
+    };
+}
+#endif

sample/lib/mdlp/README.md

@@ -0,0 +1,41 @@
+[![Build](https://github.com/rmontanana/mdlp/actions/workflows/build.yml/badge.svg)](https://github.com/rmontanana/mdlp/actions/workflows/build.yml)
+[![Quality Gate Status](https://sonarcloud.io/api/project_badges/measure?project=rmontanana_mdlp&metric=alert_status)](https://sonarcloud.io/summary/new_code?id=rmontanana_mdlp)
+[![Reliability Rating](https://sonarcloud.io/api/project_badges/measure?project=rmontanana_mdlp&metric=reliability_rating)](https://sonarcloud.io/summary/new_code?id=rmontanana_mdlp)
+
+# mdlp
+
+Discretization algorithm based on the paper by Fayyad & Irani [Multi-Interval Discretization of Continuous-Valued Attributes for Classification Learning](https://www.ijcai.org/Proceedings/93-2/Papers/022.pdf)
+
+The implementation tries to mitigate the problem of different label values with the same value of the variable:
+
+- Sorts the values of the variable using the label values as a tie-breaker
+- Once found a valid candidate for the split, it checks if the previous value is the same as actual one, and tries to get previous one, or next if the former is not possible.
+
+Other features:
+
+- Intervals with the same value of the variable are not taken into account for cutpoints.
+- Intervals have to have more than two examples to be evaluated.
+
+The algorithm returns the cut points for the variable.
+
+## Sample
+
+To run the sample, just execute the following commands:
+
+```bash
+cd sample
+cmake -B build
+cd build
+make
+./sample -f iris -m 2
+./sample -h
+```
+
+## Test
+
+To run the tests and see coverage (llvm & gcovr have to be installed), execute the following commands:
+
+```bash
+cd tests
+./test
+```

sample/lib/mdlp/typesFImdlp.h

@@ -0,0 +1,24 @@
+// ***************************************************************
+// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
+// SPDX-FileType: SOURCE
+// SPDX-License-Identifier: MIT
+// ***************************************************************
+
+#ifndef TYPES_H
+#define TYPES_H
+
+#include <vector>
+#include <map>
+#include <stdexcept>
+
+using namespace std;
+namespace mdlp {
+    typedef float precision_t;
+    typedef vector<precision_t> samples_t;
+    typedef vector<int> labels_t;
+    typedef vector<size_t> indices_t;
+    typedef vector<precision_t> cutPoints_t;
+    typedef map<pair<int, int>, precision_t> cacheEnt_t;
+    typedef map<tuple<int, int, int>, precision_t> cacheIg_t;
+}
+#endif

sample/sample.cc

@@ -6,7 +6,8 @@
 
 #include <ArffFiles.hpp>
 #include <CPPFImdlp.h>
-#include <bayesnet/ensembles/XBAODE.h>
+#include <bayesnet/ensembles/BoostAODE.h>
+#include <torch/torch.h>
 
 std::vector<mdlp::labels_t> discretizeDataset(std::vector<mdlp::samples_t>& X, mdlp::labels_t& y)
 {
@@ -19,7 +20,8 @@ std::vector<mdlp::labels_t> discretizeDataset(std::vector<mdlp::samples_t>& X, m
     }
     return Xd;
 }
-tuple<torch::Tensor, torch::Tensor, std::vector<std::string>, std::string, map<std::string, std::vector<int>>> loadDataset(const std::string& name, bool class_last)
+
+tuple<torch::Tensor, torch::Tensor, std::vector<std::string>, std::string, map<std::string, std::vector<int>>> loadDataset(const std::string& name, bool class_last, torch::Device device)
 {
     auto handler = ArffFiles();
     handler.load(name, class_last);
@@ -34,16 +36,16 @@ tuple<torch::Tensor, torch::Tensor, std::vector<std::string>, std::string, map<s
     torch::Tensor Xd;
     auto states = map<std::string, std::vector<int>>();
     auto Xr = discretizeDataset(X, y);
-    Xd = torch::zeros({ static_cast<int>(Xr.size()), static_cast<int>(Xr[0].size()) }, torch::kInt32);
+    Xd = torch::zeros({ static_cast<int>(Xr.size()), static_cast<int>(Xr[0].size()) }, torch::kInt32).to(device);
     for (int i = 0; i < features.size(); ++i) {
         states[features[i]] = std::vector<int>(*max_element(Xr[i].begin(), Xr[i].end()) + 1);
         auto item = states.at(features[i]);
         iota(begin(item), end(item), 0);
-        Xd.index_put_({ i, "..." }, torch::tensor(Xr[i], torch::kInt32));
+        Xd.index_put_({ i, "..." }, torch::tensor(Xr[i], torch::kInt32).to(device));
     }
     states[className] = std::vector<int>(*max_element(y.begin(), y.end()) + 1);
     iota(begin(states.at(className)), end(states.at(className)), 0);
-    return { Xd, torch::tensor(y, torch::kInt32), features, className, states };
+    return { Xd, torch::tensor(y, torch::kInt32).to(device), features, className, states };
 }
 
 int main(int argc, char* argv[])
@@ -53,29 +55,22 @@ int main(int argc, char* argv[])
         return 1;
     }
     std::string file_name = argv[1];
+    torch::Device device(torch::kCPU);
+    if (torch::cuda::is_available()) {
+        device = torch::Device(torch::kCUDA);
+        std::cout << "CUDA is available! Using GPU." << std::endl;
+    } else {
+        std::cout << "CUDA is not available. Using CPU." << std::endl;
+    }
     torch::Tensor X, y;
     std::vector<std::string> features;
     std::string className;
     map<std::string, std::vector<int>> states;
-    auto clf = bayesnet::XBAODE(); // false for not using voting in predict
+    auto clf = bayesnet::BoostAODE(false); // false for not using voting in predict
     std::cout << "Library version: " << clf.getVersion() << std::endl;
-    tie(X, y, features, className, states) = loadDataset(file_name, true);
+    tie(X, y, features, className, states) = loadDataset(file_name, true, device);
-    torch::Tensor weights = torch::full({ X.size(1) }, 15, torch::kDouble);
+    clf.fit(X, y, features, className, states, bayesnet::Smoothing_t::LAPLACE);
-    torch::Tensor dataset;
-    try {
-        auto yresized = torch::transpose(y.view({ y.size(0), 1 }), 0, 1);
-        dataset = torch::cat({ X, yresized }, 0);
-    }
-    catch (const std::exception& e) {
-        std::stringstream oss;
-        oss << "* Error in X and y dimensions *\n";
-        oss << "X dimensions: " << dataset.sizes() << "\n";
-        oss << "y dimensions: " << y.sizes();
-        throw std::runtime_error(oss.str());
-    }
-    clf.fit(dataset, features, className, states, weights, bayesnet::Smoothing_t::LAPLACE);
     auto score = clf.score(X, y);
     std::cout << "File: " << file_name << " Model: BoostAODE score: " << score << std::endl;
     return 0;
-}
+}
-

sample/sample_xspode.cc

@@ -1,65 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#include <ArffFiles.hpp>
-#include <CPPFImdlp.h>
-#include <bayesnet/ensembles/BoostAODE.h>
-#include <bayesnet/classifiers/XSPODE.h>
-
-std::vector<mdlp::labels_t> discretizeDataset(std::vector<mdlp::samples_t>& X, mdlp::labels_t& y)
-{
-    std::vector<mdlp::labels_t> Xd;
-    auto fimdlp = mdlp::CPPFImdlp();
-    for (int i = 0; i < X.size(); i++) {
-        fimdlp.fit(X[i], y);
-        mdlp::labels_t& xd = fimdlp.transform(X[i]);
-        Xd.push_back(xd);
-    }
-    return Xd;
-}
-tuple<std::vector<std::vector<int>>, std::vector<int>, std::vector<std::string>, std::string, map<std::string, std::vector<int>>> loadDataset(const std::string& name, bool class_last)
-{
-    auto handler = ArffFiles();
-    handler.load(name, class_last);
-    // Get Dataset X, y
-    std::vector<mdlp::samples_t>& X = handler.getX();
-    mdlp::labels_t y = handler.getY();
-    // Get className & Features
-    auto className = handler.getClassName();
-    std::vector<std::string> features;
-    auto attributes = handler.getAttributes();
-    transform(attributes.begin(), attributes.end(), back_inserter(features), [](const auto& pair) { return pair.first; });
-    torch::Tensor Xd;
-    auto states = map<std::string, std::vector<int>>();
-    auto Xr = discretizeDataset(X, y);
-    for (int i = 0; i < features.size(); ++i) {
-        states[features[i]] = std::vector<int>(*max_element(Xr[i].begin(), Xr[i].end()) + 1);
-        auto item = states.at(features[i]);
-        iota(begin(item), end(item), 0);
-    }
-    states[className] = std::vector<int>(*max_element(y.begin(), y.end()) + 1);
-    iota(begin(states.at(className)), end(states.at(className)), 0);
-    return { Xr, y, features, className, states };
-}
-
-int main(int argc, char* argv[])
-{
-    if (argc < 2) {
-        std::cerr << "Usage: " << argv[0] << " <file_name>" << std::endl;
-        return 1;
-    }
-    std::string file_name = argv[1];
-    bayesnet::BaseClassifier* clf = new bayesnet::XSpode(0);
-    std::cout << "Library version: " << clf->getVersion() << std::endl;
-    auto [X, y, features, className, states] = loadDataset(file_name, true);
-    torch::Tensor weights = torch::full({ static_cast<long>(X[0].size()) }, 1.0 / X[0].size(), torch::kDouble);
-    clf->fit(X, y, features, className, states, bayesnet::Smoothing_t::ORIGINAL);
-    auto score = clf->score(X, y);
-    std::cout << "File: " << file_name << " Model: XSpode(0) score: " << score << std::endl;
-    delete clf;
-    return 0;
-}
-

tests/CMakeLists.txt

@@ -3,24 +3,19 @@ if(ENABLE_TESTING)
         ${BayesNet_SOURCE_DIR}/tests/lib/Files
         ${BayesNet_SOURCE_DIR}/lib/folding
         ${BayesNet_SOURCE_DIR}/lib/mdlp/src
-        ${BayesNet_SOURCE_DIR}/lib/log
         ${BayesNet_SOURCE_DIR}/lib/json/include
         ${BayesNet_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}/configured_files/include
     )
     file(GLOB_RECURSE BayesNet_SOURCES "${BayesNet_SOURCE_DIR}/bayesnet/*.cc")
-    add_executable(TestBayesNet TestBayesNetwork.cc TestBayesNode.cc TestBayesClassifier.cc TestXSPnDE.cc TestXBA2DE.cc 
+    add_executable(TestBayesNet TestBayesNetwork.cc TestBayesNode.cc TestBayesClassifier.cc 
-        TestBayesModels.cc TestBayesMetrics.cc TestFeatureSelection.cc TestBoostAODE.cc TestXBAODE.cc TestA2DE.cc 
+        TestBayesModels.cc TestBayesMetrics.cc TestFeatureSelection.cc TestBoostAODE.cc TestA2DE.cc 
-        TestUtils.cc TestBayesEnsemble.cc TestModulesVersions.cc TestBoostA2DE.cc TestMST.cc TestXSPODE.cc ${BayesNet_SOURCES})
+        TestUtils.cc TestBayesEnsemble.cc TestModulesVersions.cc TestBoostA2DE.cc ${BayesNet_SOURCES})
-    target_link_libraries(TestBayesNet PUBLIC "${TORCH_LIBRARIES}" fimdlp PRIVATE Catch2::Catch2WithMain)
+    target_link_libraries(TestBayesNet PUBLIC "${TORCH_LIBRARIES}" mdlp PRIVATE Catch2::Catch2WithMain)
     add_test(NAME BayesNetworkTest COMMAND TestBayesNet)
     add_test(NAME A2DE COMMAND TestBayesNet "[A2DE]")
     add_test(NAME BoostA2DE COMMAND TestBayesNet "[BoostA2DE]")
     add_test(NAME BoostAODE COMMAND TestBayesNet "[BoostAODE]")
-    add_test(NAME XSPODE COMMAND TestBayesNet "[XSPODE]")
-    add_test(NAME XSPnDE COMMAND TestBayesNet "[XSPnDE]")
-    add_test(NAME XBAODE COMMAND TestBayesNet "[XBAODE]")
-    add_test(NAME XBA2DE COMMAND TestBayesNet "[XBA2DE]")
     add_test(NAME Classifier COMMAND TestBayesNet "[Classifier]")
     add_test(NAME Ensemble COMMAND TestBayesNet "[Ensemble]")
     add_test(NAME FeatureSelection COMMAND TestBayesNet "[FeatureSelection]")
@@ -29,5 +24,4 @@ if(ENABLE_TESTING)
     add_test(NAME Modules COMMAND TestBayesNet "[Modules]")
     add_test(NAME Network COMMAND TestBayesNet "[Network]")
     add_test(NAME Node COMMAND TestBayesNet "[Node]")
-    add_test(NAME MST COMMAND TestBayesNet "[MST]")
 endif(ENABLE_TESTING)

tests/TestA2DE.cc

@@ -45,5 +45,5 @@ TEST_CASE("Test graph", "[A2DE]")
     auto graph = clf.graph();
     REQUIRE(graph.size() == 78);
     REQUIRE(graph[0] == "digraph BayesNet {\nlabel=<BayesNet A2DE_0>\nfontsize=30\nfontcolor=blue\nlabelloc=t\nlayout=circo\n");
-    REQUIRE(graph[1] == "\"class\" [shape=circle, fontcolor=red, fillcolor=lightblue, style=filled ] \n");
+    REQUIRE(graph[1] == "class [shape=circle, fontcolor=red, fillcolor=lightblue, style=filled ] \n");
 }

tests/TestBayesClassifier.cc

@@ -85,7 +85,7 @@ TEST_CASE("Dump_cpt", "[Classifier]")
     auto raw = RawDatasets("iris", true);
     model.fit(raw.Xt, raw.yt, raw.features, raw.className, raw.states, raw.smoothing);
     auto cpt = model.dump_cpt();
-    REQUIRE(cpt.size() == 1718);
+    REQUIRE(cpt.size() == 1713);
 }
 TEST_CASE("Not fitted model", "[Classifier]")
 {

tests/TestBayesEnsemble.cc

@@ -28,7 +28,7 @@ TEST_CASE("Dump CPT", "[Ensemble]")
     auto clf = bayesnet::BoostAODE();
     clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
     auto dump = clf.dump_cpt();
-    REQUIRE(dump.size() == 39916);
+    REQUIRE(dump == "");
 }
 TEST_CASE("Number of States", "[Ensemble]")
 {

tests/TestBayesModels.cc

@@ -4,81 +4,48 @@
 // SPDX-License-Identifier: MIT
 // ***************************************************************
 
-#include <catch2/catch_approx.hpp>
+#include <type_traits>
 #include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
-#include "TestUtils.h"
 #include "bayesnet/classifiers/KDB.h"
-#include "bayesnet/classifiers/KDBLd.h"
-#include "bayesnet/classifiers/SPODE.h"
-#include "bayesnet/classifiers/SPODELd.h"
 #include "bayesnet/classifiers/TAN.h"
+#include "bayesnet/classifiers/SPODE.h"
 #include "bayesnet/classifiers/TANLd.h"
-#include "bayesnet/classifiers/XSPODE.h"
+#include "bayesnet/classifiers/KDBLd.h"
+#include "bayesnet/classifiers/SPODELd.h"
 #include "bayesnet/ensembles/AODE.h"
 #include "bayesnet/ensembles/AODELd.h"
 #include "bayesnet/ensembles/BoostAODE.h"
+#include "TestUtils.h"
 
-const std::string ACTUAL_VERSION = "1.0.7";
+const std::string ACTUAL_VERSION = "1.0.6";
 
 TEST_CASE("Test Bayesian Classifiers score & version", "[Models]")
 {
-    map<pair<std::string, std::string>, float> scores{// Diabetes
+    map <pair<std::string, std::string>, float> scores{
-                                                      {{"diabetes", "AODE"}, 0.82161},
+        // Diabetes
-                                                      {{"diabetes", "KDB"}, 0.852865},
+        {{"diabetes", "AODE"}, 0.82161}, {{"diabetes", "KDB"}, 0.852865}, {{"diabetes", "SPODE"}, 0.802083}, {{"diabetes", "TAN"}, 0.821615},
-                                                      {{"diabetes", "XSPODE"}, 0.631510437f},
+        {{"diabetes", "AODELd"}, 0.8138f}, {{"diabetes", "KDBLd"}, 0.80208f}, {{"diabetes", "SPODELd"}, 0.78646f}, {{"diabetes", "TANLd"}, 0.8099f},  {{"diabetes", "BoostAODE"}, 0.83984f},
-                                                      {{"diabetes", "SPODE"}, 0.802083},
+        // Ecoli
-                                                      {{"diabetes", "TAN"}, 0.821615},
+        {{"ecoli", "AODE"}, 0.889881}, {{"ecoli", "KDB"}, 0.889881}, {{"ecoli", "SPODE"}, 0.880952}, {{"ecoli", "TAN"}, 0.892857},
-                                                      {{"diabetes", "AODELd"}, 0.8125f},
+        {{"ecoli", "AODELd"}, 0.8869f}, {{"ecoli", "KDBLd"}, 0.875f}, {{"ecoli", "SPODELd"}, 0.84226f}, {{"ecoli", "TANLd"}, 0.86905f}, {{"ecoli", "BoostAODE"}, 0.89583f},
-                                                      {{"diabetes", "KDBLd"}, 0.80208f},
+        // Glass
-                                                      {{"diabetes", "SPODELd"}, 0.7890625f},
+        {{"glass", "AODE"}, 0.79439}, {{"glass", "KDB"}, 0.827103}, {{"glass", "SPODE"}, 0.775701}, {{"glass", "TAN"}, 0.827103},
-                                                      {{"diabetes", "TANLd"}, 0.803385437f},
+        {{"glass", "AODELd"}, 0.79439f}, {{"glass", "KDBLd"}, 0.85047f}, {{"glass", "SPODELd"}, 0.79439f}, {{"glass", "TANLd"}, 0.86449f}, {{"glass", "BoostAODE"}, 0.84579f},
-                                                      {{"diabetes", "BoostAODE"}, 0.83984f},
+        // Iris
-                                                      // Ecoli
+        {{"iris", "AODE"}, 0.973333}, {{"iris", "KDB"}, 0.973333}, {{"iris", "SPODE"}, 0.973333}, {{"iris", "TAN"}, 0.973333},
-                                                      {{"ecoli", "AODE"}, 0.889881},
+        {{"iris", "AODELd"}, 0.973333}, {{"iris", "KDBLd"}, 0.973333}, {{"iris", "SPODELd"}, 0.96f}, {{"iris", "TANLd"}, 0.97333f}, {{"iris", "BoostAODE"}, 0.98f}
-                                                      {{"ecoli", "KDB"}, 0.889881},
+    };
-                                                      {{"ecoli", "XSPODE"}, 0.696428597f},
+    std::map<std::string, bayesnet::BaseClassifier*> models{
-                                                      {{"ecoli", "SPODE"}, 0.880952},
+        {"AODE", new bayesnet::AODE()}, {"AODELd", new bayesnet::AODELd()},
-                                                      {{"ecoli", "TAN"}, 0.892857},
+        {"BoostAODE", new bayesnet::BoostAODE()},
-                                                      {{"ecoli", "AODELd"}, 0.875f},
+        {"KDB", new bayesnet::KDB(2)}, {"KDBLd", new bayesnet::KDBLd(2)},
-                                                      {{"ecoli", "KDBLd"}, 0.880952358f},
+        {"SPODE", new bayesnet::SPODE(1)}, {"SPODELd", new bayesnet::SPODELd(1)},
-                                                      {{"ecoli", "SPODELd"}, 0.839285731f},
+        {"TAN", new bayesnet::TAN()}, {"TANLd", new bayesnet::TANLd()}
-                                                      {{"ecoli", "TANLd"}, 0.848214269f},
+    };
-                                                      {{"ecoli", "BoostAODE"}, 0.89583f},
+    std::string name = GENERATE("AODE", "AODELd", "KDB", "KDBLd", "SPODE", "SPODELd", "TAN", "TANLd");
-                                                      // Glass
-                                                      {{"glass", "AODE"}, 0.79439},
-                                                      {{"glass", "KDB"}, 0.827103},
-                                                      {{"glass", "XSPODE"}, 0.775701},
-                                                      {{"glass", "SPODE"}, 0.775701},
-                                                      {{"glass", "TAN"}, 0.827103},
-                                                      {{"glass", "AODELd"}, 0.799065411f},
-                                                      {{"glass", "KDBLd"}, 0.82710278f},
-                                                      {{"glass", "SPODELd"}, 0.780373812f},
-                                                      {{"glass", "TANLd"}, 0.869158864f},
-                                                      {{"glass", "BoostAODE"}, 0.84579f},
-                                                      // Iris
-                                                      {{"iris", "AODE"}, 0.973333},
-                                                      {{"iris", "KDB"}, 0.973333},
-                                                      {{"iris", "XSPODE"}, 0.853333354f},
-                                                      {{"iris", "SPODE"}, 0.973333},
-                                                      {{"iris", "TAN"}, 0.973333},
-                                                      {{"iris", "AODELd"}, 0.973333},
-                                                      {{"iris", "KDBLd"}, 0.973333},
-                                                      {{"iris", "SPODELd"}, 0.96f},
-                                                      {{"iris", "TANLd"}, 0.97333f},
-                                                      {{"iris", "BoostAODE"}, 0.98f} };
-    std::map<std::string, bayesnet::BaseClassifier*> models{ {"AODE", new bayesnet::AODE()},
-                                                             {"AODELd", new bayesnet::AODELd()},
-                                                             {"BoostAODE", new bayesnet::BoostAODE()},
-                                                             {"KDB", new bayesnet::KDB(2)},
-                                                             {"KDBLd", new bayesnet::KDBLd(2)},
-                                                             {"XSPODE", new bayesnet::XSpode(1)},
-                                                             {"SPODE", new bayesnet::SPODE(1)},
-                                                             {"SPODELd", new bayesnet::SPODELd(1)},
-                                                             {"TAN", new bayesnet::TAN()},
-                                                             {"TANLd", new bayesnet::TANLd()} };
-    std::string name = GENERATE("AODE", "AODELd", "KDB", "KDBLd", "SPODE", "XSPODE", "SPODELd", "TAN", "TANLd");
     auto clf = models[name];
 
     SECTION("Test " + name + " classifier")
@@ -89,8 +56,6 @@ TEST_CASE("Test Bayesian Classifiers score & version", "[Models]")
             auto raw = RawDatasets(file_name, discretize);
             clf->fit(raw.Xt, raw.yt, raw.features, raw.className, raw.states, raw.smoothing);
             auto score = clf->score(raw.Xt, raw.yt);
-            // std::cout << "Classifier: " << name << " File: " << file_name << " Score: " << score << " expected = " <<
-            // scores[{file_name, name}] << std::endl;
             INFO("Classifier: " << name << " File: " << file_name);
             REQUIRE(score == Catch::Approx(scores[{file_name, name}]).epsilon(raw.epsilon));
             REQUIRE(clf->getStatus() == bayesnet::NORMAL);
@@ -105,13 +70,13 @@ TEST_CASE("Test Bayesian Classifiers score & version", "[Models]")
 }
 TEST_CASE("Models features & Graph", "[Models]")
 {
-    auto graph = std::vector<std::string>(
+    auto graph = std::vector<std::string>({ "digraph BayesNet {\nlabel=<BayesNet Test>\nfontsize=30\nfontcolor=blue\nlabelloc=t\nlayout=circo\n",
-        { "digraph BayesNet {\nlabel=<BayesNet Test>\nfontsize=30\nfontcolor=blue\nlabelloc=t\nlayout=circo\n",
+        "class [shape=circle, fontcolor=red, fillcolor=lightblue, style=filled ] \n",
-         "\"class\" [shape=circle, fontcolor=red, fillcolor=lightblue, style=filled ] \n",
+        "class -> sepallength", "class -> sepalwidth", "class -> petallength", "class -> petalwidth", "petallength [shape=circle] \n",
-         "\"class\" -> \"sepallength\"", "\"class\" -> \"sepalwidth\"", "\"class\" -> \"petallength\"",
+        "petallength -> sepallength", "petalwidth [shape=circle] \n", "sepallength [shape=circle] \n",
-         "\"class\" -> \"petalwidth\"", "\"petallength\" [shape=circle] \n", "\"petallength\" -> \"sepallength\"",
+        "sepallength -> sepalwidth", "sepalwidth [shape=circle] \n", "sepalwidth -> petalwidth", "}\n"
-         "\"petalwidth\" [shape=circle] \n", "\"sepallength\" [shape=circle] \n", "\"sepallength\" -> \"sepalwidth\"",
+        }
-         "\"sepalwidth\" [shape=circle] \n", "\"sepalwidth\" -> \"petalwidth\"", "}\n" });
+    );
     SECTION("Test TAN")
     {
         auto raw = RawDatasets("iris", true);
@@ -121,9 +86,7 @@ TEST_CASE("Models features & Graph", "[Models]")
         REQUIRE(clf.getNumberOfEdges() == 7);
         REQUIRE(clf.getNumberOfStates() == 19);
         REQUIRE(clf.getClassNumStates() == 3);
-        REQUIRE(clf.show() == std::vector<std::string>{"class -> sepallength, sepalwidth, petallength, petalwidth, ",
+        REQUIRE(clf.show() == std::vector<std::string>{"class -> sepallength, sepalwidth, petallength, petalwidth, ", "petallength -> sepallength, ", "petalwidth -> ", "sepallength -> sepalwidth, ", "sepalwidth -> petalwidth, "});
-            "petallength -> sepallength, ", "petalwidth -> ",
-            "sepallength -> sepalwidth, ", "sepalwidth -> petalwidth, "});
         REQUIRE(clf.graph("Test") == graph);
     }
     SECTION("Test TANLd")
@@ -133,11 +96,9 @@ TEST_CASE("Models features & Graph", "[Models]")
         clf.fit(raw.Xt, raw.yt, raw.features, raw.className, raw.states, raw.smoothing);
         REQUIRE(clf.getNumberOfNodes() == 5);
         REQUIRE(clf.getNumberOfEdges() == 7);
-        REQUIRE(clf.getNumberOfStates() == 27);
+        REQUIRE(clf.getNumberOfStates() == 19);
         REQUIRE(clf.getClassNumStates() == 3);
-        REQUIRE(clf.show() == std::vector<std::string>{"class -> sepallength, sepalwidth, petallength, petalwidth, ",
+        REQUIRE(clf.show() == std::vector<std::string>{"class -> sepallength, sepalwidth, petallength, petalwidth, ", "petallength -> sepallength, ", "petalwidth -> ", "sepallength -> sepalwidth, ", "sepalwidth -> petalwidth, "});
-            "petallength -> sepallength, ", "petalwidth -> ",
-            "sepallength -> sepalwidth, ", "sepalwidth -> petalwidth, "});
         REQUIRE(clf.graph("Test") == graph);
     }
 }
@@ -153,43 +114,52 @@ TEST_CASE("Get num features & num edges", "[Models]")
 TEST_CASE("Model predict_proba", "[Models]")
 {
     std::string model = GENERATE("TAN", "SPODE", "BoostAODEproba", "BoostAODEvoting");
-    auto res_prob_tan = std::vector<std::vector<double>>({ {0.00375671, 0.994457, 0.00178621},
+    auto res_prob_tan = std::vector<std::vector<double>>({
-                                                          {0.00137462, 0.992734, 0.00589123},
+    { 0.00375671, 0.994457, 0.00178621 },
-                                                          {0.00137462, 0.992734, 0.00589123},
+    { 0.00137462, 0.992734, 0.00589123 },
-                                                          {0.00137462, 0.992734, 0.00589123},
+    { 0.00137462, 0.992734, 0.00589123 },
-                                                          {0.00218225, 0.992877, 0.00494094},
+    { 0.00137462, 0.992734, 0.00589123 },
-                                                          {0.00494209, 0.0978534, 0.897205},
+    { 0.00218225, 0.992877, 0.00494094 },
-                                                          {0.0054192, 0.974275, 0.0203054},
+    { 0.00494209, 0.0978534, 0.897205 },
-                                                          {0.00433012, 0.985054, 0.0106159},
+    { 0.0054192, 0.974275, 0.0203054 },
-                                                          {0.000860806, 0.996922, 0.00221698} });
+    { 0.00433012, 0.985054, 0.0106159 },
-    auto res_prob_spode = std::vector<std::vector<double>>({ {0.00419032, 0.994247, 0.00156265},
+    { 0.000860806, 0.996922, 0.00221698 }
-                                                            {0.00172808, 0.993433, 0.00483862},
+        });
-                                                            {0.00172808, 0.993433, 0.00483862},
+    auto res_prob_spode = std::vector<std::vector<double>>({
-                                                            {0.00172808, 0.993433, 0.00483862},
+     {0.00419032, 0.994247, 0.00156265},
-                                                            {0.00279211, 0.993737, 0.00347077},
+     {0.00172808, 0.993433, 0.00483862},
-                                                            {0.0120674, 0.357909, 0.630024},
+     {0.00172808, 0.993433, 0.00483862},
-                                                            {0.00386239, 0.913919, 0.0822185},
+     {0.00172808, 0.993433, 0.00483862},
-                                                            {0.0244389, 0.966447, 0.00911374},
+     {0.00279211, 0.993737, 0.00347077},
-                                                            {0.003135, 0.991799, 0.0050661} });
+     {0.0120674, 0.357909, 0.630024},
-    auto res_prob_baode = std::vector<std::vector<double>>({ {0.0112349, 0.962274, 0.0264907},
+     {0.00386239, 0.913919, 0.0822185},
-                                                            {0.00371025, 0.950592, 0.0456973},
+     {0.0244389, 0.966447, 0.00911374},
-                                                            {0.00371025, 0.950592, 0.0456973},
+     {0.003135, 0.991799, 0.0050661}
-                                                            {0.00371025, 0.950592, 0.0456973},
+        });
-                                                            {0.00369275, 0.84967, 0.146637},
+    auto res_prob_baode = std::vector<std::vector<double>>({
-                                                            {0.0252205, 0.113564, 0.861215},
+        {0.0112349, 0.962274, 0.0264907},
-                                                            {0.0284828, 0.770524, 0.200993},
+        {0.00371025, 0.950592, 0.0456973},
-                                                            {0.0213182, 0.857189, 0.121493},
+        {0.00371025, 0.950592, 0.0456973},
-                                                            {0.00868436, 0.949494, 0.0418215} });
+        {0.00371025, 0.950592, 0.0456973},
-    auto res_prob_voting = std::vector<std::vector<double>>(
+        {0.00369275, 0.84967, 0.146637},
-        { {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0}, {0, 0, 1}, {0, 1, 0}, {0, 1, 0}, {0, 1, 0} });
+        {0.0252205, 0.113564, 0.861215},
-    std::map<std::string, std::vector<std::vector<double>>> res_prob{ {"TAN", res_prob_tan},
+        {0.0284828, 0.770524, 0.200993},
-                                                                     {"SPODE", res_prob_spode},
+        {0.0213182, 0.857189, 0.121493},
-                                                                     {"BoostAODEproba", res_prob_baode},
+        {0.00868436, 0.949494, 0.0418215}
-                                                                     {"BoostAODEvoting", res_prob_voting} };
+        });
-    std::map<std::string, bayesnet::BaseClassifier*> models{ {"TAN", new bayesnet::TAN()},
+    auto res_prob_voting = std::vector<std::vector<double>>({
-                                                             {"SPODE", new bayesnet::SPODE(0)},
+        {0, 1, 0},
-                                                             {"BoostAODEproba", new bayesnet::BoostAODE(false)},
+        {0, 1, 0},
-                                                             {"BoostAODEvoting", new bayesnet::BoostAODE(true)} };
+        {0, 1, 0},
+        {0, 1, 0},
+        {0, 1, 0},
+        {0, 0, 1},
+        {0, 1, 0},
+        {0, 1, 0},
+        {0, 1, 0}
+        });
+    std::map<std::string, std::vector<std::vector<double>>> res_prob{ {"TAN", res_prob_tan}, {"SPODE", res_prob_spode} , {"BoostAODEproba", res_prob_baode }, {"BoostAODEvoting", res_prob_voting } };
+    std::map<std::string, bayesnet::BaseClassifier*> models{ {"TAN", new bayesnet::TAN()}, {"SPODE", new bayesnet::SPODE(0)}, {"BoostAODEproba", new bayesnet::BoostAODE(false)}, {"BoostAODEvoting", new bayesnet::BoostAODE(true)} };
     int init_index = 78;
     auto raw = RawDatasets("iris", true);
 
@@ -222,8 +192,7 @@ TEST_CASE("Model predict_proba", "[Models]")
             REQUIRE(y_pred[i] == yt_pred[i].item<int>());
             for (int j = 0; j < 3; j++) {
                 REQUIRE(res_prob[model][i][j] == Catch::Approx(y_pred_proba[i + init_index][j]).epsilon(raw.epsilon));
-                REQUIRE(res_prob[model][i][j] ==
+                REQUIRE(res_prob[model][i][j] == Catch::Approx(yt_pred_proba[i + init_index][j].item<double>()).epsilon(raw.epsilon));
-                    Catch::Approx(yt_pred_proba[i + init_index][j].item<double>()).epsilon(raw.epsilon));
             }
         }
         delete clf;
@@ -238,7 +207,7 @@ TEST_CASE("AODE voting-proba", "[Models]")
     auto score_proba = clf.score(raw.Xv, raw.yv);
     auto pred_proba = clf.predict_proba(raw.Xv);
     clf.setHyperparameters({
-        {"predict_voting", true},
+        {"predict_voting",true},
         });
     auto score_voting = clf.score(raw.Xv, raw.yv);
     auto pred_voting = clf.predict_proba(raw.Xv);
@@ -298,84 +267,4 @@ TEST_CASE("Predict, predict_proba & score without fitting", "[Models]")
     REQUIRE_THROWS_WITH(clf.predict_proba(raw.Xt), message);
     REQUIRE_THROWS_WITH(clf.score(raw.Xv, raw.yv), message);
     REQUIRE_THROWS_WITH(clf.score(raw.Xt, raw.yt), message);
-}
+}
-TEST_CASE("TAN & SPODE with hyperparameters", "[Models]")
-{
-    auto raw = RawDatasets("iris", true);
-    auto clf = bayesnet::TAN();
-    clf.setHyperparameters({
-        {"parent", 1},
-        });
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    auto score = clf.score(raw.Xv, raw.yv);
-    REQUIRE(score == Catch::Approx(0.973333).epsilon(raw.epsilon));
-    auto clf2 = bayesnet::SPODE(0);
-    clf2.setHyperparameters({
-        {"parent", 1},
-        });
-    clf2.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    auto score2 = clf2.score(raw.Xv, raw.yv);
-    REQUIRE(score2 == Catch::Approx(0.973333).epsilon(raw.epsilon));
-}
-TEST_CASE("TAN & SPODE with invalid hyperparameters", "[Models]")
-{
-    auto raw = RawDatasets("iris", true);
-    auto clf = bayesnet::TAN();
-    clf.setHyperparameters({
-        {"parent", 5},
-        });
-    REQUIRE_THROWS_AS(clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing),
-        std::invalid_argument);
-    auto clf2 = bayesnet::SPODE(0);
-    clf2.setHyperparameters({
-        {"parent", 5},
-        });
-    REQUIRE_THROWS_AS(clf2.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing),
-        std::invalid_argument);
-}
-TEST_CASE("Check proposal checkInput", "[Models]")
-{
-    class testProposal : public bayesnet::Proposal {
-    public:
-        testProposal(torch::Tensor& dataset_, std::vector<std::string>& features_, std::string& className_)
-            : Proposal(dataset_, features_, className_)
-        {
-        }
-        void test_X_y(const torch::Tensor& X, const torch::Tensor& y) { checkInput(X, y); }
-    };
-    auto raw = RawDatasets("iris", true);
-    auto clf = testProposal(raw.dataset, raw.features, raw.className);
-    torch::Tensor X = torch::randint(0, 3, { 10, 4 });
-    torch::Tensor y = torch::rand({ 10 });
-    INFO("Check X is not float");
-    REQUIRE_THROWS_AS(clf.test_X_y(X, y), std::invalid_argument);
-    X = torch::rand({ 10, 4 });
-    INFO("Check y is not integer");
-    REQUIRE_THROWS_AS(clf.test_X_y(X, y), std::invalid_argument);
-    y = torch::randint(0, 3, { 10 });
-    INFO("X and y are correct");
-    REQUIRE_NOTHROW(clf.test_X_y(X, y));
-}
-TEST_CASE("Check KDB loop detection", "[Models]")
-{
-    class testKDB : public bayesnet::KDB {
-    public:
-        testKDB() : KDB(2, 0) {}
-        void test_add_m_edges(std::vector<std::string> features_, int idx, std::vector<int>& S, torch::Tensor& weights)
-        {
-            features = features_;
-            add_m_edges(idx, S, weights);
-        }
-    };
-    auto clf = testKDB();
-    auto features = std::vector<std::string>{ "A", "B", "C" };
-    int idx = 0;
-    std::vector<int> S = { 0 };
-    torch::Tensor weights = torch::tensor({
-        {  1.0, 10.0,  0.0 },   // row0 -> picks col1
-        {  0.0,  1.0, 10.0 },   // row1 -> picks col2
-        { 10.0,  0.0,  1.0 },   // row2 -> picks col0
-        });
-    REQUIRE_NOTHROW(clf.test_add_m_edges(features, 0, S, weights));
-    REQUIRE_NOTHROW(clf.test_add_m_edges(features, 1, S, weights));
-}

tests/TestBayesNetwork.cc

@@ -186,11 +186,11 @@ TEST_CASE("Test Bayesian Network", "[Network]")
         auto str = net.graph("Test Graph");
         REQUIRE(str.size() == 7);
         REQUIRE(str[0] == "digraph BayesNet {\nlabel=<BayesNet Test Graph>\nfontsize=30\nfontcolor=blue\nlabelloc=t\nlayout=circo\n");
-        REQUIRE(str[1] == "\"A\" [shape=circle] \n");
+        REQUIRE(str[1] == "A [shape=circle] \n");
-        REQUIRE(str[2] == "\"A\" -> \"B\"");
+        REQUIRE(str[2] == "A -> B");
-        REQUIRE(str[3] == "\"A\" -> \"C\"");
+        REQUIRE(str[3] == "A -> C");
-        REQUIRE(str[4] == "\"B\" [shape=circle] \n");
+        REQUIRE(str[4] == "B [shape=circle] \n");
-        REQUIRE(str[5] == "\"C\" [shape=circle] \n");
+        REQUIRE(str[5] == "C [shape=circle] \n");
         REQUIRE(str[6] == "}\n");
     }
     SECTION("Test predict")
@@ -257,9 +257,9 @@ TEST_CASE("Test Bayesian Network", "[Network]")
             REQUIRE(node->getCPT().equal(node2->getCPT()));
         }
     }
-    SECTION("Network oddities")
+    SECTION("Test oddities")
     {
-        INFO("Network oddities");
+        INFO("Test oddities");
         buildModel(net, raw.features, raw.className);
         // predict without fitting
         std::vector<std::vector<int>> test = { {1, 2, 0, 1, 1}, {0, 1, 2, 0, 1}, {0, 0, 0, 0, 1}, {2, 2, 2, 2, 1} };
@@ -329,14 +329,6 @@ TEST_CASE("Test Bayesian Network", "[Network]")
         std::string invalid_state = "Feature sepallength not found in states";
         REQUIRE_THROWS_AS(net4.fit(raw.Xv, raw.yv, raw.weightsv, raw.features, raw.className, std::map<std::string, std::vector<int>>(), raw.smoothing), std::invalid_argument);
         REQUIRE_THROWS_WITH(net4.fit(raw.Xv, raw.yv, raw.weightsv, raw.features, raw.className, std::map<std::string, std::vector<int>>(), raw.smoothing), invalid_state);
-        // Try to add node or edge to a fitted network
-        auto net5 = bayesnet::Network();
-        buildModel(net5, raw.features, raw.className);
-        net5.fit(raw.Xv, raw.yv, raw.weightsv, raw.features, raw.className, raw.states, raw.smoothing);
-        REQUIRE_THROWS_AS(net5.addNode("A"), std::logic_error);
-        REQUIRE_THROWS_WITH(net5.addNode("A"), "Cannot add node to a fitted network. Initialize first.");
-        REQUIRE_THROWS_AS(net5.addEdge("A", "B"), std::logic_error);
-        REQUIRE_THROWS_WITH(net5.addEdge("A", "B"), "Cannot add edge to a fitted network. Initialize first.");
     }
 
 }
@@ -381,7 +373,7 @@ TEST_CASE("Dump CPT", "[Network]")
  0.3333
  0.3333
  0.3333
-[ CPUDoubleType{3} ]
+[ CPUFloatType{3} ]
 * petallength: (4) : [4, 3, 3]
 (1,.,.) = 
   0.9388  0.1000  0.2000
@@ -402,7 +394,7 @@ TEST_CASE("Dump CPT", "[Network]")
   0.0204  0.1000  0.2000
   0.1250  0.0526  0.1667
   0.2000  0.0606  0.8235
-[ CPUDoubleType{4,3,3} ]
+[ CPUFloatType{4,3,3} ]
 * petalwidth: (3) : [3, 6, 3]
 (1,.,.) = 
   0.5000  0.0417  0.0714
@@ -427,12 +419,12 @@ TEST_CASE("Dump CPT", "[Network]")
   0.1111  0.0909  0.8000
   0.0667  0.2000  0.8667
   0.0303  0.2500  0.7500
-[ CPUDoubleType{3,6,3} ]
+[ CPUFloatType{3,6,3} ]
 * sepallength: (3) : [3, 3]
  0.8679  0.1321  0.0377
  0.0943  0.3019  0.0566
  0.0377  0.5660  0.9057
-[ CPUDoubleType{3,3} ]
+[ CPUFloatType{3,3} ]
 * sepalwidth: (6) : [6, 3, 3]
 (1,.,.) = 
   0.0392  0.5000  0.2857
@@ -463,7 +455,7 @@ TEST_CASE("Dump CPT", "[Network]")
   0.5098  0.0833  0.1429
   0.5000  0.0476  0.1250
   0.2857  0.0571  0.1132
-[ CPUDoubleType{6,3,3} ]
+[ CPUFloatType{6,3,3} ]
 )";
     REQUIRE(res == expected);
 }
@@ -533,7 +525,6 @@ TEST_CASE("Test Smoothing A", "[Network]")
         }
     }
 }
-
 TEST_CASE("Test Smoothing B", "[Network]")
 {
     auto net = bayesnet::Network();
@@ -558,41 +549,19 @@ TEST_CASE("Test Smoothing B", "[Network]")
         { "C", {0, 1} }
     };
     auto weights = std::vector<double>(C.size(), 1);
-    // See https://www.overleaf.com/read/tfnhpfysfkfx#2d576c example for calculations
+    // Simple
-    INFO("Test Smoothing B - Laplace");
+    std::cout << "LAPLACE\n";
     net.fit(Data, C, weights, { "X", "Y", "Z" }, "C", states, bayesnet::Smoothing_t::LAPLACE);
-    auto laplace_values = std::vector<std::vector<float>>({ {0.377418, 0.622582}, {0.217821, 0.782179} });
+    std::cout << net.dump_cpt();
-    auto laplace_score = net.predict_proba({ {0, 1}, {1, 2}, {2, 3} });
+    std::cout << "Predict proba of {0, 1, 2} y {1, 2, 3} = " << net.predict_proba({ {0, 1}, {1, 2}, {2, 3} }) << std::endl;
-    for (auto i = 0; i < 2; ++i) {
+    std::cout << "ORIGINAL\n";
-        for (auto j = 0; j < 2; ++j) {
-            REQUIRE(laplace_score.at(i).at(j) == Catch::Approx(laplace_values.at(i).at(j)).margin(threshold));
-        }
-    }
-    INFO("Test Smoothing B - Original");
     net.fit(Data, C, weights, { "X", "Y", "Z" }, "C", states, bayesnet::Smoothing_t::ORIGINAL);
-    auto original_values = std::vector<std::vector<float>>({ {0.344769, 0.655231}, {0.0421263, 0.957874} });
+    std::cout << net.dump_cpt();
-    auto original_score = net.predict_proba({ {0, 1}, {1, 2}, {2, 3} });
+    std::cout << "Predict proba of {0, 1, 2} y {1, 2, 3} = " << net.predict_proba({ {0, 1}, {1, 2}, {2, 3} }) << std::endl;
-    for (auto i = 0; i < 2; ++i) {
+    std::cout << "CESTNIK\n";
-        for (auto j = 0; j < 2; ++j) {
-            REQUIRE(original_score.at(i).at(j) == Catch::Approx(original_values.at(i).at(j)).margin(threshold));
-        }
-    }
-    INFO("Test Smoothing B - Cestnik");
     net.fit(Data, C, weights, { "X", "Y", "Z" }, "C", states, bayesnet::Smoothing_t::CESTNIK);
-    auto cestnik_values = std::vector<std::vector<float>>({ {0.353422, 0.646578}, {0.12364, 0.87636} });
+    std::cout << net.dump_cpt();
-    auto cestnik_score = net.predict_proba({ {0, 1}, {1, 2}, {2, 3} });
+    std::cout << "Predict proba of {0, 1, 2} y {1, 2, 3} = " << net.predict_proba({ {0, 1}, {1, 2}, {2, 3} }) << std::endl;
-    for (auto i = 0; i < 2; ++i) {
+
-        for (auto j = 0; j < 2; ++j) {
+
-            REQUIRE(cestnik_score.at(i).at(j) == Catch::Approx(cestnik_values.at(i).at(j)).margin(threshold));
+}
-        }
-    }
-    INFO("Test Smoothing B - No smoothing");
-    net.fit(Data, C, weights, { "X", "Y", "Z" }, "C", states, bayesnet::Smoothing_t::NONE);
-    auto nosmooth_values = std::vector<std::vector<float>>({ {0.342465753, 0.65753424}, {0.0, 1.0} });
-    auto nosmooth_score = net.predict_proba({ {0, 1}, {1, 2}, {2, 3} });
-    for (auto i = 0; i < 2; ++i) {
-        for (auto j = 0; j < 2; ++j) {
-            REQUIRE(nosmooth_score.at(i).at(j) == Catch::Approx(nosmooth_values.at(i).at(j)).margin(threshold));
-        }
-    }
-}

tests/TestBayesNode.cc

@@ -62,17 +62,15 @@ TEST_CASE("Test Node computeCPT", "[Node]")
     // Create a vector with the names of the classes
     auto className = std::string("Class");
     // weights
-    auto weights = torch::tensor({ 1.0, 1.0, 1.0, 1.0 }, torch::kDouble);
+    auto weights = torch::tensor({ 1.0, 1.0, 1.0, 1.0 });
     std::vector<bayesnet::Node> nodes;
     for (int i = 0; i < features.size(); i++) {
         auto node = bayesnet::Node(features[i]);
         node.setNumStates(states[i]);
         nodes.push_back(node);
     }
-    // Create node class with 2 states
     nodes.push_back(bayesnet::Node(className));
     nodes[features.size()].setNumStates(2);
-    // The network is c->f1, f2, f3 y f1->f2, f3 
     for (int i = 0; i < features.size(); i++) {
         // Add class node as parent of all feature nodes
         nodes[i].addParent(&nodes[features.size()]);
@@ -110,14 +108,14 @@ TEST_CASE("Test Node computeCPT", "[Node]")
     // Oddities
     auto features_back = features;
     // Remove a parent from features
-    // features.pop_back();
+    features.pop_back();
-    // REQUIRE_THROWS_AS(nodes[0].computeCPT(dataset, features, 0.0, weights), std::logic_error);
+    REQUIRE_THROWS_AS(nodes[0].computeCPT(dataset, features, 0.0, weights), std::logic_error);
-    // REQUIRE_THROWS_WITH(nodes[0].computeCPT(dataset, features, 0.0, weights), "Feature parent Class not found in dataset");
+    REQUIRE_THROWS_WITH(nodes[0].computeCPT(dataset, features, 0.0, weights), "Feature parent Class not found in dataset");
     // Remove a feature from features
-    // features = features_back;
+    features = features_back;
-    // features.erase(features.begin());
+    features.erase(features.begin());
-    // REQUIRE_THROWS_AS(nodes[0].computeCPT(dataset, features, 0.0, weights), std::logic_error);
+    REQUIRE_THROWS_AS(nodes[0].computeCPT(dataset, features, 0.0, weights), std::logic_error);
-    // REQUIRE_THROWS_WITH(nodes[0].computeCPT(dataset, features, 0.0, weights), "Feature F1 not found in dataset");
+    REQUIRE_THROWS_WITH(nodes[0].computeCPT(dataset, features, 0.0, weights), "Feature F1 not found in dataset");
 }
 TEST_CASE("TEST MinFill method", "[Node]")
 {

tests/TestBoostA2DE.cc

@@ -27,192 +27,189 @@ TEST_CASE("Build basic model", "[BoostA2DE]")
     auto score = clf.score(raw.Xv, raw.yv);
     REQUIRE(score == Catch::Approx(0.919271).epsilon(raw.epsilon));
 }
-TEST_CASE("Feature_select IWSS", "[BoostA2DE]")
+// TEST_CASE("Feature_select IWSS", "[BoostAODE]")
-{
+// {
-    auto raw = RawDatasets("glass", true);
+//     auto raw = RawDatasets("glass", true);
-    auto clf = bayesnet::BoostA2DE();
+//     auto clf = bayesnet::BoostAODE();
-    clf.setHyperparameters({ {"select_features", "IWSS"}, {"threshold", 0.5 } });
+//     clf.setHyperparameters({ {"select_features", "IWSS"}, {"threshold", 0.5 } });
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
+//     clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 140);
+//     REQUIRE(clf.getNumberOfNodes() == 90);
-    REQUIRE(clf.getNumberOfEdges() == 294);
+//     REQUIRE(clf.getNumberOfEdges() == 153);
-    REQUIRE(clf.getNotes().size() == 4);
+//     REQUIRE(clf.getNotes().size() == 2);
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 4 of 9 with IWSS");
+//     REQUIRE(clf.getNotes()[0] == "Used features in initialization: 4 of 9 with IWSS");
-    REQUIRE(clf.getNotes()[1] == "Convergence threshold reached & 15 models eliminated");
+//     REQUIRE(clf.getNotes()[1] == "Number of models: 9");
-    REQUIRE(clf.getNotes()[2] == "Pairs not used in train: 2");
+// }
-    REQUIRE(clf.getNotes()[3] == "Number of models: 14");
+// TEST_CASE("Feature_select FCBF", "[BoostAODE]")
-}
+// {
-TEST_CASE("Feature_select FCBF", "[BoostA2DE]")
+//     auto raw = RawDatasets("glass", true);
-{
+//     auto clf = bayesnet::BoostAODE();
-    auto raw = RawDatasets("glass", true);
+//     clf.setHyperparameters({ {"select_features", "FCBF"}, {"threshold", 1e-7 } });
-    auto clf = bayesnet::BoostA2DE();
+//     clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    clf.setHyperparameters({ {"select_features", "FCBF"}, {"threshold", 1e-7 } });
+//     REQUIRE(clf.getNumberOfNodes() == 90);
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
+//     REQUIRE(clf.getNumberOfEdges() == 153);
-    REQUIRE(clf.getNumberOfNodes() == 110);
+//     REQUIRE(clf.getNotes().size() == 2);
-    REQUIRE(clf.getNumberOfEdges() == 231);
+//     REQUIRE(clf.getNotes()[0] == "Used features in initialization: 4 of 9 with FCBF");
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 4 of 9 with FCBF");
+//     REQUIRE(clf.getNotes()[1] == "Number of models: 9");
-    REQUIRE(clf.getNotes()[1] == "Convergence threshold reached & 15 models eliminated");
+// }
-    REQUIRE(clf.getNotes()[2] == "Pairs not used in train: 2");
+// TEST_CASE("Test used features in train note and score", "[BoostAODE]")
-    REQUIRE(clf.getNotes()[3] == "Number of models: 11");
+// {
-}
+//     auto raw = RawDatasets("diabetes", true);
-TEST_CASE("Test used features in train note and score", "[BoostA2DE]")
+//     auto clf = bayesnet::BoostAODE(true);
-{
+//     clf.setHyperparameters({
-    auto raw = RawDatasets("diabetes", true);
+//         {"order", "asc"},
-    auto clf = bayesnet::BoostA2DE(true);
+//         {"convergence", true},
-    clf.setHyperparameters({
+//         {"select_features","CFS"},
-        {"order", "asc"},
+//         });
-        {"convergence", true},
+//     clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-        {"select_features","CFS"},
+//     REQUIRE(clf.getNumberOfNodes() == 72);
-        });
+//     REQUIRE(clf.getNumberOfEdges() == 120);
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
+//     REQUIRE(clf.getNotes().size() == 2);
-    REQUIRE(clf.getNumberOfNodes() == 144);
+//     REQUIRE(clf.getNotes()[0] == "Used features in initialization: 6 of 8 with CFS");
-    REQUIRE(clf.getNumberOfEdges() == 288);
+//     REQUIRE(clf.getNotes()[1] == "Number of models: 8");
-    REQUIRE(clf.getNotes().size() == 2);
+//     auto score = clf.score(raw.Xv, raw.yv);
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 6 of 8 with CFS");
+//     auto scoret = clf.score(raw.Xt, raw.yt);
-    REQUIRE(clf.getNotes()[1] == "Number of models: 16");
+//     REQUIRE(score == Catch::Approx(0.809895813).epsilon(raw.epsilon));
-    auto score = clf.score(raw.Xv, raw.yv);
+//     REQUIRE(scoret == Catch::Approx(0.809895813).epsilon(raw.epsilon));
-    auto scoret = clf.score(raw.Xt, raw.yt);
+// }
-    REQUIRE(score == Catch::Approx(0.856771).epsilon(raw.epsilon));
+// TEST_CASE("Voting vs proba", "[BoostAODE]")
-    REQUIRE(scoret == Catch::Approx(0.856771).epsilon(raw.epsilon));
+// {
-}
+//     auto raw = RawDatasets("iris", true);
-TEST_CASE("Voting vs proba", "[BoostA2DE]")
+//     auto clf = bayesnet::BoostAODE(false);
-{
+//     clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    auto raw = RawDatasets("iris", true);
+//     auto score_proba = clf.score(raw.Xv, raw.yv);
-    auto clf = bayesnet::BoostA2DE(false);
+//     auto pred_proba = clf.predict_proba(raw.Xv);
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
+//     clf.setHyperparameters({
-    auto score_proba = clf.score(raw.Xv, raw.yv);
+//         {"predict_voting",true},
-    auto pred_proba = clf.predict_proba(raw.Xv);
+//         });
-    clf.setHyperparameters({
+//     auto score_voting = clf.score(raw.Xv, raw.yv);
-        {"predict_voting",true},
+//     auto pred_voting = clf.predict_proba(raw.Xv);
-        });
+//     REQUIRE(score_proba == Catch::Approx(0.97333).epsilon(raw.epsilon));
-    auto score_voting = clf.score(raw.Xv, raw.yv);
+//     REQUIRE(score_voting == Catch::Approx(0.98).epsilon(raw.epsilon));
-    auto pred_voting = clf.predict_proba(raw.Xv);
+//     REQUIRE(pred_voting[83][2] == Catch::Approx(1.0).epsilon(raw.epsilon));
-    REQUIRE(score_proba == Catch::Approx(0.98).epsilon(raw.epsilon));
+//     REQUIRE(pred_proba[83][2] == Catch::Approx(0.86121525).epsilon(raw.epsilon));
-    REQUIRE(score_voting == Catch::Approx(0.946667).epsilon(raw.epsilon));
+//     REQUIRE(clf.dump_cpt() == "");
-    REQUIRE(pred_voting[83][2] == Catch::Approx(0.53508).epsilon(raw.epsilon));
+//     REQUIRE(clf.topological_order() == std::vector<std::string>());
-    REQUIRE(pred_proba[83][2] == Catch::Approx(0.48394).epsilon(raw.epsilon));
+// }
-    REQUIRE(clf.dump_cpt().size() == 7742);
+// TEST_CASE("Order asc, desc & random", "[BoostAODE]")
-    REQUIRE(clf.topological_order() == std::vector<std::string>());
+// {
-}
+//     auto raw = RawDatasets("glass", true);
-TEST_CASE("Order asc, desc & random", "[BoostA2DE]")
+//     std::map<std::string, double> scores{
-{
+//         {"asc", 0.83645f }, { "desc", 0.84579f }, { "rand", 0.84112 }
-    auto raw = RawDatasets("glass", true);
+//     };
-    std::map<std::string, double> scores{
+//     for (const std::string& order : { "asc", "desc", "rand" }) {
-        {"asc", 0.752336f }, { "desc", 0.813084f }, { "rand", 0.850467 }
+//         auto clf = bayesnet::BoostAODE();
-    };
+//         clf.setHyperparameters({
-    for (const std::string& order : { "asc", "desc", "rand" }) {
+//             {"order", order},
-        auto clf = bayesnet::BoostA2DE();
+//             {"bisection", false},
-        clf.setHyperparameters({
+//             {"maxTolerance", 1},
-            {"order", order},
+//             {"convergence", false},
-            {"bisection", false},
+//             });
-            {"maxTolerance", 1},
+//         clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-            {"convergence", false},
+//         auto score = clf.score(raw.Xv, raw.yv);
-            });
+//         auto scoret = clf.score(raw.Xt, raw.yt);
-        clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
+//         INFO("BoostAODE order: " + order);
-        auto score = clf.score(raw.Xv, raw.yv);
+//         REQUIRE(score == Catch::Approx(scores[order]).epsilon(raw.epsilon));
-        auto scoret = clf.score(raw.Xt, raw.yt);
+//         REQUIRE(scoret == Catch::Approx(scores[order]).epsilon(raw.epsilon));
-        INFO("BoostA2DE order: " + order);
+//     }
-        REQUIRE(score == Catch::Approx(scores[order]).epsilon(raw.epsilon));
+// }
-        REQUIRE(scoret == Catch::Approx(scores[order]).epsilon(raw.epsilon));
+// TEST_CASE("Oddities", "[BoostAODE]")
-    }
+// {
-}
+//     auto clf = bayesnet::BoostAODE();
-TEST_CASE("Oddities2", "[BoostA2DE]")
+//     auto raw = RawDatasets("iris", true);
-{
+//     auto bad_hyper = nlohmann::json{
-    auto clf = bayesnet::BoostA2DE();
+//         { { "order", "duck" } },
-    auto raw = RawDatasets("iris", true);
+//         { { "select_features", "duck" } },
-    auto bad_hyper = nlohmann::json{
+//         { { "maxTolerance", 0 } },
-        { { "order", "duck" } },
+//         { { "maxTolerance", 5 } },
-        { { "select_features", "duck" } },
+//     };
-        { { "maxTolerance", 0 } },
+//     for (const auto& hyper : bad_hyper.items()) {
-        { { "maxTolerance", 7 } },
+//         INFO("BoostAODE hyper: " + hyper.value().dump());
-    };
+//         REQUIRE_THROWS_AS(clf.setHyperparameters(hyper.value()), std::invalid_argument);
-    for (const auto& hyper : bad_hyper.items()) {
+//     }
-        INFO("BoostA2DE hyper: " + hyper.value().dump());
+//     REQUIRE_THROWS_AS(clf.setHyperparameters({ {"maxTolerance", 0 } }), std::invalid_argument);
-        REQUIRE_THROWS_AS(clf.setHyperparameters(hyper.value()), std::invalid_argument);
+//     auto bad_hyper_fit = nlohmann::json{
-    }
+//         { { "select_features","IWSS" }, { "threshold", -0.01 } },
-    REQUIRE_THROWS_AS(clf.setHyperparameters({ {"maxTolerance", 0 } }), std::invalid_argument);
+//         { { "select_features","IWSS" }, { "threshold", 0.51 } },
-    auto bad_hyper_fit = nlohmann::json{
+//         { { "select_features","FCBF" }, { "threshold", 1e-8 } },
-        { { "select_features","IWSS" }, { "threshold", -0.01 } },
+//         { { "select_features","FCBF" }, { "threshold", 1.01 } },
-        { { "select_features","IWSS" }, { "threshold", 0.51 } },
+//     };
-        { { "select_features","FCBF" }, { "threshold", 1e-8 } },
+//     for (const auto& hyper : bad_hyper_fit.items()) {
-        { { "select_features","FCBF" }, { "threshold", 1.01 } },
+//         INFO("BoostAODE hyper: " + hyper.value().dump());
-    };
+//         clf.setHyperparameters(hyper.value());
-    for (const auto& hyper : bad_hyper_fit.items()) {
+//         REQUIRE_THROWS_AS(clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing, std::invalid_argument);
-        INFO("BoostA2DE hyper: " + hyper.value().dump());
+//     }
-        clf.setHyperparameters(hyper.value());
+// }
-        REQUIRE_THROWS_AS(clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing), std::invalid_argument);
+
-    }
+// TEST_CASE("Bisection Best", "[BoostAODE]")
-}
+// {
-TEST_CASE("No features selected", "[BoostA2DE]")
+//     auto clf = bayesnet::BoostAODE();
-{
+//     auto raw = RawDatasets("kdd_JapaneseVowels", true, 1200, true, false);
-    // Check that the note "No features selected in initialization" is added
+//     clf.setHyperparameters({
-    //
+//         {"bisection", true},
-    auto raw = RawDatasets("iris", true);
+//         {"maxTolerance", 3},
-    auto clf = bayesnet::BoostA2DE();
+//         {"convergence", true},
-    clf.setHyperparameters({ {"select_features","FCBF"}, {"threshold", 1 } });
+//         {"block_update", false},
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
+//         {"convergence_best", false},
-    REQUIRE(clf.getNotes().size() == 1);
+//         });
-    REQUIRE(clf.getNotes()[0] == "No features selected in initialization");
+//     clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-}
+//     REQUIRE(clf.getNumberOfNodes() == 210);
-TEST_CASE("Bisection Best", "[BoostA2DE]")
+//     REQUIRE(clf.getNumberOfEdges() == 378);
-{
+//     REQUIRE(clf.getNotes().size() == 1);
-    auto clf = bayesnet::BoostA2DE();
+//     REQUIRE(clf.getNotes().at(0) == "Number of models: 14");
-    auto raw = RawDatasets("kdd_JapaneseVowels", true, 1200, true, false);
+//     auto score = clf.score(raw.X_test, raw.y_test);
-    clf.setHyperparameters({
+//     auto scoret = clf.score(raw.X_test, raw.y_test);
-        {"bisection", true},
+//     REQUIRE(score == Catch::Approx(0.991666675f).epsilon(raw.epsilon));
-        {"maxTolerance", 3},
+//     REQUIRE(scoret == Catch::Approx(0.991666675f).epsilon(raw.epsilon));
-        {"convergence", true},
+// }
-        {"block_update", false},
+// TEST_CASE("Bisection Best vs Last", "[BoostAODE]")
-        {"convergence_best", false},
+// {
-        });
+//     auto raw = RawDatasets("kdd_JapaneseVowels", true, 1500, true, false);
-    clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
+//     auto clf = bayesnet::BoostAODE(true);
-    REQUIRE(clf.getNumberOfNodes() == 480);
+//     auto hyperparameters = nlohmann::json{
-    REQUIRE(clf.getNumberOfEdges() == 1152);
+//         {"bisection", true},
-    REQUIRE(clf.getNotes().size() == 3);
+//         {"maxTolerance", 3},
-    REQUIRE(clf.getNotes().at(0) == "Convergence threshold reached & 15 models eliminated");
+//         {"convergence", true},
-    REQUIRE(clf.getNotes().at(1) == "Pairs not used in train: 83");
+//         {"convergence_best", true},
-    REQUIRE(clf.getNotes().at(2) == "Number of models: 32");
+//     };
-    auto score = clf.score(raw.X_test, raw.y_test);
+//     clf.setHyperparameters(hyperparameters);
-    auto scoret = clf.score(raw.X_test, raw.y_test);
+//     clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(score == Catch::Approx(0.966667f).epsilon(raw.epsilon));
+//     auto score_best = clf.score(raw.X_test, raw.y_test);
-    REQUIRE(scoret == Catch::Approx(0.966667f).epsilon(raw.epsilon));
+//     REQUIRE(score_best == Catch::Approx(0.980000019f).epsilon(raw.epsilon));
-}
+//     // Now we will set the hyperparameter to use the last accuracy
-TEST_CASE("Block Update", "[BoostA2DE]")
+//     hyperparameters["convergence_best"] = false;
-{
+//     clf.setHyperparameters(hyperparameters);
-    auto clf = bayesnet::BoostA2DE();
+//     clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    auto raw = RawDatasets("spambase", true, 500);
+//     auto score_last = clf.score(raw.X_test, raw.y_test);
-    clf.setHyperparameters({
+//     REQUIRE(score_last == Catch::Approx(0.976666689f).epsilon(raw.epsilon));
-        {"bisection", true},
+// }
-        {"block_update", true},
+
-        {"maxTolerance", 3},
+// TEST_CASE("Block Update", "[BoostAODE]")
-        {"convergence", true},
+// {
-        });
+//     auto clf = bayesnet::BoostAODE();
-    clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
+//     auto raw = RawDatasets("mfeat-factors", true, 500);
-    REQUIRE(clf.getNumberOfNodes() == 58);
+//     clf.setHyperparameters({
-    REQUIRE(clf.getNumberOfEdges() == 165);
+//         {"bisection", true},
-    REQUIRE(clf.getNotes().size() == 3);
+//         {"block_update", true},
-    REQUIRE(clf.getNotes()[0] == "Convergence threshold reached & 15 models eliminated");
+//         {"maxTolerance", 3},
-    REQUIRE(clf.getNotes()[1] == "Pairs not used in train: 1588");
+//         {"convergence", true},
-    REQUIRE(clf.getNotes()[2] == "Number of models: 1");
+//         });
-    auto score = clf.score(raw.X_test, raw.y_test);
+//     clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    auto scoret = clf.score(raw.X_test, raw.y_test);
+//     REQUIRE(clf.getNumberOfNodes() == 868);
-    REQUIRE(score == Catch::Approx(1.0f).epsilon(raw.epsilon));
+//     REQUIRE(clf.getNumberOfEdges() == 1724);
-    REQUIRE(scoret == Catch::Approx(1.0f).epsilon(raw.epsilon));
+//     REQUIRE(clf.getNotes().size() == 3);
-    //
+//     REQUIRE(clf.getNotes()[0] == "Convergence threshold reached & 15 models eliminated");
-    // std::cout << "Number of nodes " << clf.getNumberOfNodes() << std::endl;
+//     REQUIRE(clf.getNotes()[1] == "Used features in train: 19 of 216");
-    // std::cout << "Number of edges " << clf.getNumberOfEdges() << std::endl;
+//     REQUIRE(clf.getNotes()[2] == "Number of models: 4");
-    // std::cout << "Notes size " << clf.getNotes().size() << std::endl;
+//     auto score = clf.score(raw.X_test, raw.y_test);
-    // for (auto note : clf.getNotes()) {
+//     auto scoret = clf.score(raw.X_test, raw.y_test);
-    //     std::cout << note << std::endl;
+//     REQUIRE(score == Catch::Approx(0.99f).epsilon(raw.epsilon));
-    // }
+//     REQUIRE(scoret == Catch::Approx(0.99f).epsilon(raw.epsilon));
-    // std::cout << "Score " << score << std::endl;
+//     //
-}
+//     // std::cout << "Number of nodes " << clf.getNumberOfNodes() << std::endl;
-TEST_CASE("Test graph b2a2de", "[BoostA2DE]")
+//     // std::cout << "Number of edges " << clf.getNumberOfEdges() << std::endl;
-{
+//     // std::cout << "Notes size " << clf.getNotes().size() << std::endl;
-    auto raw = RawDatasets("iris", true);
+//     // for (auto note : clf.getNotes()) {
-    auto clf = bayesnet::BoostA2DE();
+//     //     std::cout << note << std::endl;
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
+//     // }
-    auto graph = clf.graph();
+//     // std::cout << "Score " << score << std::endl;
-    REQUIRE(graph.size() == 26);
+// }
-    REQUIRE(graph[0] == "digraph BayesNet {\nlabel=<BayesNet BoostA2DE_0>\nfontsize=30\nfontcolor=blue\nlabelloc=t\nlayout=circo\n");
-    REQUIRE(graph[1] == "\"class\" [shape=circle, fontcolor=red, fillcolor=lightblue, style=filled ] \n");
-}

tests/TestBoostAODE.cc

@@ -4,17 +4,20 @@
 // SPDX-License-Identifier: MIT
 // ***************************************************************
 
-#include <catch2/catch_approx.hpp>
+#include <type_traits>
 #include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
 #include <catch2/generators/catch_generators.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
-#include "TestUtils.h"
 #include "bayesnet/ensembles/BoostAODE.h"
+#include "TestUtils.h"
 
-TEST_CASE("Feature_select CFS", "[BoostAODE]") {
+
+TEST_CASE("Feature_select CFS", "[BoostAODE]")
+{
     auto raw = RawDatasets("glass", true);
     auto clf = bayesnet::BoostAODE();
-    clf.setHyperparameters({{"select_features", "CFS"}});
+    clf.setHyperparameters({ {"select_features", "CFS"} });
     clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
     REQUIRE(clf.getNumberOfNodes() == 90);
     REQUIRE(clf.getNumberOfEdges() == 153);
@@ -22,10 +25,11 @@ TEST_CASE("Feature_select CFS", "[BoostAODE]") {
     REQUIRE(clf.getNotes()[0] == "Used features in initialization: 6 of 9 with CFS");
     REQUIRE(clf.getNotes()[1] == "Number of models: 9");
 }
-TEST_CASE("Feature_select IWSS", "[BoostAODE]") {
+TEST_CASE("Feature_select IWSS", "[BoostAODE]")
+{
     auto raw = RawDatasets("glass", true);
     auto clf = bayesnet::BoostAODE();
-    clf.setHyperparameters({{"select_features", "IWSS"}, {"threshold", 0.5}});
+    clf.setHyperparameters({ {"select_features", "IWSS"}, {"threshold", 0.5 } });
     clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
     REQUIRE(clf.getNumberOfNodes() == 90);
     REQUIRE(clf.getNumberOfEdges() == 153);
@@ -33,10 +37,11 @@ TEST_CASE("Feature_select IWSS", "[BoostAODE]") {
     REQUIRE(clf.getNotes()[0] == "Used features in initialization: 4 of 9 with IWSS");
     REQUIRE(clf.getNotes()[1] == "Number of models: 9");
 }
-TEST_CASE("Feature_select FCBF", "[BoostAODE]") {
+TEST_CASE("Feature_select FCBF", "[BoostAODE]")
+{
     auto raw = RawDatasets("glass", true);
     auto clf = bayesnet::BoostAODE();
-    clf.setHyperparameters({{"select_features", "FCBF"}, {"threshold", 1e-7}});
+    clf.setHyperparameters({ {"select_features", "FCBF"}, {"threshold", 1e-7 } });
     clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
     REQUIRE(clf.getNumberOfNodes() == 90);
     REQUIRE(clf.getNumberOfEdges() == 153);
@@ -44,14 +49,15 @@ TEST_CASE("Feature_select FCBF", "[BoostAODE]") {
     REQUIRE(clf.getNotes()[0] == "Used features in initialization: 4 of 9 with FCBF");
     REQUIRE(clf.getNotes()[1] == "Number of models: 9");
 }
-TEST_CASE("Test used features in train note and score", "[BoostAODE]") {
+TEST_CASE("Test used features in train note and score", "[BoostAODE]")
+{
     auto raw = RawDatasets("diabetes", true);
     auto clf = bayesnet::BoostAODE(true);
     clf.setHyperparameters({
         {"order", "asc"},
         {"convergence", true},
-        {"select_features", "CFS"},
+        {"select_features","CFS"},
-    });
+        });
     clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
     REQUIRE(clf.getNumberOfNodes() == 72);
     REQUIRE(clf.getNumberOfEdges() == 120);
@@ -63,35 +69,39 @@ TEST_CASE("Test used features in train note and score", "[BoostAODE]") {
     REQUIRE(score == Catch::Approx(0.809895813).epsilon(raw.epsilon));
     REQUIRE(scoret == Catch::Approx(0.809895813).epsilon(raw.epsilon));
 }
-TEST_CASE("Voting vs proba", "[BoostAODE]") {
+TEST_CASE("Voting vs proba", "[BoostAODE]")
+{
     auto raw = RawDatasets("iris", true);
     auto clf = bayesnet::BoostAODE(false);
     clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
     auto score_proba = clf.score(raw.Xv, raw.yv);
     auto pred_proba = clf.predict_proba(raw.Xv);
     clf.setHyperparameters({
-        {"predict_voting", true},
+        {"predict_voting",true},
-    });
+        });
     auto score_voting = clf.score(raw.Xv, raw.yv);
     auto pred_voting = clf.predict_proba(raw.Xv);
     REQUIRE(score_proba == Catch::Approx(0.97333).epsilon(raw.epsilon));
     REQUIRE(score_voting == Catch::Approx(0.98).epsilon(raw.epsilon));
     REQUIRE(pred_voting[83][2] == Catch::Approx(1.0).epsilon(raw.epsilon));
     REQUIRE(pred_proba[83][2] == Catch::Approx(0.86121525).epsilon(raw.epsilon));
-    REQUIRE(clf.dump_cpt().size() == 7004);
+    REQUIRE(clf.dump_cpt() == "");
     REQUIRE(clf.topological_order() == std::vector<std::string>());
 }
-TEST_CASE("Order asc, desc & random", "[BoostAODE]") {
+TEST_CASE("Order asc, desc & random", "[BoostAODE]")
+{
     auto raw = RawDatasets("glass", true);
-    std::map<std::string, double> scores{{"asc", 0.83645f}, {"desc", 0.84579f}, {"rand", 0.84112}};
+    std::map<std::string, double> scores{
-    for (const std::string &order : {"asc", "desc", "rand"}) {
+        {"asc", 0.83645f }, { "desc", 0.84579f }, { "rand", 0.84112 }
+    };
+    for (const std::string& order : { "asc", "desc", "rand" }) {
         auto clf = bayesnet::BoostAODE();
         clf.setHyperparameters({
             {"order", order},
             {"bisection", false},
             {"maxTolerance", 1},
             {"convergence", false},
-        });
+            });
         clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
         auto score = clf.score(raw.Xv, raw.yv);
         auto scoret = clf.score(raw.Xt, raw.yt);
@@ -100,43 +110,36 @@ TEST_CASE("Order asc, desc & random", "[BoostAODE]") {
         REQUIRE(scoret == Catch::Approx(scores[order]).epsilon(raw.epsilon));
     }
 }
-TEST_CASE("Oddities", "[BoostAODE]") {
+TEST_CASE("Oddities", "[BoostAODE]")
+{
     auto clf = bayesnet::BoostAODE();
     auto raw = RawDatasets("iris", true);
     auto bad_hyper = nlohmann::json{
-        {{"order", "duck"}},
+        { { "order", "duck" } },
-        {{"select_features", "duck"}},
+        { { "select_features", "duck" } },
-        {{"maxTolerance", 0}},
+        { { "maxTolerance", 0 } },
-        {{"maxTolerance", 7}},
+        { { "maxTolerance", 5 } },
     };
-    for (const auto &hyper : bad_hyper.items()) {
+    for (const auto& hyper : bad_hyper.items()) {
         INFO("BoostAODE hyper: " << hyper.value().dump());
         REQUIRE_THROWS_AS(clf.setHyperparameters(hyper.value()), std::invalid_argument);
     }
-    REQUIRE_THROWS_AS(clf.setHyperparameters({{"maxTolerance", 0}}), std::invalid_argument);
+    REQUIRE_THROWS_AS(clf.setHyperparameters({ {"maxTolerance", 0 } }), std::invalid_argument);
     auto bad_hyper_fit = nlohmann::json{
-        {{"select_features", "IWSS"}, {"threshold", -0.01}},
+        { { "select_features","IWSS" }, { "threshold", -0.01 } },
-        {{"select_features", "IWSS"}, {"threshold", 0.51}},
+        { { "select_features","IWSS" }, { "threshold", 0.51 } },
-        {{"select_features", "FCBF"}, {"threshold", 1e-8}},
+        { { "select_features","FCBF" }, { "threshold", 1e-8 } },
-        {{"select_features", "FCBF"}, {"threshold", 1.01}},
+        { { "select_features","FCBF" }, { "threshold", 1.01 } },
     };
-    for (const auto &hyper : bad_hyper_fit.items()) {
+    for (const auto& hyper : bad_hyper_fit.items()) {
         INFO("BoostAODE hyper: " << hyper.value().dump());
         clf.setHyperparameters(hyper.value());
-        REQUIRE_THROWS_AS(clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing),
+        REQUIRE_THROWS_AS(clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing), std::invalid_argument);
-                          std::invalid_argument);
-    }
-
-    auto bad_hyper_fit2 = nlohmann::json{
-        {{"alpha_block", true}, {"block_update", true}},
-        {{"bisection", false}, {"block_update", true}},
-    };
-    for (const auto &hyper : bad_hyper_fit2.items()) {
-        INFO("BoostAODE hyper: " << hyper.value().dump());
-        REQUIRE_THROWS_AS(clf.setHyperparameters(hyper.value()), std::invalid_argument);
     }
 }
-TEST_CASE("Bisection Best", "[BoostAODE]") {
+
+TEST_CASE("Bisection Best", "[BoostAODE]")
+{
     auto clf = bayesnet::BoostAODE();
     auto raw = RawDatasets("kdd_JapaneseVowels", true, 1200, true, false);
     clf.setHyperparameters({
@@ -145,7 +148,7 @@ TEST_CASE("Bisection Best", "[BoostAODE]") {
         {"convergence", true},
         {"block_update", false},
         {"convergence_best", false},
-    });
+        });
     clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
     REQUIRE(clf.getNumberOfNodes() == 210);
     REQUIRE(clf.getNumberOfEdges() == 378);
@@ -156,7 +159,8 @@ TEST_CASE("Bisection Best", "[BoostAODE]") {
     REQUIRE(score == Catch::Approx(0.991666675f).epsilon(raw.epsilon));
     REQUIRE(scoret == Catch::Approx(0.991666675f).epsilon(raw.epsilon));
 }
-TEST_CASE("Bisection Best vs Last", "[BoostAODE]") {
+TEST_CASE("Bisection Best vs Last", "[BoostAODE]")
+{
     auto raw = RawDatasets("kdd_JapaneseVowels", true, 1500, true, false);
     auto clf = bayesnet::BoostAODE(true);
     auto hyperparameters = nlohmann::json{
@@ -176,7 +180,9 @@ TEST_CASE("Bisection Best vs Last", "[BoostAODE]") {
     auto score_last = clf.score(raw.X_test, raw.y_test);
     REQUIRE(score_last == Catch::Approx(0.976666689f).epsilon(raw.epsilon));
 }
-TEST_CASE("Block Update", "[BoostAODE]") {
+
+TEST_CASE("Block Update", "[BoostAODE]")
+{
     auto clf = bayesnet::BoostAODE();
     auto raw = RawDatasets("mfeat-factors", true, 500);
     clf.setHyperparameters({
@@ -184,7 +190,7 @@ TEST_CASE("Block Update", "[BoostAODE]") {
         {"block_update", true},
         {"maxTolerance", 3},
         {"convergence", true},
-    });
+        });
     clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
     REQUIRE(clf.getNumberOfNodes() == 868);
     REQUIRE(clf.getNumberOfEdges() == 1724);
@@ -204,19 +210,4 @@ TEST_CASE("Block Update", "[BoostAODE]") {
     //     std::cout << note << std::endl;
     // }
     // std::cout << "Score " << score << std::endl;
-}
+}
-TEST_CASE("Alphablock", "[BoostAODE]") {
-    auto clf_alpha = bayesnet::BoostAODE();
-    auto clf_no_alpha = bayesnet::BoostAODE();
-    auto raw = RawDatasets("diabetes", true);
-    clf_alpha.setHyperparameters({
-        {"alpha_block", true},
-    });
-    clf_alpha.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    clf_no_alpha.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    auto score_alpha = clf_alpha.score(raw.X_test, raw.y_test);
-    auto score_no_alpha = clf_no_alpha.score(raw.X_test, raw.y_test);
-    REQUIRE(score_alpha == Catch::Approx(0.720779f).epsilon(raw.epsilon));
-    REQUIRE(score_no_alpha == Catch::Approx(0.733766f).epsilon(raw.epsilon));
-}
-

tests/TestMST.cc

@@ -1,72 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_approx.hpp>
-#include <catch2/generators/catch_generators.hpp>
-#include <catch2/matchers/catch_matchers.hpp>
-#include <string>
-#include <vector>
-#include "TestUtils.h"
-#include "bayesnet/utils/Mst.h"
-
-
-TEST_CASE("MST::insertElement tests", "[MST]")
-{
-    bayesnet::MST mst({}, torch::tensor({}), 0);
-    SECTION("Insert into an empty list")
-    {
-        std::list<int> variables;
-        mst.insertElement(variables, 5);
-        REQUIRE(variables == std::list<int>{5});
-    }
-    SECTION("Insert a non-duplicate element")
-    {
-        std::list<int> variables = { 1, 2, 3 };
-        mst.insertElement(variables, 4);
-        REQUIRE(variables == std::list<int>{4, 1, 2, 3});
-    }
-    SECTION("Insert a duplicate element")
-    {
-        std::list<int> variables = { 1, 2, 3 };
-        mst.insertElement(variables, 2);
-        REQUIRE(variables == std::list<int>{1, 2, 3});
-    }
-}
-
-TEST_CASE("MST::reorder tests", "[MST]")
-{
-    bayesnet::MST mst({}, torch::tensor({}), 0);
-    SECTION("Reorder simple graph")
-    {
-        std::vector<std::pair<float, std::pair<int, int>>> T = { {2.0, {1, 2}}, {1.0, {0, 1}} };
-        auto result = mst.reorder(T, 0);
-        REQUIRE(result == std::vector<std::pair<int, int>>{{0, 1}, { 1, 2 }});
-    }
-    SECTION("Reorder with disconnected graph")
-    {
-        std::vector<std::pair<float, std::pair<int, int>>> T = { {2.0, {2, 3}}, {1.0, {0, 1}} };
-        auto result = mst.reorder(T, 0);
-        REQUIRE(result == std::vector<std::pair<int, int>>{{0, 1}, { 2, 3 }});
-    }
-}
-
-TEST_CASE("MST::maximumSpanningTree tests", "[MST]")
-{
-    std::vector<std::string> features = { "A", "B", "C" };
-    auto weights = torch::tensor({
-        {0.0, 1.0, 2.0},
-        {1.0, 0.0, 3.0},
-        {2.0, 3.0, 0.0}
-        });
-    bayesnet::MST mst(features, weights, 0);
-
-    SECTION("MST of a complete graph")
-    {
-        auto result = mst.maximumSpanningTree();
-        REQUIRE(result.size() == 2); // Un MST para 3 nodos tiene 2 aristas
-    }
-}

tests/TestModulesVersions.cc

@@ -16,8 +16,8 @@
 #include "TestUtils.h"
 
 std::map<std::string, std::string> modules = {
-    { "mdlp", "2.0.1" },
+    { "mdlp", "2.0.0" },
-    { "Folding", "1.1.1" },
+    { "Folding", "1.1.0" },
     { "json", "3.11" },
     { "ArffFiles", "1.1.0" }
 };

tests/TestXBA2DE.cc

@@ -1,237 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2025 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#include <catch2/catch_approx.hpp>
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/generators/catch_generators.hpp>
-#include <catch2/matchers/catch_matchers.hpp>
-#include "TestUtils.h"
-#include "bayesnet/ensembles/XBA2DE.h"
-
-TEST_CASE("Normal test", "[XBA2DE]") {
-    auto raw = RawDatasets("iris", true);
-    auto clf = bayesnet::XBA2DE();
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 5);
-    REQUIRE(clf.getNumberOfEdges() == 8);
-    REQUIRE(clf.getNotes().size() == 2);
-    REQUIRE(clf.getVersion() == "0.9.7");
-    REQUIRE(clf.getNotes()[0] == "Convergence threshold reached & 13 models eliminated");
-    REQUIRE(clf.getNotes()[1] == "Number of models: 1");
-    REQUIRE(clf.getNumberOfStates() == 64);
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(1.0f));
-    REQUIRE(clf.graph().size() == 1);
-}
-TEST_CASE("Feature_select CFS", "[XBA2DE]") {
-    auto raw = RawDatasets("glass", true);
-    auto clf = bayesnet::XBA2DE();
-    clf.setHyperparameters({{"select_features", "CFS"}});
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 220);
-    REQUIRE(clf.getNumberOfEdges() == 506);
-    REQUIRE(clf.getNotes().size() == 2);
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 6 of 9 with CFS");
-    REQUIRE(clf.getNotes()[1] == "Number of models: 22");
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(0.720930219));
-}
-TEST_CASE("Feature_select IWSS", "[XBA2DE]") {
-    auto raw = RawDatasets("glass", true);
-    auto clf = bayesnet::XBA2DE();
-    clf.setHyperparameters({{"select_features", "IWSS"}, {"threshold", 0.5}});
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 220);
-    REQUIRE(clf.getNumberOfEdges() == 506);
-    REQUIRE(clf.getNotes().size() == 4);
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 4 of 9 with IWSS");
-    REQUIRE(clf.getNotes()[1] == "Convergence threshold reached & 15 models eliminated");
-    REQUIRE(clf.getNotes()[2] == "Pairs not used in train: 2");
-    REQUIRE(clf.getNotes()[3] == "Number of models: 22");
-    REQUIRE(clf.getNumberOfStates() == 5346);
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(0.72093));
-}
-TEST_CASE("Feature_select FCBF", "[XBA2DE]") {
-    auto raw = RawDatasets("glass", true);
-    auto clf = bayesnet::XBA2DE();
-    clf.setHyperparameters({{"select_features", "FCBF"}, {"threshold", 1e-7}});
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 290);
-    REQUIRE(clf.getNumberOfEdges() == 667);
-    REQUIRE(clf.getNumberOfStates() == 7047);
-    REQUIRE(clf.getNotes().size() == 3);
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 4 of 9 with FCBF");
-    REQUIRE(clf.getNotes()[1] == "Pairs not used in train: 2");
-    REQUIRE(clf.getNotes()[2] == "Number of models: 29");
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(0.744186));
-}
-TEST_CASE("Test used features in train note and score", "[XBA2DE]") {
-    auto raw = RawDatasets("diabetes", true);
-    auto clf = bayesnet::XBA2DE();
-    clf.setHyperparameters({
-        {"order", "asc"},
-        {"convergence", true},
-        {"select_features", "CFS"},
-    });
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 144);
-    REQUIRE(clf.getNumberOfEdges() == 320);
-    REQUIRE(clf.getNumberOfStates() == 5504);
-    REQUIRE(clf.getNotes().size() == 2);
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 6 of 8 with CFS");
-    REQUIRE(clf.getNotes()[1] == "Number of models: 16");
-    auto score = clf.score(raw.Xv, raw.yv);
-    auto scoret = clf.score(raw.Xt, raw.yt);
-    REQUIRE(score == Catch::Approx(0.850260437f).epsilon(raw.epsilon));
-    REQUIRE(scoret == Catch::Approx(0.850260437f).epsilon(raw.epsilon));
-}
-TEST_CASE("Order asc, desc & random", "[XBA2DE]") {
-    auto raw = RawDatasets("glass", true);
-    std::map<std::string, double> scores{{"asc", 0.827103}, {"desc", 0.808411}, {"rand", 0.827103}};
-    for (const std::string &order : {"asc", "desc", "rand"}) {
-        auto clf = bayesnet::XBA2DE();
-        clf.setHyperparameters({
-            {"order", order},
-            {"bisection", false},
-            {"maxTolerance", 1},
-            {"convergence", true},
-        });
-        clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-        auto score = clf.score(raw.Xv, raw.yv);
-        auto scoret = clf.score(raw.Xt, raw.yt);
-        INFO("XBA2DE order: " << order);
-        REQUIRE(score == Catch::Approx(scores[order]).epsilon(raw.epsilon));
-        REQUIRE(scoret == Catch::Approx(scores[order]).epsilon(raw.epsilon));
-    }
-}
-TEST_CASE("Oddities", "[XBA2DE]") {
-    auto clf = bayesnet::XBA2DE();
-    auto raw = RawDatasets("iris", true);
-    auto bad_hyper = nlohmann::json{
-        {{"order", "duck"}},
-        {{"select_features", "duck"}},
-        {{"maxTolerance", 0}},
-        {{"maxTolerance", 7}},
-    };
-    for (const auto &hyper : bad_hyper.items()) {
-        INFO("XBA2DE hyper: " << hyper.value().dump());
-        REQUIRE_THROWS_AS(clf.setHyperparameters(hyper.value()), std::invalid_argument);
-    }
-    REQUIRE_THROWS_AS(clf.setHyperparameters({{"maxTolerance", 0}}), std::invalid_argument);
-    auto bad_hyper_fit = nlohmann::json{
-        {{"select_features", "IWSS"}, {"threshold", -0.01}},
-        {{"select_features", "IWSS"}, {"threshold", 0.51}},
-        {{"select_features", "FCBF"}, {"threshold", 1e-8}},
-        {{"select_features", "FCBF"}, {"threshold", 1.01}},
-    };
-    for (const auto &hyper : bad_hyper_fit.items()) {
-        INFO("XBA2DE hyper: " << hyper.value().dump());
-        clf.setHyperparameters(hyper.value());
-        REQUIRE_THROWS_AS(clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing),
-                          std::invalid_argument);
-    }
-    auto bad_hyper_fit2 = nlohmann::json{
-        {{"alpha_block", true}, {"block_update", true}},
-        {{"bisection", false}, {"block_update", true}},
-    };
-    for (const auto &hyper : bad_hyper_fit2.items()) {
-        INFO("XBA2DE hyper: " << hyper.value().dump());
-        REQUIRE_THROWS_AS(clf.setHyperparameters(hyper.value()), std::invalid_argument);
-    }
-    // Check not enough selected features
-    raw.Xv.pop_back();
-    raw.Xv.pop_back();
-    raw.Xv.pop_back();
-    raw.features.pop_back();
-    raw.features.pop_back();
-    raw.features.pop_back();
-    clf.setHyperparameters({{"select_features", "CFS"}, {"alpha_block", false}, {"block_update", false}});
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNotes().size() == 1);
-    REQUIRE(clf.getNotes()[0] == "No features selected in initialization");
-}
-TEST_CASE("Bisection Best", "[XBA2DE]") {
-    auto clf = bayesnet::XBA2DE();
-    auto raw = RawDatasets("kdd_JapaneseVowels", true, 1200, true, false);
-    clf.setHyperparameters({
-        {"bisection", true},
-        {"maxTolerance", 3},
-        {"convergence", true},
-        {"convergence_best", false},
-    });
-    clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 330);
-    REQUIRE(clf.getNumberOfEdges() == 836);
-    REQUIRE(clf.getNumberOfStates() == 31108);
-    REQUIRE(clf.getNotes().size() == 3);
-    REQUIRE(clf.getNotes().at(0) == "Convergence threshold reached & 15 models eliminated");
-    REQUIRE(clf.getNotes().at(1) == "Pairs not used in train: 83");
-    REQUIRE(clf.getNotes().at(2) == "Number of models: 22");
-    auto score = clf.score(raw.X_test, raw.y_test);
-    auto scoret = clf.score(raw.X_test, raw.y_test);
-    REQUIRE(score == Catch::Approx(0.975).epsilon(raw.epsilon));
-    REQUIRE(scoret == Catch::Approx(0.975).epsilon(raw.epsilon));
-}
-TEST_CASE("Bisection Best vs Last", "[XBA2DE]") {
-    auto raw = RawDatasets("kdd_JapaneseVowels", true, 1500, true, false);
-    auto clf = bayesnet::XBA2DE();
-    auto hyperparameters = nlohmann::json{
-        {"bisection", true},
-        {"maxTolerance", 3},
-        {"convergence", true},
-        {"convergence_best", true},
-    };
-    clf.setHyperparameters(hyperparameters);
-    clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    auto score_best = clf.score(raw.X_test, raw.y_test);
-    REQUIRE(score_best == Catch::Approx(0.983333).epsilon(raw.epsilon));
-    // Now we will set the hyperparameter to use the last accuracy
-    hyperparameters["convergence_best"] = false;
-    clf.setHyperparameters(hyperparameters);
-    clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    auto score_last = clf.score(raw.X_test, raw.y_test);
-    REQUIRE(score_last == Catch::Approx(0.99).epsilon(raw.epsilon));
-}
-TEST_CASE("Block Update", "[XBA2DE]") {
-    auto clf = bayesnet::XBA2DE();
-    auto raw = RawDatasets("kdd_JapaneseVowels", true, 1500, true, false);
-    clf.setHyperparameters({
-        {"bisection", true},
-        {"block_update", true},
-        {"maxTolerance", 3},
-        {"convergence", true},
-    });
-    clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 120);
-    REQUIRE(clf.getNumberOfEdges() == 304);
-    REQUIRE(clf.getNotes().size() == 3);
-    REQUIRE(clf.getNotes()[0] == "Convergence threshold reached & 15 models eliminated");
-    REQUIRE(clf.getNotes()[1] == "Pairs not used in train: 83");
-    REQUIRE(clf.getNotes()[2] == "Number of models: 8");
-    auto score = clf.score(raw.X_test, raw.y_test);
-    auto scoret = clf.score(raw.X_test, raw.y_test);
-    REQUIRE(score == Catch::Approx(0.963333).epsilon(raw.epsilon));
-    REQUIRE(scoret == Catch::Approx(0.963333).epsilon(raw.epsilon));
-    /*std::cout << "Number of nodes " << clf.getNumberOfNodes() << std::endl;*/
-    /*std::cout << "Number of edges " << clf.getNumberOfEdges() << std::endl;*/
-    /*std::cout << "Notes size " << clf.getNotes().size() << std::endl;*/
-    /*for (auto note : clf.getNotes()) {*/
-    /*    std::cout << note << std::endl;*/
-    /*}*/
-    /*std::cout << "Score " << score << std::endl;*/
-}
-TEST_CASE("Alphablock", "[XBA2DE]") {
-    auto clf_alpha = bayesnet::XBA2DE();
-    auto clf_no_alpha = bayesnet::XBA2DE();
-    auto raw = RawDatasets("diabetes", true);
-    clf_alpha.setHyperparameters({
-        {"alpha_block", true},
-    });
-    clf_alpha.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    clf_no_alpha.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    auto score_alpha = clf_alpha.score(raw.X_test, raw.y_test);
-    auto score_no_alpha = clf_no_alpha.score(raw.X_test, raw.y_test);
-    REQUIRE(score_alpha == Catch::Approx(0.714286).epsilon(raw.epsilon));
-    REQUIRE(score_no_alpha == Catch::Approx(0.714286).epsilon(raw.epsilon));
-}

tests/TestXBAODE.cc

@@ -1,216 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#include <catch2/catch_approx.hpp>
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/generators/catch_generators.hpp>
-#include <catch2/matchers/catch_matchers.hpp>
-#include "TestUtils.h"
-#include "bayesnet/ensembles/XBAODE.h"
-
-TEST_CASE("Normal test", "[XBAODE]") {
-    auto raw = RawDatasets("iris", true);
-    auto clf = bayesnet::XBAODE();
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 20);
-    REQUIRE(clf.getNumberOfEdges() == 36);
-    REQUIRE(clf.getNotes().size() == 1);
-    REQUIRE(clf.getVersion() == "0.9.7");
-    REQUIRE(clf.getNotes()[0] == "Number of models: 4");
-    REQUIRE(clf.getNumberOfStates() == 256);
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(0.933333));
-}
-TEST_CASE("Feature_select CFS", "[XBAODE]") {
-    auto raw = RawDatasets("glass", true);
-    auto clf = bayesnet::XBAODE();
-    clf.setHyperparameters({{"select_features", "CFS"}});
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 90);
-    REQUIRE(clf.getNumberOfEdges() == 171);
-    REQUIRE(clf.getNotes().size() == 2);
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 6 of 9 with CFS");
-    REQUIRE(clf.getNotes()[1] == "Number of models: 9");
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(0.720930219));
-}
-TEST_CASE("Feature_select IWSS", "[XBAODE]") {
-    auto raw = RawDatasets("glass", true);
-    auto clf = bayesnet::XBAODE();
-    clf.setHyperparameters({{"select_features", "IWSS"}, {"threshold", 0.5}});
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 90);
-    REQUIRE(clf.getNumberOfEdges() == 171);
-    REQUIRE(clf.getNotes().size() == 2);
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 4 of 9 with IWSS");
-    REQUIRE(clf.getNotes()[1] == "Number of models: 9");
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(0.697674394));
-}
-TEST_CASE("Feature_select FCBF", "[XBAODE]") {
-    auto raw = RawDatasets("glass", true);
-    auto clf = bayesnet::XBAODE();
-    clf.setHyperparameters({{"select_features", "FCBF"}, {"threshold", 1e-7}});
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 90);
-    REQUIRE(clf.getNumberOfEdges() == 171);
-    REQUIRE(clf.getNotes().size() == 2);
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 4 of 9 with FCBF");
-    REQUIRE(clf.getNotes()[1] == "Number of models: 9");
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(0.720930219));
-}
-TEST_CASE("Test used features in train note and score", "[XBAODE]") {
-    auto raw = RawDatasets("diabetes", true);
-    auto clf = bayesnet::XBAODE();
-    clf.setHyperparameters({
-        {"order", "asc"},
-        {"convergence", true},
-        {"select_features", "CFS"},
-    });
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 72);
-    REQUIRE(clf.getNumberOfEdges() == 136);
-    REQUIRE(clf.getNotes().size() == 2);
-    REQUIRE(clf.getNotes()[0] == "Used features in initialization: 6 of 8 with CFS");
-    REQUIRE(clf.getNotes()[1] == "Number of models: 8");
-    auto score = clf.score(raw.Xv, raw.yv);
-    auto scoret = clf.score(raw.Xt, raw.yt);
-    REQUIRE(score == Catch::Approx(0.819010437f).epsilon(raw.epsilon));
-    REQUIRE(scoret == Catch::Approx(0.819010437f).epsilon(raw.epsilon));
-}
-TEST_CASE("Order asc, desc & random", "[XBAODE]") {
-    auto raw = RawDatasets("glass", true);
-    std::map<std::string, double> scores{{"asc", 0.83645f}, {"desc", 0.84579f}, {"rand", 0.84112}};
-    for (const std::string &order : {"asc", "desc", "rand"}) {
-        auto clf = bayesnet::XBAODE();
-        clf.setHyperparameters({
-            {"order", order},
-            {"bisection", false},
-            {"maxTolerance", 1},
-            {"convergence", false},
-        });
-        clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-        auto score = clf.score(raw.Xv, raw.yv);
-        auto scoret = clf.score(raw.Xt, raw.yt);
-        INFO("XBAODE order: " << order);
-        REQUIRE(score == Catch::Approx(scores[order]).epsilon(raw.epsilon));
-        REQUIRE(scoret == Catch::Approx(scores[order]).epsilon(raw.epsilon));
-    }
-}
-TEST_CASE("Oddities", "[XBAODE]") {
-    auto clf = bayesnet::XBAODE();
-    auto raw = RawDatasets("iris", true);
-    auto bad_hyper = nlohmann::json{
-        {{"order", "duck"}},
-        {{"select_features", "duck"}},
-        {{"maxTolerance", 0}},
-        {{"maxTolerance", 7}},
-    };
-    for (const auto &hyper : bad_hyper.items()) {
-        INFO("XBAODE hyper: " << hyper.value().dump());
-        REQUIRE_THROWS_AS(clf.setHyperparameters(hyper.value()), std::invalid_argument);
-    }
-    REQUIRE_THROWS_AS(clf.setHyperparameters({{"maxTolerance", 0}}), std::invalid_argument);
-    auto bad_hyper_fit = nlohmann::json{
-        {{"select_features", "IWSS"}, {"threshold", -0.01}},
-        {{"select_features", "IWSS"}, {"threshold", 0.51}},
-        {{"select_features", "FCBF"}, {"threshold", 1e-8}},
-        {{"select_features", "FCBF"}, {"threshold", 1.01}},
-    };
-    for (const auto &hyper : bad_hyper_fit.items()) {
-        INFO("XBAODE hyper: " << hyper.value().dump());
-        clf.setHyperparameters(hyper.value());
-        REQUIRE_THROWS_AS(clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing),
-                          std::invalid_argument);
-    }
-    auto bad_hyper_fit2 = nlohmann::json{
-        {{"alpha_block", true}, {"block_update", true}},
-        {{"bisection", false}, {"block_update", true}},
-    };
-    for (const auto &hyper : bad_hyper_fit2.items()) {
-        INFO("XBAODE hyper: " << hyper.value().dump());
-        REQUIRE_THROWS_AS(clf.setHyperparameters(hyper.value()), std::invalid_argument);
-    }
-}
-TEST_CASE("Bisection Best", "[XBAODE]") {
-    auto clf = bayesnet::XBAODE();
-    auto raw = RawDatasets("kdd_JapaneseVowels", true, 1200, true, false);
-    clf.setHyperparameters({
-        {"bisection", true},
-        {"maxTolerance", 3},
-        {"convergence", true},
-        {"convergence_best", false},
-    });
-    clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 210);
-    REQUIRE(clf.getNumberOfEdges() == 406);
-    REQUIRE(clf.getNotes().size() == 1);
-    REQUIRE(clf.getNotes().at(0) == "Number of models: 14");
-    auto score = clf.score(raw.X_test, raw.y_test);
-    auto scoret = clf.score(raw.X_test, raw.y_test);
-    REQUIRE(score == Catch::Approx(0.991666675f).epsilon(raw.epsilon));
-    REQUIRE(scoret == Catch::Approx(0.991666675f).epsilon(raw.epsilon));
-}
-TEST_CASE("Bisection Best vs Last", "[XBAODE]") {
-    auto raw = RawDatasets("kdd_JapaneseVowels", true, 1500, true, false);
-    auto clf = bayesnet::XBAODE();
-    auto hyperparameters = nlohmann::json{
-        {"bisection", true},
-        {"maxTolerance", 3},
-        {"convergence", true},
-        {"convergence_best", true},
-    };
-    clf.setHyperparameters(hyperparameters);
-    clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    auto score_best = clf.score(raw.X_test, raw.y_test);
-    REQUIRE(score_best == Catch::Approx(0.973333359f).epsilon(raw.epsilon));
-    // Now we will set the hyperparameter to use the last accuracy
-    hyperparameters["convergence_best"] = false;
-    clf.setHyperparameters(hyperparameters);
-    clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    auto score_last = clf.score(raw.X_test, raw.y_test);
-    REQUIRE(score_last == Catch::Approx(0.976666689f).epsilon(raw.epsilon));
-}
-TEST_CASE("Block Update", "[XBAODE]") {
-    auto clf = bayesnet::XBAODE();
-    auto raw = RawDatasets("mfeat-factors", true, 500);
-    clf.setHyperparameters({
-        {"bisection", true},
-        {"block_update", true},
-        {"maxTolerance", 3},
-        {"convergence", true},
-    });
-    clf.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 1085);
-    REQUIRE(clf.getNumberOfEdges() == 2165);
-    REQUIRE(clf.getNotes().size() == 3);
-    REQUIRE(clf.getNotes()[0] == "Convergence threshold reached & 15 models eliminated");
-    REQUIRE(clf.getNotes()[1] == "Used features in train: 20 of 216");
-    REQUIRE(clf.getNotes()[2] == "Number of models: 5");
-    auto score = clf.score(raw.X_test, raw.y_test);
-    auto scoret = clf.score(raw.X_test, raw.y_test);
-    REQUIRE(score == Catch::Approx(1.0f).epsilon(raw.epsilon));
-    REQUIRE(scoret == Catch::Approx(1.0f).epsilon(raw.epsilon));
-    //
-    // std::cout << "Number of nodes " << clf.getNumberOfNodes() << std::endl;
-    // std::cout << "Number of edges " << clf.getNumberOfEdges() << std::endl;
-    // std::cout << "Notes size " << clf.getNotes().size() << std::endl;
-    // for (auto note : clf.getNotes()) {
-    //     std::cout << note << std::endl;
-    // }
-    // std::cout << "Score " << score << std::endl;
-}
-TEST_CASE("Alphablock", "[XBAODE]") {
-    auto clf_alpha = bayesnet::XBAODE();
-    auto clf_no_alpha = bayesnet::XBAODE();
-    auto raw = RawDatasets("diabetes", true);
-    clf_alpha.setHyperparameters({
-        {"alpha_block", true},
-    });
-    clf_alpha.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    clf_no_alpha.fit(raw.X_train, raw.y_train, raw.features, raw.className, raw.states, raw.smoothing);
-    auto score_alpha = clf_alpha.score(raw.X_test, raw.y_test);
-    auto score_no_alpha = clf_no_alpha.score(raw.X_test, raw.y_test);
-    REQUIRE(score_alpha == Catch::Approx(0.720779f).epsilon(raw.epsilon));
-    REQUIRE(score_no_alpha == Catch::Approx(0.733766f).epsilon(raw.epsilon));
-}

tests/TestXSPODE.cc

@@ -1,126 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_approx.hpp>
-#include <catch2/matchers/catch_matchers.hpp>
-#include <stdexcept>
-#include "bayesnet/classifiers/XSPODE.h"
-#include "TestUtils.h"
-
-TEST_CASE("fit vector test", "[XSPODE]") {
-  auto raw = RawDatasets("iris", true);
-  auto scores = std::vector<float>({0.966667, 0.9333333, 0.966667, 0.966667});
-  for (int i = 0; i < 4; ++i) {
-    auto clf = bayesnet::XSpode(i);
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states,
-            raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 5);
-    REQUIRE(clf.getNumberOfEdges() == 9);
-    REQUIRE(clf.getNotes().size() == 0);
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(scores.at(i)));
-  }
-}
-TEST_CASE("fit dataset test", "[XSPODE]") {
-  auto raw = RawDatasets("iris", true);
-  auto scores = std::vector<float>({0.966667, 0.9333333, 0.966667, 0.966667});
-  for (int i = 0; i < 4; ++i) {
-    auto clf = bayesnet::XSpode(i);
-    clf.fit(raw.dataset, raw.features, raw.className, raw.states,
-            raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 5);
-    REQUIRE(clf.getNumberOfEdges() == 9);
-    REQUIRE(clf.getNotes().size() == 0);
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(scores.at(i)));
-  }
-}
-TEST_CASE("tensors dataset predict & predict_proba", "[XSPODE]") {
-  auto raw = RawDatasets("iris", true);
-  auto scores = std::vector<float>({0.966667, 0.9333333, 0.966667, 0.966667});
-  auto probs_expected = std::vector<std::vector<float>>({ 
-      {0.999017, 0.000306908, 0.000676449}, 
-      {0.99831, 0.00119304, 0.000497099}, 
-      {0.998432, 0.00078416, 0.00078416}, 
-      {0.998801, 0.000599438, 0.000599438}
-  });
-  for (int i = 0; i < 4; ++i) {
-    auto clf = bayesnet::XSpode(i);
-    clf.fit(raw.Xt, raw.yt, raw.features, raw.className, raw.states,
-            raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 5);
-    REQUIRE(clf.getNumberOfEdges() == 9);
-    REQUIRE(clf.getNotes().size() == 0);
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(scores.at(i)));
-    // Get the first 4 lines of X_test to do predict_proba
-    auto X_reduced = raw.X_test.slice(1, 0, 4);
-    auto proba = clf.predict_proba(X_reduced);
-    for (int p = 0; p < 3; ++p) {
-      REQUIRE(proba[0][p].item<double>() == Catch::Approx(probs_expected.at(i).at(p)));
-    }
-  }
-}
-
-TEST_CASE("mfeat-factors dataset test", "[XSPODE]") {
-  auto raw = RawDatasets("mfeat-factors", true);
-  auto scores = std::vector<float>({0.9825, 0.9775, 0.9775, 0.99});
-  for (int i = 0; i < 4; ++i) {
-    auto clf = bayesnet::XSpode(i);
-    clf.fit(raw.Xt, raw.yt, raw.features, raw.className, raw.states, raw.smoothing);
-    REQUIRE(clf.getNumberOfNodes() == 217);
-    REQUIRE(clf.getNumberOfEdges() == 433);
-    REQUIRE(clf.getNotes().size() == 0);
-    REQUIRE(clf.getNumberOfStates() == 652320);
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(scores.at(i)));
-  }
-}
-TEST_CASE("Laplace predict", "[XSPODE]") {
-  auto raw = RawDatasets("iris", true);
-  auto scores = std::vector<float>({0.966666639, 1.0f, 0.933333337, 1.0f});
-  for (int i = 0; i < 4; ++i) {
-    auto clf = bayesnet::XSpode(0);
-    clf.setHyperparameters({ {"parent", i} });
-    clf.fit(raw.Xt, raw.yt, raw.features, raw.className, raw.states, bayesnet::Smoothing_t::LAPLACE);
-    REQUIRE(clf.getNumberOfNodes() == 5);
-    REQUIRE(clf.getNumberOfEdges() == 9);
-    REQUIRE(clf.getNotes().size() == 0);
-    REQUIRE(clf.getNumberOfStates() == 64);
-    REQUIRE(clf.getNFeatures() == 4);
-    REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(scores.at(i)));
-  }
-}
-TEST_CASE("Not fitted model predict", "[XSPODE]")
-{
-    auto raw = RawDatasets("iris", true);
-    auto clf = bayesnet::XSpode(0);
-    REQUIRE_THROWS_AS(clf.predict(std::vector<int>({1,2,3})), std::logic_error);
-}
-TEST_CASE("Test instance predict", "[XSPODE]")
-{
-    auto raw = RawDatasets("iris", true);
-    auto clf = bayesnet::XSpode(0);
-    clf.fit(raw.Xt, raw.yt, raw.features, raw.className, raw.states, bayesnet::Smoothing_t::ORIGINAL);
-    REQUIRE(clf.predict(std::vector<int>({1,2,3,4})) == 1);
-    REQUIRE(clf.score(raw.Xv, raw.yv) == Catch::Approx(0.973333359f));
-    // Cestnik is not defined in the classifier so it should imply alpha_ = 0
-    clf.fit(raw.Xt, raw.yt, raw.features, raw.className, raw.states, bayesnet::Smoothing_t::CESTNIK);
-    REQUIRE(clf.predict(std::vector<int>({1,2,3,4})) == 0);
-    REQUIRE(clf.score(raw.Xv, raw.yv) == Catch::Approx(0.973333359f));
-}
-TEST_CASE("Test to_string and fitx", "[XSPODE]")
-{
-  auto raw = RawDatasets("iris", true);
-  auto clf = bayesnet::XSpode(0);
-  auto weights = torch::full({raw.Xt.size(1)}, 1.0 / raw.Xt.size(1), torch::kFloat64);
-  clf.fitx(raw.Xt, raw.yt, weights, bayesnet::Smoothing_t::ORIGINAL);
-  REQUIRE(clf.getNumberOfNodes() == 5);
-  REQUIRE(clf.getNumberOfEdges() == 9);
-  REQUIRE(clf.getNotes().size() == 0);
-  REQUIRE(clf.getNumberOfStates() == 64);
-  REQUIRE(clf.getNFeatures() == 4);
-  REQUIRE(clf.score(raw.X_test, raw.y_test) == Catch::Approx(0.966666639f));
-  REQUIRE(clf.to_string().size() == 1966);
-  REQUIRE(clf.graph("Not yet implemented") == std::vector<std::string>({"Not yet implemented"}));
-}

tests/TestXSPnDE.cc

@@ -1,141 +0,0 @@
-// ***************************************************************
-// SPDX-FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
-// SPDX-FileType: SOURCE
-// SPDX-License-Identifier: MIT
-// ***************************************************************
-
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_approx.hpp>
-#include <catch2/matchers/catch_matchers.hpp>
-#include "bayesnet/classifiers/XSP2DE.h"  // <-- your new 2-superparent classifier
-#include "TestUtils.h"                   // for RawDatasets, etc.
-
-// Helper function to handle each (sp1, sp2) pair in tests
-static void check_spnde_pair(
-    int sp1, 
-    int sp2, 
-    RawDatasets &raw, 
-    bool fitVector, 
-    bool fitTensor)
-{
-  // Create our classifier
-  bayesnet::XSp2de clf(sp1, sp2);
-
-  // Option A: fit with vector-based data
-  if (fitVector) {
-    clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-  }
-  // Option B: fit with the whole dataset in torch::Tensor form
-  else if (fitTensor) {
-    // your “tensor” version of fit
-    clf.fit(raw.Xt, raw.yt, raw.features, raw.className, raw.states, raw.smoothing);
-  }
-  // Option C: or you might do the “dataset” version:
-  else {
-    clf.fit(raw.dataset, raw.features, raw.className, raw.states, raw.smoothing);
-  }
-
-  // Basic checks
-  REQUIRE(clf.getNumberOfNodes() == 5);  // for iris: 4 features + 1 class
-  REQUIRE(clf.getNumberOfEdges() == 8);
-  REQUIRE(clf.getNotes().size() == 0);
-
-  // Evaluate on test set
-  float sc = clf.score(raw.X_test, raw.y_test);
-  REQUIRE(sc >= 0.93f);  
-}
-
-// ------------------------------------------------------------
-// 1) Fit vector test
-// ------------------------------------------------------------
-TEST_CASE("fit vector test (XSP2DE)", "[XSP2DE]") {
-  auto raw = RawDatasets("iris", true);
-
-  std::vector<std::pair<int,int>> parentPairs = {
-    {0,1}, {2,3}
-  };
-  for (auto &p : parentPairs) {
-    check_spnde_pair(p.first, p.second, raw, /*fitVector=*/true, /*fitTensor=*/false);
-  }
-}
-
-// ------------------------------------------------------------
-// 2) Fit dataset test
-// ------------------------------------------------------------
-TEST_CASE("fit dataset test (XSP2DE)", "[XSP2DE]") {
-  auto raw = RawDatasets("iris", true);
-
-  // Again test multiple pairs:
-  std::vector<std::pair<int,int>> parentPairs = {
-    {0,2}, {1,3}
-  };
-  for (auto &p : parentPairs) {
-    check_spnde_pair(p.first, p.second, raw, /*fitVector=*/false, /*fitTensor=*/false);
-  }
-}
-
-// ------------------------------------------------------------
-// 3) Tensors dataset predict & predict_proba
-// ------------------------------------------------------------
-TEST_CASE("tensors dataset predict & predict_proba (XSP2DE)", "[XSP2DE]") {
-  auto raw = RawDatasets("iris", true);
-
-  std::vector<std::pair<int,int>> parentPairs = {
-    {0,3}, {1,2}
-  };
-
-  for (auto &p : parentPairs) {
-    bayesnet::XSp2de clf(p.first, p.second);
-    clf.fit(raw.Xt, raw.yt, raw.features, raw.className, raw.states, raw.smoothing);
-
-    REQUIRE(clf.getNumberOfNodes() == 5);
-    REQUIRE(clf.getNumberOfEdges() == 8);
-    REQUIRE(clf.getNotes().size() == 0);
-
-    // Check the score
-    float sc = clf.score(raw.X_test, raw.y_test);
-    REQUIRE(sc >= 0.90f);
-
-    auto X_reduced = raw.X_test.slice(1, 0, 3); 
-    auto proba = clf.predict_proba(X_reduced);
-  }
-}
-TEST_CASE("Check hyperparameters", "[XSP2DE]")
-{
-  auto raw = RawDatasets("iris", true);
-
-  auto clf = bayesnet::XSp2de(0, 1);
-  clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-  auto clf2 = bayesnet::XSp2de(2, 3);
-  clf2.setHyperparameters({{"parent1", 0}, {"parent2", 1}});
-  clf2.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, raw.smoothing);
-  REQUIRE(clf.to_string() == clf2.to_string());
-}
-TEST_CASE("Check different smoothing", "[XSP2DE]")
-{
-  auto raw = RawDatasets("iris", true);
-
-  auto clf = bayesnet::XSp2de(0, 1);
-  clf.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, bayesnet::Smoothing_t::ORIGINAL);
-  auto clf2 = bayesnet::XSp2de(0, 1);
-  clf2.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, bayesnet::Smoothing_t::LAPLACE);
-  auto clf3 = bayesnet::XSp2de(0, 1);
-  clf3.fit(raw.Xv, raw.yv, raw.features, raw.className, raw.states, bayesnet::Smoothing_t::NONE);
-  auto score = clf.score(raw.X_test, raw.y_test);
-  auto score2 = clf2.score(raw.X_test, raw.y_test);
-  auto score3 = clf3.score(raw.X_test, raw.y_test);
-  REQUIRE(score == Catch::Approx(1.0).epsilon(raw.epsilon));
-  REQUIRE(score2 == Catch::Approx(0.7333333).epsilon(raw.epsilon));
-  REQUIRE(score3 == Catch::Approx(0.966667).epsilon(raw.epsilon));
-}
-TEST_CASE("Check rest", "[XSP2DE]")
-{
-  auto raw = RawDatasets("iris", true);
-  auto clf = bayesnet::XSp2de(0, 1);
-  REQUIRE_THROWS_AS(clf.predict_proba(std::vector<int>({1,2,3,4})), std::logic_error);
-  clf.fitx(raw.Xt, raw.yt, raw.weights, bayesnet::Smoothing_t::ORIGINAL);
-  REQUIRE(clf.getNFeatures() == 4);
-  REQUIRE(clf.score(raw.Xv, raw.yv) == Catch::Approx(0.973333359f).epsilon(raw.epsilon));
-  REQUIRE(clf.predict({1,2,3,4}) == 1);
-
-}