diff --git a/config/config.h.in b/config/config.h.in index ed279bc..26937cf 100644 --- a/config/config.h.in +++ b/config/config.h.in @@ -7,9 +7,8 @@ #define PROJECT_VERSION_MINOR @PROJECT_VERSION_MINOR @ #define PROJECT_VERSION_PATCH @PROJECT_VERSION_PATCH @ -static constexpr std::string_view project_name = "@PROJECT_NAME@"; -static constexpr std::string_view project_version = "@PROJECT_VERSION@"; -static constexpr std::string_view project_description = "@PROJECT_DESCRIPTION@"; -static constexpr std::string_view git_sha = "@GIT_SHA@"; -static constexpr std::string_view data_path = "@Folding_SOURCE_DIR@/tests/data/"; -static constexpr std::string_view csv_path = "@Folding_SOURCE_DIR@/tests/csv/"; +static constexpr std::string_view folding_project_name = "@PROJECT_NAME@"; +static constexpr std::string_view folding_project_version = "@PROJECT_VERSION@"; +static constexpr std::string_view folding_project_description = "@PROJECT_DESCRIPTION@"; +static constexpr std::string_view folding_data_path = "@Folding_SOURCE_DIR@/tests/data/"; +static constexpr std::string_view folding_csv_path = "@Folding_SOURCE_DIR@/tests/csv/"; diff --git a/folding.hpp b/folding.hpp index d8f38f4..9035ccd 100644 --- a/folding.hpp +++ b/folding.hpp @@ -21,7 +21,7 @@ namespace folding { } virtual std::pair, std::vector> getFold(int nFold) = 0; virtual ~Fold() = default; - std::string version() { return { project_version.begin(), project_version.end() }; } + std::string version() { return { folding_project_version.begin(), folding_project_version.end() }; } int getNumberOfFolds() { return k; } }; class KFold : public Fold { diff --git a/tests/TestFolding.cc b/tests/TestFolding.cc index 7d61724..c36eb80 100644 --- a/tests/TestFolding.cc +++ b/tests/TestFolding.cc @@ -6,7 +6,7 @@ TEST_CASE("Version Test", "[Folding]") { - std::string actual_version = { project_version.begin(), project_version.end() }; + std::string actual_version = { folding_project_version.begin(), folding_project_version.end() }; auto data = std::vector(100); folding::StratifiedKFold stratified_kfold(5, data, 17); REQUIRE(stratified_kfold.version() == actual_version); diff --git a/tests/TestUtils.h b/tests/TestUtils.h index a012172..11467a4 100644 --- a/tests/TestUtils.h +++ b/tests/TestUtils.h @@ -45,11 +45,11 @@ class Paths { public: static std::string datasets() { - return { data_path.begin(), data_path.end() }; + return { folding_data_path.begin(), folding_data_path.end() }; } static std::string csv() { - return { csv_path.begin(), csv_path.end() }; + return { folding_csv_path.begin(), folding_csv_path.end() }; } }; class CSVFiles {