Remove bayesnet submodule

.gitmodules

@@ -2,3 +2,9 @@
 [submodule "lib/json"]
 	path = lib/json
 	url = https://github.com/nlohmann/json.git
+[submodule "lib/catch2"]
+	path = lib/catch2
+	url = https://github.com/catchorg/Catch2.git
+[submodule "lib/mdlp"]
+	path = lib/mdlp
+	url = https://github.com/rmontanana/mdlp

CMakeLists.txt

@@ -69,13 +69,15 @@ find_library(BayesNet NAMES libBayesNet BayesNet)
 
 # Subdirectories
 # --------------
-file(GLOB PyClassifiers_SOURCES CONFIGURE_DEPENDS ${PyClassifiers_SOURCE_DIR}/src/*.cc ${PyClassifiers_SOURCE_DIR}/src/*.hpp)
 add_subdirectory(src)
 
 # Testing
 # -------
 if (ENABLE_TESTING)
   MESSAGE("Testing enabled")
+  add_git_submodule(lib/catch2)
+  add_git_submodule(lib/mdlp)
+  add_subdirectory(lib/Files)
   include(CTest)
   add_subdirectory(tests)
 endif (ENABLE_TESTING)

src/CMakeLists.txt

@@ -1,9 +1,8 @@
 include_directories(
-    ${PyClassifiers_SOURCE_DIR}/lib/Files
-    ${PyClassifiers_SOURCE_DIR}/lib/json/include
     ${Python3_INCLUDE_DIRS}
     ${TORCH_INCLUDE_DIRS}
+    ${PyClassifiers_SOURCE_DIR}/lib/json/include
     /usr/local/include/bayesnet
 )
-add_library(PyClassifiers ${PyClassifiers_SOURCES})
+add_library(PyClassifiers ODTE.cc STree.cc SVC.cc RandomForest.cc XGBoost.cc PyClassifier.cc)
 target_link_libraries(PyClassifiers ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::boost Boost::python Boost::numpy)

tests/CMakeLists.txt

@@ -2,20 +2,15 @@ if(ENABLE_TESTING)
     set(TEST_PYCLASSIFIERS "unit_tests_pyclassifiers")
     include_directories(
         ${PyClassifiers_SOURCE_DIR}/src/
-        ${PyClassifiers_SOURCE_DIR}/lib/BayesNet/lib/json/include
-        ${PyClassifiers_SOURCE_DIR}/lib/BayesNet/lib/Files
-        ${PyClassifiers_SOURCE_DIR}/lib/BayesNet/lib/mdlp
-        ${PyClassifiers_SOURCE_DIR}/lib/BayesNet/src
-        ${PyClassifiers_SOURCE_DIR}/lib/BayesNet/src/classifiers
-        ${PyClassifiers_SOURCE_DIR}/lib/BayesNet/src/ensembles
-        ${PyClassifiers_SOURCE_DIR}/lib/BayesNet/src/bayesian_network
-        ${PyClassifiers_SOURCE_DIR}/lib/BayesNet/src/utils
+        ${PyClassifiers_SOURCE_DIR}/lib/Files
+        ${PyClassifiers_SOURCE_DIR}/lib/mdlp
+        ${PyClassifiers_SOURCE_DIR}/lib/json/include
         ${Python3_INCLUDE_DIRS}
         ${TORCH_INCLUDE_DIRS}
-        ${CMAKE_BINARY_DIR}/configured_files/include
+        /usr/local/include/bayesnet
     )
+    file(GLOB_RECURSE PyClassifiers_SOURCES "${PyClassifiers_SOURCE_DIR}/src/*.cc")
     set(TEST_SOURCES_PYCLASSIFIERS TestPythonClassifiers.cc TestUtils.cc ${PyClassifiers_SOURCES})
     add_executable(${TEST_PYCLASSIFIERS} ${TEST_SOURCES_PYCLASSIFIERS})
     target_link_libraries(${TEST_PYCLASSIFIERS} PUBLIC "${TORCH_LIBRARIES}" ${Python3_LIBRARIES} ${LIBTORCH_PYTHON} Boost::boost Boost::python Boost::numpy ArffFiles mdlp Catch2::Catch2WithMain)
-    add_test(NAME ${TEST_PYCLASSIFIERS} COMMAND ${TEST_PYCLASSIFIERS})
 endif(ENABLE_TESTING)