Skip to content

[7.1][ML] Make constants truly constant #411

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 22, 2019
Merged

[7.1][ML] Make constants truly constant #411

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions lib/api/CDataFrameAnalysisSpecification.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,16 +36,16 @@ TRunnerFactoryUPtrVec analysisFactories() {
}

// These must be consistent with Java names.
const char* ROWS{"rows"};
const char* COLS{"cols"};
const char* MEMORY_LIMIT{"memory_limit"};
const char* THREADS{"threads"};
const char* TEMPORARY_DIRECTORY{"temp_dir"};
const char* ANALYSIS{"analysis"};
const char* NAME{"name"};
const char* PARAMETERS{"parameters"};

const char* VALID_MEMBER_NAMES[]{ROWS, COLS, MEMORY_LIMIT, THREADS, ANALYSIS};
const char* const ROWS{"rows"};
const char* const COLS{"cols"};
const char* const MEMORY_LIMIT{"memory_limit"};
const char* const THREADS{"threads"};
const char* const TEMPORARY_DIRECTORY{"temp_dir"};
const char* const ANALYSIS{"analysis"};
const char* const NAME{"name"};
const char* const PARAMETERS{"parameters"};

const char* const VALID_MEMBER_NAMES[]{ROWS, COLS, MEMORY_LIMIT, THREADS, ANALYSIS};

template<typename MEMBER>
bool isValidMember(const MEMBER& member) {
Expand Down
16 changes: 8 additions & 8 deletions lib/api/CDataFrameOutliersRunner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,16 +27,16 @@ namespace ml {
namespace api {
namespace {
// Configuration
const char* NUMBER_NEIGHBOURS{"number_neighbours"};
const char* METHOD{"method"};
const char* LOF{"lof"};
const char* LDOF{"ldof"};
const char* DISTANCE_KTH_NN{"distance_kth_nn"};
const char* DISTANCE_KNN{"distance_knn"};
const char* VALID_MEMBER_NAMES[]{NUMBER_NEIGHBOURS, METHOD};
const char* const NUMBER_NEIGHBOURS{"number_neighbours"};
const char* const METHOD{"method"};
const char* const LOF{"lof"};
const char* const LDOF{"ldof"};
const char* const DISTANCE_KTH_NN{"distance_kth_nn"};
const char* const DISTANCE_KNN{"distance_knn"};
const char* const VALID_MEMBER_NAMES[]{NUMBER_NEIGHBOURS, METHOD};

// Output
const char* OUTLIER_SCORE{"outlier_score"};
const char* const OUTLIER_SCORE{"outlier_score"};

template<typename MEMBER>
bool isValidMember(const MEMBER& member) {
Expand Down
2 changes: 1 addition & 1 deletion lib/config/CTools.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ std::string CTools::prettyPrint(double d) {
}

std::string CTools::prettyPrint(core_t::TTime time) {
static const char* SUFFIXES[] = {" week", " day", " hr", " min", " sec"};
static const char* const SUFFIXES[] = {" week", " day", " hr", " min", " sec"};

std::string result;
core_t::TTime intervals[] = {(time / 604800), (time / 86400) % 7,
Expand Down