Formatting changes

gtsam/inference/MetisIndex.h

@@ -9,7 +9,6 @@
 
 * -------------------------------------------------------------------------- */
 
-
 /**
 * @file    MetisIndex.h
 * @author  Andrew Melim
@@ -28,26 +27,26 @@
 #include <gtsam/inference/FactorGraph.h>
 
 namespace gtsam {
-	/**
+/**
 	* The MetisIndex class converts a factor graph into the Compressed Sparse Row format for use in
 	* METIS algorithms. Specifically, two vectors store the adjacency structure of the graph. It is built
 	* fromt a factor graph prior to elimination, and stores the list of factors
 	* that involve each variable.
 	* \nosubgrouping
 	*/
-	class GTSAM_EXPORT MetisIndex
-	{
-	public:
+class GTSAM_EXPORT MetisIndex
+{
+public:
 	typedef boost::shared_ptr<MetisIndex> shared_ptr;
 
-	private:
+private:
 	FastVector<int> xadj_; // Index of node's adjacency list in adj
 	FastVector<int>  adj_; // Stores ajacency lists of all nodes, appended into a single vector
 	size_t nFactors_;      // Number of factors in the original factor graph
 	size_t nKeys_;         // 
 	size_t minKey_;
 
-	public:
+public:
 	/// @name Standard Constructors
 	/// @{
 
@@ -76,7 +75,7 @@ namespace gtsam {
 	size_t         minKey() const { return minKey_; }
 
 	/// @}
-	};
+};
 
 }
 

gtsam/nonlinear/LevenbergMarquardtOptimizer.cpp

@@ -340,11 +340,12 @@ void LevenbergMarquardtOptimizer::iterate() {
 /* ************************************************************************* */
 LevenbergMarquardtParams LevenbergMarquardtOptimizer::ensureHasOrdering(
     LevenbergMarquardtParams params, const NonlinearFactorGraph& graph) const {
-  if (!params.ordering)
+  if (!params.ordering){
     if (params.orderingType = Ordering::Type::METIS_)
       params.ordering = Ordering::METIS(graph);
     else
       params.ordering = Ordering::COLAMD(graph);
+  }
   return params;
 }
 

gtsam/nonlinear/NonlinearOptimizerParams.cpp

@@ -165,8 +165,7 @@ NonlinearOptimizerParams::LinearSolverType NonlinearOptimizerParams::linearSolve
 }
 
 /* ************************************************************************* */
-std::string NonlinearOptimizerParams::orderingTypeTranslator(Ordering::Type type) const
-{
+std::string NonlinearOptimizerParams::orderingTypeTranslator(Ordering::Type type) const{
 	switch (type) {
 	case Ordering::Type::METIS_:
 		return "METIS";
@@ -182,8 +181,7 @@ std::string NonlinearOptimizerParams::orderingTypeTranslator(Ordering::Type type
 }
 
 /* ************************************************************************* */
-Ordering::Type NonlinearOptimizerParams::orderingTypeTranslator(const std::string& type) const
-{
+Ordering::Type NonlinearOptimizerParams::orderingTypeTranslator(const std::string& type) const{
 	if (type == "METIS")
 		return Ordering::Type::METIS_;
 	if (type == "COLAMD")