rename GTSAM_DT_NO_PRUNING to GTSAM_DT_NO_MERGING to help with disambiguation

gtsam/discrete/DecisionTree-inl.h

@@ -200,7 +200,7 @@ namespace gtsam {
 
     /// If all branches of a choice node f are the same, just return a branch.
     static NodePtr Unique(const ChoicePtr& f) {
-#ifndef GTSAM_DT_NO_PRUNING
+#ifndef GTSAM_DT_NO_MERGING
       // If all the branches are the same, we can merge them into one
       if (f->allSame_) {
         assert(f->branches().size() > 0);

gtsam/discrete/tests/testAlgebraicDecisionTree.cpp

@@ -20,7 +20,7 @@
 #include <gtsam/discrete/DiscreteKey.h>  // make sure we have traits
 #include <gtsam/discrete/DiscreteValues.h>
 // headers first to make sure no missing headers
-//#define GTSAM_DT_NO_PRUNING
+//#define GTSAM_DT_NO_MERGING
 #include <gtsam/discrete/AlgebraicDecisionTree.h>
 #include <gtsam/discrete/DecisionTree-inl.h>  // for convert only
 #define DISABLE_TIMING

gtsam/discrete/tests/testDecisionTree.cpp

@@ -18,7 +18,7 @@
  */
 
 // #define DT_DEBUG_MEMORY
-// #define GTSAM_DT_NO_PRUNING
+// #define GTSAM_DT_NO_MERGING
 #define DISABLE_DOT
 #include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/Testable.h>