Skip to content
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

Jump to bottom

Enhance/optional message args #106

Merged
merged 6 commits into from
May 3, 2022
Merged

Enhance/optional message args #106

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
56f8f5c
Add dependency for Sy Brand's `optional` backport
weefuzzy Feb 24, 2022
c8f4fa9
include optional in MessageSet
weefuzzy Feb 24, 2022
f6fda8a
try out optional arg in `KDTreeClient::kNearest`
weefuzzy Feb 24, 2022
ecdc278
compile-time enforce that optional args must follow mandatory ones
weefuzzy Feb 24, 2022
308ce1e
stop tl:optional doing its tests
weefuzzy Feb 24, 2022
fe03730
Merge branch 'dev' into enhance/optional-message-args
weefuzzy Apr 29, 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
Prev Previous commit
Next Next commit
try out optional arg in KDTreeClient::kNearest
  • Loading branch information
@weefuzzy
weefuzzy committed Feb 24, 2022
commit f6fda8a79d6b36241de9c15c11c255e09d45b6c3
7 changes: 5 additions & 2 deletions include/clients/nrt/KDTreeClient.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,9 +74,12 @@ class KDTreeClient : public FluidBaseClient,
return OK();
}

MessageResult<StringVector> kNearest(BufferPtr data) const
MessageResult<StringVector> kNearest(BufferPtr data, Optional<index> nNeighbours) const
{
index k = get<kNumNeighbors>();
//we can deprecate ancillary parameters in favour of optional args by falling back to using parameters when arg not present
index k = nNeighbours ? nNeighbours.value() : get<kNumNeighbors>();
//alternatively we could just be hardcore and ignore parameters and have message handlers fallback to a default when arg missing (which would be eventual behaviour, I guess)
//index k = nNeighbours.value_or(1);
if (k > mAlgorithm.size()) return Error<StringVector>(SmallDataSet);
// if (k <= 0 && get<kRadius>() <= 0) return Error<StringVector>(SmallK);
if (!mAlgorithm.initialized()) return Error<StringVector>(NoDataFitted);
Expand Down