Refactor library structure

tests/CMakeLists.txt

@@ -1,19 +1,14 @@
 if(ENABLE_TESTING)
     set(TEST_BAYESNET "unit_tests_bayesnet")
     include_directories(
-        ${BayesNet_SOURCE_DIR}/src
-        ${BayesNet_SOURCE_DIR}/src/feature_selection
-        ${BayesNet_SOURCE_DIR}/src/bayesian_network
-        ${BayesNet_SOURCE_DIR}/src/classifiers
-        ${BayesNet_SOURCE_DIR}/src/utils
-        ${BayesNet_SOURCE_DIR}/src/ensembles
         ${BayesNet_SOURCE_DIR}/lib/Files
         ${BayesNet_SOURCE_DIR}/lib/mdlp
         ${BayesNet_SOURCE_DIR}/lib/folding
         ${BayesNet_SOURCE_DIR}/lib/json/include
+        ${BayesNet_SOURCE_DIR}
         ${CMAKE_BINARY_DIR}/configured_files/include
     )
-    file(GLOB_RECURSE BayesNet_SOURCES "${BayesNet_SOURCE_DIR}/src/*.cc")
+    file(GLOB_RECURSE BayesNet_SOURCES "${BayesNet_SOURCE_DIR}/bayesnet/*.cc")
     set(TEST_SOURCES_BAYESNET TestBayesModels.cc TestBayesNetwork.cc TestBayesMetrics.cc TestUtils.cc ${BayesNet_SOURCES})
     add_executable(${TEST_BAYESNET} ${TEST_SOURCES_BAYESNET})
     target_link_libraries(${TEST_BAYESNET} PUBLIC "${TORCH_LIBRARIES}" ArffFiles mdlp Catch2::Catch2WithMain )

tests/TestBayesMetrics.cc

@@ -1,7 +1,7 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_approx.hpp>
 #include <catch2/generators/catch_generators.hpp>
-#include "BayesMetrics.h"
+#include "bayesnet/utils/BayesMetrics.h"
 #include "TestUtils.h"
 
 

tests/TestBayesModels.cc

@@ -2,15 +2,15 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/catch_approx.hpp>
 #include <catch2/generators/catch_generators.hpp>
-#include "KDB.h"
-#include "TAN.h"
-#include "SPODE.h"
-#include "AODE.h"
-#include "BoostAODE.h"
-#include "TANLd.h"
-#include "KDBLd.h"
-#include "SPODELd.h"
-#include "AODELd.h"
+#include "bayesnet/classifiers/KDB.h"
+#include "bayesnet/classifiers/TAN.h"
+#include "bayesnet/classifiers/SPODE.h"
+#include "bayesnet/classifiers/TANLd.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.4";

tests/TestBayesNetwork.cc

@@ -3,7 +3,7 @@
 #include <catch2/generators/catch_generators.hpp>
 #include <string>
 #include "TestUtils.h"
-#include "Network.h"
+#include "bayesnet/network/Network.h"
 
 void buildModel(bayesnet::Network& net, const std::vector<std::string>& features, const std::string& className)
 {

tests/TestUtils.cc

@@ -1,5 +1,5 @@
 #include "TestUtils.h"
-#include "config.h"
+#include "bayesnet/config.h"
 
 class Paths {
 public: