Refactor library structure

2024-03-08 22:20:38 +01:00
parent 5bec9d4d2f
commit 7534cba7e6
23 changed files with 22 additions and 152 deletions
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -1,130 +0,0 @@
-{
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "sample",
-            "program": "${workspaceFolder}/build_debug/sample/BayesNetSample",
-            "args": [
-                "-d",
-                "iris",
-                "-m",
-                "TANLd",
-                "-s",
-                "271",
-                "-p",
-                "/Users/rmontanana/Code/discretizbench/datasets/",
-            ],
-            //"cwd": "${workspaceFolder}/build/sample/",
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "experimentPy",
-            "program": "${workspaceFolder}/build_debug/src/Platform/b_main",
-            "args": [
-                "-m",
-                "STree",
-                "--stratified",
-                "-d",
-                "iris",
-                //"--discretize"
-                // "--hyperparameters",
-                // "{\"repeatSparent\": true, \"maxModels\": 12}"
-            ],
-            "cwd": "${workspaceFolder}/../discretizbench",
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "gridsearch",
-            "program": "${workspaceFolder}/build_debug/src/Platform/b_grid",
-            "args": [
-                "-m",
-                "KDB",
-                "--discretize",
-                "--continue",
-                "glass",
-                "--only",
-                "--compute"
-            ],
-            "cwd": "${workspaceFolder}/../discretizbench",
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "experimentBayes",
-            "program": "${workspaceFolder}/build_debug/src/Platform/b_main",
-            "args": [
-                "-m",
-                "TAN",
-                "--stratified",
-                "--discretize",
-                "-d",
-                "iris",
-                "--hyperparameters",
-                "{\"repeatSparent\": true, \"maxModels\": 12}"
-            ],
-            "cwd": "/home/rmontanana/Code/discretizbench",
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "best",
-            "program": "${workspaceFolder}/build_debug/src/Platform/b_best",
-            "args": [
-                "-m",
-                "BoostAODE",
-                "-s",
-                "accuracy",
-                "--build",
-            ],
-            "cwd": "${workspaceFolder}/../discretizbench",
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "manage",
-            "program": "${workspaceFolder}/build_debug/src/Platform/b_manage",
-            "args": [
-                "-n",
-                "20"
-            ],
-            "cwd": "${workspaceFolder}/../discretizbench",
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "list",
-            "program": "${workspaceFolder}/build_debug/src/Platform/b_list",
-            "args": [],
-            //"cwd": "/Users/rmontanana/Code/discretizbench",
-            "cwd": "${workspaceFolder}/../discretizbench",
-        },
-        {
-            "type": "lldb",
-            "request": "launch",
-            "name": "test",
-            "program": "${workspaceFolder}/build_debug/tests/unit_tests",
-            "args": [
-                "-c=\"Metrics Test\"",
-                // "-s",
-            ],
-            "cwd": "${workspaceFolder}/build/tests",
-        },
-        {
-            "name": "Build & debug active file",
-            "type": "cppdbg",
-            "request": "launch",
-            "program": "${workspaceFolder}/build_debug/bayesnet",
-            "args": [],
-            "stopAtEntry": false,
-            "cwd": "${workspaceFolder}",
-            "environment": [],
-            "externalConsole": false,
-            "MIMode": "lldb",
-            "preLaunchTask": "CMake: build"
-        }
-    ]
-}
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -69,7 +69,7 @@ find_library(BayesNet NAMES libBayesNet BayesNet)

 # Subdirectories
 # --------------
-add_subdirectory(src)
+add_subdirectory(pyclfs)

 # Testing
 # -------
@@ -88,5 +88,5 @@ install(TARGETS PyClassifiers
        ARCHIVE DESTINATION lib
        LIBRARY DESTINATION lib
        CONFIGURATIONS Release)
-install(DIRECTORY src/ DESTINATION include/pyclassifiers FILES_MATCHING CONFIGURATIONS Release PATTERN "*.h" PATTERN "*.hpp")
+install(DIRECTORY pyclfs/ DESTINATION include/pyclassifiers FILES_MATCHING CONFIGURATIONS Release PATTERN "*.h" PATTERN "*.hpp")
 install(FILES /usr/local/include/bayesnet/config.h DESTINATION include/pyclassifiers CONFIGURATIONS Release)
--- a/gcovr.cfg
+++ b/gcovr.cfg
@@ -1,4 +1,4 @@
-filter = src/
+filter = pyclfs/
 exclude-directories = build_debug/lib/
 print-summary = yes
 sort-percentage = yes
--- a/pyclfs/CMakeLists.txt
+++ b/pyclfs/CMakeLists.txt
@@ -2,7 +2,7 @@ include_directories(
    ${Python3_INCLUDE_DIRS}
    ${TORCH_INCLUDE_DIRS}
    ${PyClassifiers_SOURCE_DIR}/lib/json/include
-    /usr/local/include/bayesnet
+    /usr/local/include
 )
 add_library(PyClassifiers ODTE.cc STree.cc SVC.cc RandomForest.cc XGBoost.cc PyClassifier.cc PyWrap.cc)
 target_link_libraries(PyClassifiers ${Python3_LIBRARIES} "${TORCH_LIBRARIES}" ${LIBTORCH_PYTHON} Boost::boost Boost::python Boost::numpy)
