Skip to content

Please consider the following formatting changes to #14174 #91

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
aalkin merged 1 commit into from
Apr 11, 2025
Merged

Please consider the following formatting changes to #14174 #91

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
6 changes: 2 additions & 4 deletions Framework/Core/include/Framework/Expressions.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -501,7 +501,7 @@ inline Node binned(std::vector<T> const& binning, std::vector<T> const& paramete
const auto binned_copy = binned;
const auto out_copy = out;
auto root = ifnode(Node{binned_copy} < binning[0], Node{out_copy}, LiteralNode{-1});
root.right = std::make_unique<Node>(ifnode(Node{binned_copy} > binning[0] && Node{binned_copy} <= binning [1], updateParameters(pexp, bins, parameters, 0), LiteralNode{-1}));
root.right = std::make_unique<Node>(ifnode(Node{binned_copy} > binning[0] && Node{binned_copy} <= binning[1], updateParameters(pexp, bins, parameters, 0), LiteralNode{-1}));
auto* current = root.right.get();
for (auto i = 1; i < bins; ++i) {
current->right = std::make_unique<Node>(ifnode(Node{binned_copy} <= binning[i + 1], updateParameters(pexp, bins, parameters, i), LiteralNode{-1}));
Expand All @@ -516,8 +516,7 @@ template <typename T>
Node updateParameters(Node const& pexp, int bins, std::vector<T> const& parameters, int bin)
{
Node result{pexp};
auto updateParameter = [&bins, &parameters, &bin](Node* node)
{
auto updateParameter = [&bins, &parameters, &bin](Node* node) {
if (node->self.index() == 5) {
auto* n = std::get_if<5>(&node->self);
n->reset(parameters[bin * bins + n->index]);
Expand All @@ -527,7 +526,6 @@ Node updateParameters(Node const& pexp, int bins, std::vector<T> const& paramete
return result;
}


/// A struct, containing the root of the expression tree
struct Filter {
Filter() = default;
Expand Down
2 changes: 1 addition & 1 deletion Framework/Core/src/Expressions.cxx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -250,7 +250,7 @@ Operations createOperations(Filter const& expression)
[lh = LiteralNodeHelper{}](LiteralNode const& node) { return lh(node); },
[bh = BindingNodeHelper{}](BindingNode const& node) { return bh(node); },
[ph = PlaceholderNodeHelper{}](PlaceholderNode const& node) { return ph(node); },
[pr = ParameterNodeHelper{}](ParameterNode const& node){ return pr(node); },
[pr = ParameterNodeHelper{}](ParameterNode const& node) { return pr(node); },
[](auto&&) { return DatumSpec{}; }},
node->self);
};
Expand Down