rmontanana/Folding
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 4 Wiki Activity

Include version number in header file

Browse Source
This commit is contained in:
Ricardo Montañana Gómez
2024-04-03 13:55:02 +02:00
parent 24e37fcbf1
commit 582003a0ad
5 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@@ -37,5 +37,4 @@ build_*/**
cmake-build*/** cmake-build*/**
.idea .idea
puml/** puml/**
.vscode/settings.json .vscode/settings.json
config_folding.h

2
config/CMakeLists.txt
View File

@@ -1,4 +1,4 @@
configure_file( configure_file(
"config.h.in" "config.h.in"
"${Folding_SOURCE_DIR}/config_folding.h" ESCAPE_QUOTES "${CMAKE_BINARY_DIR}/configured_files/include/config.h" ESCAPE_QUOTES
) )

4
folding.hpp
View File

@@ -4,8 +4,8 @@
#include <map> #include <map>
#include <random> #include <random>
#include <vector> #include <vector>
#include "config_folding.h"
namespace folding { namespace folding {
const std::string FOLDING_VERSION = "1.0.1";
class Fold { class Fold {
protected: protected:
int k; int k;
@@ -21,7 +21,7 @@ namespace folding {
} }
virtual std::pair<std::vector<int>, std::vector<int>> getFold(int nFold) = 0; virtual std::pair<std::vector<int>, std::vector<int>> getFold(int nFold) = 0;
virtual ~Fold() = default; virtual ~Fold() = default;
std::string version() { return { folding_project_version.begin(), folding_project_version.end() }; } std::string version() { return FOLDING_VERSION; }
int getNumberOfFolds() { return k; } int getNumberOfFolds() { return k; }
}; };
class KFold : public Fold { class KFold : public Fold {

1
tests/CMakeLists.txt
View File

@@ -3,6 +3,7 @@ if(ENABLE_TESTING)
${Folding_SOURCE_DIR} ${Folding_SOURCE_DIR}
${Folding_SOURCE_DIR}/lib/Files ${Folding_SOURCE_DIR}/lib/Files
${Folding_SOURCE_DIR}/lib/mdlp ${Folding_SOURCE_DIR}/lib/mdlp
${CMAKE_BINARY_DIR}/configured_files/include
) )
set(TEST_FOLDING "unit_tests_folding") set(TEST_FOLDING "unit_tests_folding")
add_executable(${TEST_FOLDING} TestFolding.cc TestUtils.cc) add_executable(${TEST_FOLDING} TestFolding.cc TestUtils.cc)

2
tests/TestUtils.h
View File

@@ -8,7 +8,7 @@
#include <tuple> #include <tuple>
#include "ArffFiles.h" #include "ArffFiles.h"
#include "CPPFImdlp.h" #include "CPPFImdlp.h"
#include "config_folding.h" #include "config.h"
bool file_exists(const std::string& name); bool file_exists(const std::string& name);
std::pair<vector<mdlp::labels_t>, map<std::string, int>> discretize(std::vector<mdlp::samples_t>& X, mdlp::labels_t& y, std::vector<string> features); std::pair<vector<mdlp::labels_t>, map<std::string, int>> discretize(std::vector<mdlp::samples_t>& X, mdlp::labels_t& y, std::vector<string> features);