Begin mdlp reintegration

CMakeLists.txt

@@ -65,12 +65,13 @@ endif (ENABLE_CLANG_TIDY)
 # External libraries - dependencies of BayesNet
 # ---------------------------------------------
 
-find_library(FImdlp NAMES libfimdlp.a REQUIRED)
-find_path(FImdlp_INCLUDE_DIRS REQUIRED NAMES fimdlp)
+# find_library(FImdlp NAMES libfimdlp.a REQUIRED)
+# find_path(FImdlp_INCLUDE_DIRS REQUIRED NAMES fimdlp)
 
-message(STATUS "FImdlp=${FImdlp}")
-message(STATUS "FImdlp_INCLUDE_DIRS=${FImdlp_INCLUDE_DIRS}")
+# message(STATUS "FImdlp=${FImdlp}")
+# message(STATUS "FImdlp_INCLUDE_DIRS=${FImdlp_INCLUDE_DIRS}")
 
+add_git_submodule("lib/mdlp")
 
 # include(FetchContent)
 add_git_submodule("lib/json")

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 & depnendency of the project (diagrams/BayesNet.png)
+diagrams: ## Create an UML class diagram & dependency 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)

bayesnet/CMakeLists.txt

@@ -10,4 +10,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/Proposal.h

@@ -9,7 +9,7 @@
 #include <string>
 #include <map>
 #include <torch/torch.h>
-#include <fimdlp/CPPFImdlp.h>
+#include <CPPFImdlp.h>
 #include "bayesnet/network/Network.h"
 #include "Classifier.h"
 

sample/sample.cc

@@ -5,7 +5,7 @@
 // ***************************************************************
 
 #include <ArffFiles.hpp>
-#include <fimdlp/CPPFImdlp.h>
+#include <CPPFImdlp.h>
 #include <bayesnet/ensembles/BoostAODE.h>
 
 std::vector<mdlp::labels_t> discretizeDataset(std::vector<mdlp::samples_t>& X, mdlp::labels_t& y)

tests/TestModulesVersions.cc

@@ -7,7 +7,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
 #include <string>
-#include <fimdlp/CPPFImdlp.h>
+#include <CPPFImdlp.h>
 #include <folding.hpp>
 #include <nlohmann/json.hpp>
 #define TO_STR2(x) #x

tests/TestUtils.h

@@ -12,7 +12,7 @@
 #include <map>
 #include <tuple>
 #include <ArffFiles.hpp>
-#include <fimdlp/CPPFImdlp.h>
+#include <CPPFImdlp.h>
 #include <folding.hpp>
 #include <bayesnet/network/Network.h>