formatting fixes

gtsam/hybrid/HybridGaussianConditional.h

@@ -24,9 +24,9 @@
 #include <gtsam/discrete/DecisionTree.h>
 #include <gtsam/discrete/DecisionTreeFactor.h>
 #include <gtsam/discrete/DiscreteKey.h>
-#include <gtsam/hybrid/HybridGaussianProductFactor.h>
 #include <gtsam/hybrid/HybridFactor.h>
 #include <gtsam/hybrid/HybridGaussianFactor.h>
+#include <gtsam/hybrid/HybridGaussianProductFactor.h>
 #include <gtsam/inference/Conditional.h>
 #include <gtsam/linear/GaussianConditional.h>
 

gtsam/hybrid/HybridGaussianFactor.cpp

@@ -139,8 +139,7 @@ void HybridGaussianFactor::print(const std::string &s,
     std::cout << "  empty" << std::endl;
   } else {
     factors_.print(
-        "",
-        [&](Key k) { return formatter(k); },
+        "", [&](Key k) { return formatter(k); },
         [&](const auto& pair) -> std::string {
           RedirectCout rd;
           std::cout << ":\n";

gtsam/hybrid/HybridGaussianFactor.h

@@ -120,9 +120,8 @@ public:
 
   bool equals(const HybridFactor &lf, double tol = 1e-9) const override;
 
-  void
-  print(const std::string &s = "",
-        const KeyFormatter &formatter = DefaultKeyFormatter) const override;
+  void print(const std::string &s = "", const KeyFormatter &formatter =
+                                            DefaultKeyFormatter) const override;
 
   /// @}
   /// @name Standard API
@@ -138,8 +137,8 @@ public:
    * @return AlgebraicDecisionTree<Key> A decision tree with the same keys
    * as the factors involved, and leaf values as the error.
    */
-  AlgebraicDecisionTree<Key>
-  errorTree(const VectorValues &continuousValues) const override;
+  AlgebraicDecisionTree<Key> errorTree(
+      const VectorValues &continuousValues) const override;
 
   /**
    * @brief Compute the log-likelihood, including the log-normalizing constant.

gtsam/hybrid/HybridGaussianFactorGraph.cpp

@@ -24,6 +24,7 @@
 #include <gtsam/discrete/DiscreteFactorGraph.h>
 #include <gtsam/discrete/DiscreteJunctionTree.h>
 #include <gtsam/discrete/DiscreteKey.h>
+#include <gtsam/discrete/DiscreteValues.h>
 #include <gtsam/hybrid/HybridConditional.h>
 #include <gtsam/hybrid/HybridEliminationTree.h>
 #include <gtsam/hybrid/HybridFactor.h>
@@ -39,7 +40,6 @@
 #include <gtsam/linear/GaussianJunctionTree.h>
 #include <gtsam/linear/HessianFactor.h>
 #include <gtsam/linear/JacobianFactor.h>
-#include "gtsam/discrete/DiscreteValues.h"
 
 #include <cstddef>
 #include <iostream>
@@ -83,11 +83,12 @@ static void printFactor(const std::shared_ptr<Factor> &factor,
                         const DiscreteValues &assignment,
                         const KeyFormatter &keyFormatter) {
   if (auto hgf = dynamic_pointer_cast<HybridGaussianFactor>(factor)) {
-    if (assignment.empty())
+    if (assignment.empty()) {
       hgf->print("HybridGaussianFactor:", keyFormatter);
-    else
+    } else {
       hgf->operator()(assignment)
           .first->print("HybridGaussianFactor, component:", keyFormatter);
+    }
   } else if (auto gf = dynamic_pointer_cast<GaussianFactor>(factor)) {
     factor->print("GaussianFactor:\n", keyFormatter);
 
@@ -99,13 +100,14 @@ static void printFactor(const std::shared_ptr<Factor> &factor,
     } else if (hc->isDiscrete()) {
       factor->print("DiscreteConditional:\n", keyFormatter);
     } else {
-      if (assignment.empty())
+      if (assignment.empty()) {
         hc->print("HybridConditional:", keyFormatter);
-      else
+      } else {
         hc->asHybrid()
             ->choose(assignment)
             ->print("HybridConditional, component:\n", keyFormatter);
       }
+    }
   } else {
     factor->print("Unknown factor type\n", keyFormatter);
   }

gtsam/hybrid/HybridGaussianFactorGraph.h

@@ -145,8 +145,8 @@ class GTSAM_EXPORT HybridGaussianFactorGraph
   /// @name Testable
   /// @{
 
-  void
-  print(const std::string &s = "HybridGaussianFactorGraph",
+  void print(
+      const std::string& s = "HybridGaussianFactorGraph",
       const KeyFormatter& keyFormatter = DefaultKeyFormatter) const override;
 
   /**