--- a/pyclfs/ODTE.cc
+++ b/pyclfs/ODTE.cc
--- a/pyclfs/ODTE.h
+++ b/pyclfs/ODTE.h
--- a/pyclfs/PyClassifier.cc
+++ b/pyclfs/PyClassifier.cc
--- a/pyclfs/PyClassifier.h
+++ b/pyclfs/PyClassifier.h
@@ -1,15 +1,15 @@
 #ifndef PYCLASSIFIER_H
 #define PYCLASSIFIER_H
-#include "boost/python/detail/wrap_python.hpp"
-#include <boost/python/numpy.hpp>
-#include <nlohmann/json.hpp>
 #include <string>
 #include <map>
 #include <vector>
 #include <utility>
+#include "boost/python/detail/wrap_python.hpp"
+#include <boost/python/numpy.hpp>
 #include <torch/torch.h>
+#include <nlohmann/json.hpp>
+#include "bayesnet/classifiers/Classifier.h"
 #include "PyWrap.h"
-#include "classifiers/Classifier.h"
 #include "TypeId.h"

 namespace pywrap {
--- a/pyclfs/PyHelper.hpp
+++ b/pyclfs/PyHelper.hpp
--- a/pyclfs/PyWrap.cc
+++ b/pyclfs/PyWrap.cc
--- a/pyclfs/PyWrap.h
+++ b/pyclfs/PyWrap.h
@@ -1,11 +1,11 @@
 #ifndef PYWRAP_H
 #define PYWRAP_H
-#include "boost/python/detail/wrap_python.hpp"
 #include <string>
 #include <map>
 #include <tuple>
 #include <mutex>
 #include <nlohmann/json.hpp>
+#include "boost/python/detail/wrap_python.hpp"
 #include "PyHelper.hpp"
 #include "TypeId.h"
 #pragma once
--- a/pyclfs/RandomForest.cc
+++ b/pyclfs/RandomForest.cc
--- a/pyclfs/RandomForest.h
+++ b/pyclfs/RandomForest.h
--- a/pyclfs/STree.cc
+++ b/pyclfs/STree.cc
--- a/pyclfs/STree.h
+++ b/pyclfs/STree.h
--- a/pyclfs/SVC.cc
+++ b/pyclfs/SVC.cc
--- a/pyclfs/SVC.h
+++ b/pyclfs/SVC.h
--- a/pyclfs/TypeId.h
+++ b/pyclfs/TypeId.h
--- a/pyclfs/XGBoost.cc
+++ b/pyclfs/XGBoost.cc
--- a/pyclfs/XGBoost.h
+++ b/pyclfs/XGBoost.h
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -1,15 +1,15 @@
 if(ENABLE_TESTING)
    set(TEST_PYCLASSIFIERS "unit_tests_pyclassifiers")
    include_directories(
-        ${PyClassifiers_SOURCE_DIR}/src/
+        ${PyClassifiers_SOURCE_DIR}
        ${PyClassifiers_SOURCE_DIR}/lib/Files
        ${PyClassifiers_SOURCE_DIR}/lib/mdlp
        ${PyClassifiers_SOURCE_DIR}/lib/json/include
        ${Python3_INCLUDE_DIRS}
        ${TORCH_INCLUDE_DIRS}
-        /usr/local/include/bayesnet
+        /usr/local/include
    )
-    file(GLOB_RECURSE PyClassifiers_SOURCES "${PyClassifiers_SOURCE_DIR}/src/*.cc")
+    file(GLOB_RECURSE PyClassifiers_SOURCES "${PyClassifiers_SOURCE_DIR}/pyclfs/*.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)
--- a/tests/TestPythonClassifiers.cc
+++ b/tests/TestPythonClassifiers.cc
@@ -1,17 +1,17 @@
 #define CATCH_CONFIG_MAIN  // This tells Catch to provide a main() - only do
-#include <catch2/catch_test_macros.hpp>
-#include <catch2/catch_approx.hpp>
-#include <catch2/generators/catch_generators.hpp>
 #include <vector>
 #include <map>
 #include <string>
-#include "STree.h"
-#include "SVC.h"
-#include "RandomForest.h"
-#include "XGBoost.h"
-#include "ODTE.h"
-#include "TestUtils.h"
+#include <catch2/catch_test_macros.hpp>
+#include <catch2/catch_approx.hpp>
+#include <catch2/generators/catch_generators.hpp>
 #include <nlohmann/json.hpp>
+#include "pyclfs/STree.h"
+#include "pyclfs/SVC.h"
+#include "pyclfs/RandomForest.h"
+#include "pyclfs/XGBoost.h"
+#include "pyclfs/ODTE.h"
+#include "TestUtils.h"

 const std::string ACTUAL_VERSION = "1.0.4";

--- a/tests/TestUtils.cc
+++ b/tests/TestUtils.cc
@@ -1,5 +1,5 @@
 #include "TestUtils.h"
-#include "config.h"
+#include "bayesnet/config.h"

 class Paths {
 public: