Skip to content

[Fix] Make error language more consistent #118

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 3 commits into from
Mar 28, 2022
Merged

[Fix] Make error language more consistent #118

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f8130f6
replace incorrect use of label where identifier is intended
Mar 20, 2022
95f04b8
dont shorten identifier to id
Mar 20, 2022
bc7e813
rename DuplicateLabel to DuplicateIdentifier
Mar 21, 2022
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
4 changes: 2 additions & 2 deletions include/clients/nrt/CommonResults.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ static const std::string PointNotFound{"Point not found"};
static const std::string WrongPointSize{"Wrong Point Size"};
static const std::string WrongPointNumber{"Wrong number of points"};
static const std::string WrongNumInitial{"Wrong number of initial points"};
static const std::string DuplicateLabel{"Label already in dataset"};
static const std::string DuplicateIdentifier{"Identifier already in dataset"};
static const std::string SmallDataSet{"DataSet is smaller than k"};
static const std::string SmallK{"k is too small"};
static const std::string LargeK{"k is too large"};
Expand All @@ -34,7 +34,7 @@ static const std::string NoLabelSet{"LabelSet does not exist"};
static const std::string NoDataFitted{"No data fitted"};
static const std::string NotEnoughData{"Not enough data"};
static const std::string EmptyLabel{"Empty label"};
static const std::string EmptyId{"Empty id"};
static const std::string EmptyId{"Empty identifier"};
static const std::string BufferAlloc{"Can't allocate buffer"};
static const std::string FileRead{"Couldn't read file"};
static const std::string FileWrite{"Couldn't write file"};
Expand Down
2 changes: 1 addition & 1 deletion include/clients/nrt/DataSetClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class DataSetClient : public FluidBaseClient,
return Error(WrongPointSize);
RealVector point(dataset.dims());
point = buf.samps(0, dataset.dims(), 0);
return dataset.add(id, point) ? OK() : Error(DuplicateLabel);
return dataset.add(id, point) ? OK() : Error(DuplicateIdentifier);
}

MessageResult<void> getPoint(string id, BufferPtr data) const
Expand Down
2 changes: 1 addition & 1 deletion include/clients/nrt/LabelSetClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ class LabelSetClient
if (label.empty()) return Error(EmptyLabel);
if (mAlgorithm.dims() == 0) { mAlgorithm = LabelSet(1); }
StringVector point = {label};
return mAlgorithm.add(id, point) ? OK() : Error(DuplicateLabel);
return mAlgorithm.add(id, point) ? OK() : Error(DuplicateIdentifier);
}

MessageResult<string> getLabel(string id) const
Expand Down