Skip to content

Commit 2e8a918

Browse files
authored
Merge pull request #91 from alibuild/alibot-cleanup-14174
2 parents bf49862 + 7be5308 commit 2e8a918

File tree

2 files changed

+3
-5
lines changed

2 files changed

+3
-5
lines changed

Framework/Core/include/Framework/Expressions.h

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -501,7 +501,7 @@ inline Node binned(std::vector<T> const& binning, std::vector<T> const& paramete
501501
const auto binned_copy = binned;
502502
const auto out_copy = out;
503503
auto root = ifnode(Node{binned_copy} < binning[0], Node{out_copy}, LiteralNode{-1});
504-
root.right = std::make_unique<Node>(ifnode(Node{binned_copy} > binning[0] && Node{binned_copy} <= binning [1], updateParameters(pexp, bins, parameters, 0), LiteralNode{-1}));
504+
root.right = std::make_unique<Node>(ifnode(Node{binned_copy} > binning[0] && Node{binned_copy} <= binning[1], updateParameters(pexp, bins, parameters, 0), LiteralNode{-1}));
505505
auto* current = root.right.get();
506506
for (auto i = 1; i < bins; ++i) {
507507
current->right = std::make_unique<Node>(ifnode(Node{binned_copy} <= binning[i + 1], updateParameters(pexp, bins, parameters, i), LiteralNode{-1}));
@@ -516,8 +516,7 @@ template <typename T>
516516
Node updateParameters(Node const& pexp, int bins, std::vector<T> const& parameters, int bin)
517517
{
518518
Node result{pexp};
519-
auto updateParameter = [&bins, &parameters, &bin](Node* node)
520-
{
519+
auto updateParameter = [&bins, &parameters, &bin](Node* node) {
521520
if (node->self.index() == 5) {
522521
auto* n = std::get_if<5>(&node->self);
523522
n->reset(parameters[bin * bins + n->index]);
@@ -527,7 +526,6 @@ Node updateParameters(Node const& pexp, int bins, std::vector<T> const& paramete
527526
return result;
528527
}
529528

530-
531529
/// A struct, containing the root of the expression tree
532530
struct Filter {
533531
Filter() = default;

Framework/Core/src/Expressions.cxx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -250,7 +250,7 @@ Operations createOperations(Filter const& expression)
250250
[lh = LiteralNodeHelper{}](LiteralNode const& node) { return lh(node); },
251251
[bh = BindingNodeHelper{}](BindingNode const& node) { return bh(node); },
252252
[ph = PlaceholderNodeHelper{}](PlaceholderNode const& node) { return ph(node); },
253-
[pr = ParameterNodeHelper{}](ParameterNode const& node){ return pr(node); },
253+
[pr = ParameterNodeHelper{}](ParameterNode const& node) { return pr(node); },
254254
[](auto&&) { return DatumSpec{}; }},
255255
node->self);
256256
};

0 commit comments

Comments
 (0)