diff --git a/CMakeLists.txt b/CMakeLists.txt index 5559336..43ec5f5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,10 +1,10 @@ cmake_minimum_required(VERSION 3.20) -project(mdlp) +project(fimdlp) set(CMAKE_CXX_STANDARD 17) cmake_policy(SET CMP0135 NEW) -find_package(Torch REQUIRED) +find_package(Torch CONFIG REQUIRED) set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-elide-constructors") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") @@ -27,8 +27,8 @@ add_subdirectory(sample) include_directories( ${TORCH_INCLUDE_DIRS} - ${mdlp_SOURCE_DIR}/src + ${fimdlp_SOURCE_DIR}/src ) -add_library(mdlp src/CPPFImdlp.cpp src/Metrics.cpp src/BinDisc.cpp src/Discretizer.cpp) -target_link_libraries(mdlp "${TORCH_LIBRARIES}") \ No newline at end of file +add_library(fimdlp src/CPPFImdlp.cpp src/Metrics.cpp src/BinDisc.cpp src/Discretizer.cpp) +target_link_libraries(fimdlp "${TORCH_LIBRARIES}") \ No newline at end of file diff --git a/sample/CMakeLists.txt b/sample/CMakeLists.txt index 7eb8efb..13e4798 100644 --- a/sample/CMakeLists.txt +++ b/sample/CMakeLists.txt @@ -3,9 +3,9 @@ set(CMAKE_CXX_STANDARD 17) set(CMAKE_BUILD_TYPE Debug) include_directories( - ${mdlp_SOURCE_DIR}/src - ${mdlp_SOURCE_DIR}/tests/lib/Files + ${fimdlp_SOURCE_DIR}/src + ${fimdlp_SOURCE_DIR}/tests/lib/Files ) add_executable(sample sample.cpp ) -target_link_libraries(sample mdlp "${TORCH_LIBRARIES}") +target_link_libraries(sample fimdlp "${TORCH_LIBRARIES}") diff --git a/sonar-project.properties b/sonar-project.properties index 7bdc121..809a45a 100644 --- a/sonar-project.properties +++ b/sonar-project.properties @@ -3,7 +3,7 @@ sonar.organization=rmontanana # This is the name and version displayed in the SonarCloud UI. sonar.projectName=mdlp -sonar.projectVersion=2.0.0 +sonar.projectVersion=2.0.1 # sonar.test.exclusions=tests/** # sonar.tests=tests/ # sonar.coverage.exclusions=tests/**,sample/** diff --git a/src/Discretizer.h b/src/Discretizer.h index 4720664..c46b541 100644 --- a/src/Discretizer.h +++ b/src/Discretizer.h @@ -29,7 +29,7 @@ namespace mdlp { void fit_t(const torch::Tensor& X_, const torch::Tensor& y_); torch::Tensor transform_t(const torch::Tensor& X_); torch::Tensor fit_transform_t(const torch::Tensor& X_, const torch::Tensor& y_); - static inline std::string version() { return "2.0.0"; }; + static inline std::string version() { return "2.0.1"; }; protected: labels_t discretizedData = labels_t(); cutPoints_t cutPoints; // At least two cutpoints must be provided, the first and the last will be ignored in transform diff --git a/src/typesFImdlp.h b/src/typesFImdlp.h index 0b5c5c7..dd3c532 100644 --- a/src/typesFImdlp.h +++ b/src/typesFImdlp.h @@ -1,3 +1,9 @@ +// **************************************************************** +// SPDX - FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez +// SPDX - FileType: SOURCE +// SPDX - License - Identifier: MIT +// **************************************************************** + #ifndef TYPES_H #define TYPES_H diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ac4723a..0d389f1 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -10,28 +10,28 @@ FetchContent_MakeAvailable(googletest) include_directories( ${TORCH_INCLUDE_DIRS} - ${mdlp_SOURCE_DIR}/src - ${mdlp_SOURCE_DIR}/tests/lib/Files + ${fimdlp_SOURCE_DIR}/src + ${fimdlp_SOURCE_DIR}/tests/lib/Files ) -add_executable(Metrics_unittest ${mdlp_SOURCE_DIR}/src/Metrics.cpp Metrics_unittest.cpp) +add_executable(Metrics_unittest ${fimdlp_SOURCE_DIR}/src/Metrics.cpp Metrics_unittest.cpp) target_link_libraries(Metrics_unittest GTest::gtest_main) target_compile_options(Metrics_unittest PRIVATE --coverage) target_link_options(Metrics_unittest PRIVATE --coverage) add_executable(FImdlp_unittest FImdlp_unittest.cpp -${mdlp_SOURCE_DIR}/src/CPPFImdlp.cpp ${mdlp_SOURCE_DIR}/src/Metrics.cpp ${mdlp_SOURCE_DIR}/src/Discretizer.cpp) +${fimdlp_SOURCE_DIR}/src/CPPFImdlp.cpp ${fimdlp_SOURCE_DIR}/src/Metrics.cpp ${fimdlp_SOURCE_DIR}/src/Discretizer.cpp) target_link_libraries(FImdlp_unittest GTest::gtest_main "${TORCH_LIBRARIES}") target_compile_options(FImdlp_unittest PRIVATE --coverage) target_link_options(FImdlp_unittest PRIVATE --coverage) -add_executable(BinDisc_unittest BinDisc_unittest.cpp ${mdlp_SOURCE_DIR}/src/BinDisc.cpp ${mdlp_SOURCE_DIR}/src/Discretizer.cpp) +add_executable(BinDisc_unittest BinDisc_unittest.cpp ${fimdlp_SOURCE_DIR}/src/BinDisc.cpp ${fimdlp_SOURCE_DIR}/src/Discretizer.cpp) target_link_libraries(BinDisc_unittest GTest::gtest_main "${TORCH_LIBRARIES}") target_compile_options(BinDisc_unittest PRIVATE --coverage) target_link_options(BinDisc_unittest PRIVATE --coverage) add_executable(Discretizer_unittest Discretizer_unittest.cpp -${mdlp_SOURCE_DIR}/src/BinDisc.cpp ${mdlp_SOURCE_DIR}/src/CPPFImdlp.cpp ${mdlp_SOURCE_DIR}/src/Metrics.cpp ${mdlp_SOURCE_DIR}/src/Discretizer.cpp ) +${fimdlp_SOURCE_DIR}/src/BinDisc.cpp ${fimdlp_SOURCE_DIR}/src/CPPFImdlp.cpp ${fimdlp_SOURCE_DIR}/src/Metrics.cpp ${fimdlp_SOURCE_DIR}/src/Discretizer.cpp ) target_link_libraries(Discretizer_unittest GTest::gtest_main "${TORCH_LIBRARIES}") target_compile_options(Discretizer_unittest PRIVATE --coverage) target_link_options(Discretizer_unittest PRIVATE --coverage)