rmontanana/mdlp
1
1
Fork 0
mirror of https://github.com/rmontanana/mdlp.git synced 2025-08-15 07:25:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change library name to fimdlp

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2024-07-22 11:26:16 +02:00
parent 2db60e007d
commit 210af46a88
6 changed files with 22 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
CMakeLists.txt
View File

@@ -1,10 +1,10 @@
cmake_minimum_required(VERSION 3.20) cmake_minimum_required(VERSION 3.20)
project(mdlp) project(fimdlp)
set(CMAKE_CXX_STANDARD 17) set(CMAKE_CXX_STANDARD 17)
cmake_policy(SET CMP0135 NEW) 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_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -fno-elide-constructors")
set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3") set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3")
@@ -27,8 +27,8 @@ add_subdirectory(sample)
include_directories( include_directories(
${TORCH_INCLUDE_DIRS} ${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) add_library(fimdlp src/CPPFImdlp.cpp src/Metrics.cpp src/BinDisc.cpp src/Discretizer.cpp)
target_link_libraries(mdlp "${TORCH_LIBRARIES}") target_link_libraries(fimdlp "${TORCH_LIBRARIES}")

6
sample/CMakeLists.txt
View File

@@ -3,9 +3,9 @@ set(CMAKE_CXX_STANDARD 17)
set(CMAKE_BUILD_TYPE Debug) set(CMAKE_BUILD_TYPE Debug)
include_directories( include_directories(
${mdlp_SOURCE_DIR}/src ${fimdlp_SOURCE_DIR}/src
${mdlp_SOURCE_DIR}/tests/lib/Files ${fimdlp_SOURCE_DIR}/tests/lib/Files
) )
add_executable(sample sample.cpp ) add_executable(sample sample.cpp )
target_link_libraries(sample mdlp "${TORCH_LIBRARIES}") target_link_libraries(sample fimdlp "${TORCH_LIBRARIES}")

2
sonar-project.properties
View File

@@ -3,7 +3,7 @@ sonar.organization=rmontanana
# This is the name and version displayed in the SonarCloud UI. # This is the name and version displayed in the SonarCloud UI.
sonar.projectName=mdlp sonar.projectName=mdlp
sonar.projectVersion=2.0.0 sonar.projectVersion=2.0.1
# sonar.test.exclusions=tests/** # sonar.test.exclusions=tests/**
# sonar.tests=tests/ # sonar.tests=tests/
# sonar.coverage.exclusions=tests/**,sample/** # sonar.coverage.exclusions=tests/**,sample/**

2
src/Discretizer.h
View File

@@ -29,7 +29,7 @@ namespace mdlp {
void fit_t(const torch::Tensor& X_, const torch::Tensor& y_); void fit_t(const torch::Tensor& X_, const torch::Tensor& y_);
torch::Tensor transform_t(const torch::Tensor& X_); torch::Tensor transform_t(const torch::Tensor& X_);
torch::Tensor fit_transform_t(const torch::Tensor& X_, const torch::Tensor& y_); 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: protected:
labels_t discretizedData = labels_t(); 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 cutPoints_t cutPoints; // At least two cutpoints must be provided, the first and the last will be ignored in transform

6
src/typesFImdlp.h
View File

@@ -1,3 +1,9 @@
// ****************************************************************
// SPDX - FileCopyrightText: Copyright 2024 Ricardo Montañana Gómez
// SPDX - FileType: SOURCE
// SPDX - License - Identifier: MIT
// ****************************************************************
#ifndef TYPES_H #ifndef TYPES_H
#define TYPES_H #define TYPES_H

12
tests/CMakeLists.txt
View File

@@ -10,28 +10,28 @@ FetchContent_MakeAvailable(googletest)
include_directories( include_directories(
${TORCH_INCLUDE_DIRS} ${TORCH_INCLUDE_DIRS}
${mdlp_SOURCE_DIR}/src ${fimdlp_SOURCE_DIR}/src
${mdlp_SOURCE_DIR}/tests/lib/Files ${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_link_libraries(Metrics_unittest GTest::gtest_main)
target_compile_options(Metrics_unittest PRIVATE --coverage) target_compile_options(Metrics_unittest PRIVATE --coverage)
target_link_options(Metrics_unittest PRIVATE --coverage) target_link_options(Metrics_unittest PRIVATE --coverage)
add_executable(FImdlp_unittest FImdlp_unittest.cpp 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_link_libraries(FImdlp_unittest GTest::gtest_main "${TORCH_LIBRARIES}")
target_compile_options(FImdlp_unittest PRIVATE --coverage) target_compile_options(FImdlp_unittest PRIVATE --coverage)
target_link_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_link_libraries(BinDisc_unittest GTest::gtest_main "${TORCH_LIBRARIES}")
target_compile_options(BinDisc_unittest PRIVATE --coverage) target_compile_options(BinDisc_unittest PRIVATE --coverage)
target_link_options(BinDisc_unittest PRIVATE --coverage) target_link_options(BinDisc_unittest PRIVATE --coverage)
add_executable(Discretizer_unittest Discretizer_unittest.cpp 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_link_libraries(Discretizer_unittest GTest::gtest_main "${TORCH_LIBRARIES}")
target_compile_options(Discretizer_unittest PRIVATE --coverage) target_compile_options(Discretizer_unittest PRIVATE --coverage)
target_link_options(Discretizer_unittest PRIVATE --coverage) target_link_options(Discretizer_unittest PRIVATE --coverage)