From cae98e1d3e276722e29d5047360adfd3985371c5 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Mon, 2 Jan 2023 09:44:43 -0500 Subject: [PATCH] rename eliminate to eliminateFunc --- gtsam/hybrid/HybridGaussianFactorGraph.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/gtsam/hybrid/HybridGaussianFactorGraph.cpp b/gtsam/hybrid/HybridGaussianFactorGraph.cpp index 442ffb428..133011b6a 100644 --- a/gtsam/hybrid/HybridGaussianFactorGraph.cpp +++ b/gtsam/hybrid/HybridGaussianFactorGraph.cpp @@ -218,7 +218,8 @@ hybridElimination(const HybridGaussianFactorGraph &factors, KeyVector keysOfSeparator; // This is the elimination method on the leaf nodes - auto eliminate = [&](const GaussianMixtureFactor::GraphAndConstant &graph_z) + auto eliminateFunc = + [&](const GaussianMixtureFactor::GraphAndConstant &graph_z) -> EliminationPair { if (graph_z.graph.empty()) { return {nullptr, {nullptr, 0.0}}; @@ -250,7 +251,7 @@ hybridElimination(const HybridGaussianFactorGraph &factors, }; // Perform elimination! - DecisionTree eliminationResults(sum, eliminate); + DecisionTree eliminationResults(sum, eliminateFunc); #ifdef HYBRID_TIMING tictoc_print_();