From acda56d67b55eda015636ae1d164906768f0d844 Mon Sep 17 00:00:00 2001 From: Varun Agrawal Date: Wed, 9 Oct 2024 18:34:56 -0400 Subject: [PATCH] normalize no longer takes explicit sum, so that it normalizes correctly --- gtsam/discrete/AlgebraicDecisionTree.h | 5 +---- gtsam/discrete/tests/testAlgebraicDecisionTree.cpp | 2 +- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/gtsam/discrete/AlgebraicDecisionTree.h b/gtsam/discrete/AlgebraicDecisionTree.h index 45b949d3c..e582db0ff 100644 --- a/gtsam/discrete/AlgebraicDecisionTree.h +++ b/gtsam/discrete/AlgebraicDecisionTree.h @@ -234,12 +234,9 @@ namespace gtsam { * @brief Helper method to perform normalization such that all leaves in the * tree sum to 1 * - * @param sum * @return AlgebraicDecisionTree */ - AlgebraicDecisionTree normalize(double sum) const { - return this->apply([&sum](const double& x) { return x / sum; }); - } + AlgebraicDecisionTree normalize() const { return (*this) / this->sum(); } /// Find the minimum values amongst all leaves double min() const { diff --git a/gtsam/discrete/tests/testAlgebraicDecisionTree.cpp b/gtsam/discrete/tests/testAlgebraicDecisionTree.cpp index bf728695c..a5e46d538 100644 --- a/gtsam/discrete/tests/testAlgebraicDecisionTree.cpp +++ b/gtsam/discrete/tests/testAlgebraicDecisionTree.cpp @@ -562,7 +562,7 @@ TEST(ADT, Sum) { TEST(ADT, Normalize) { ADT a = exampleADT(); double sum = a.sum(); - auto actual = a.normalize(sum); + auto actual = a.normalize(); DiscreteKey A(0, 2), B(1, 3), C(2, 2); DiscreteKeys keys = DiscreteKeys{A, B, C};