Undo TableFactor return in Hybrid GFG so we can group the changes tog…

…ether

gtsam/hybrid/HybridGaussianFactorGraph.cpp

@@ -96,7 +96,7 @@ static GaussianFactorGraphTree addGaussian(
 // TODO(dellaert): it's probably more efficient to first collect the discrete
 // keys, and then loop over all assignments to populate a vector.
 GaussianFactorGraphTree HybridGaussianFactorGraph::assembleGraphTree() const {
-  gttic(assembleGraphTree);
+  gttic_(assembleGraphTree);
 
   GaussianFactorGraphTree result;
 
@@ -129,7 +129,7 @@ GaussianFactorGraphTree HybridGaussianFactorGraph::assembleGraphTree() const {
     }
   }
 
-  gttoc(assembleGraphTree);
+  gttoc_(assembleGraphTree);
 
   return result;
 }
@@ -263,12 +263,9 @@ hybridElimination(const HybridGaussianFactorGraph &factors,
 
     DecisionTree<Key, double> probabilities(eliminationResults, probability);
 
-    auto dtf =
-        std::make_shared<DecisionTreeFactor>(discreteSeparator, probabilities);
-
     return {
         std::make_shared<HybridConditional>(gaussianMixture),
-        std::make_shared<TableFactor>(discreteSeparator, dtf->probabilities())};
+        std::make_shared<DecisionTreeFactor>(discreteSeparator, probabilities)};
   } else {
     // Otherwise, we create a resulting GaussianMixtureFactor on the separator,
     // taking care to correct for conditional constant.