rmontanana/BayesNet
1
0
Fork 0
Code Issues 2 Pull Requests 1 Actions Packages Projects Releases 6 Wiki Activity

Begin mdlp reintegration

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2024-11-22 11:44:42 +01:00
parent f0f3d9ad6e
commit e12bf7c16a
8 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

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

2
Makefile
View File

@@ -43,7 +43,7 @@ setup: ## Install dependencies for tests and coverage
fi fi
@echo "* You should install plantuml & graphviz for the diagrams" @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 $(plantuml) || (echo ">>> Please install plantuml"; exit 1)
@which $(dot) || (echo ">>> Please install graphviz"; exit 1) @which $(dot) || (echo ">>> Please install graphviz"; exit 1)
@which $(clang-uml) || (echo ">>> Please install clang-uml"; exit 1) @which $(clang-uml) || (echo ">>> Please install clang-uml"; exit 1)

2
bayesnet/CMakeLists.txt
View File

@@ -10,4 +10,4 @@ include_directories(
file(GLOB_RECURSE Sources "*.cc") file(GLOB_RECURSE Sources "*.cc")
add_library(BayesNet ${Sources}) add_library(BayesNet ${Sources})
target_link_libraries(BayesNet ${FImdlp} "${TORCH_LIBRARIES}") target_link_libraries(BayesNet mdlp "${TORCH_LIBRARIES}")

2
bayesnet/classifiers/Proposal.h
View File

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

1
lib/mdlp Submodule

Submodule lib/mdlp added at 7d62d6af4a

2
sample/sample.cc
View File

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

2
tests/TestModulesVersions.cc
View File

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

2
tests/TestUtils.h
View File

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