Remove header bloat

dellaert · dellaert · commit 13a2748a4f4c · 2025-03-22T00:41:25.000-04:00
diff --git a/examples/SFMExample_bal_COLAMD_METIS.cpp b/examples/SFMExample_bal_COLAMD_METIS.cpp
@@ -23,7 +23,6 @@
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
 #include <gtsam/inference/Symbol.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/base/timing.h>
 
 #include <vector>
diff --git a/gtsam/discrete/DecisionTreeFactor.cpp b/gtsam/discrete/DecisionTreeFactor.cpp
@@ -22,6 +22,7 @@
 #include <gtsam/discrete/DiscreteConditional.h>
 #include <gtsam/discrete/TableFactor.h>
 #include <gtsam/hybrid/HybridValues.h>
+#include <gtsam/inference/Ordering.h>
 
 #include <utility>
 
diff --git a/gtsam/discrete/DecisionTreeFactor.h b/gtsam/discrete/DecisionTreeFactor.h
@@ -22,7 +22,6 @@
 #include <gtsam/discrete/DiscreteFactor.h>
 #include <gtsam/discrete/DiscreteKey.h>
 #include <gtsam/discrete/Ring.h>
-#include <gtsam/inference/Ordering.h>
 
 #include <algorithm>
 #include <map>
diff --git a/gtsam/discrete/DiscreteConditional.cpp b/gtsam/discrete/DiscreteConditional.cpp
@@ -22,6 +22,7 @@
 #include <gtsam/discrete/Ring.h>
 #include <gtsam/discrete/Signature.h>
 #include <gtsam/hybrid/HybridValues.h>
+#include <gtsam/inference/Ordering.h>
 
 #include <algorithm>
 #include <cassert>
diff --git a/gtsam/discrete/DiscreteFactor.h b/gtsam/discrete/DiscreteFactor.h
@@ -22,14 +22,14 @@
 #include <gtsam/discrete/AlgebraicDecisionTree.h>
 #include <gtsam/discrete/DiscreteValues.h>
 #include <gtsam/inference/Factor.h>
-#include <gtsam/inference/Ordering.h>
 
 #include <string>
 namespace gtsam {
 
 class DecisionTreeFactor;
 class DiscreteConditional;
 class HybridValues;
+class Ordering;
 
 /**
  * Base class for discrete probabilistic factors
diff --git a/gtsam/discrete/DiscreteFactorGraph.h b/gtsam/discrete/DiscreteFactorGraph.h
@@ -23,7 +23,6 @@
 #include <gtsam/discrete/DiscreteLookupDAG.h>
 #include <gtsam/inference/EliminateableFactorGraph.h>
 #include <gtsam/inference/FactorGraph.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/base/FastSet.h>
 
 #include <string>
diff --git a/gtsam/discrete/TableFactor.cpp b/gtsam/discrete/TableFactor.cpp
@@ -21,6 +21,7 @@
 #include <gtsam/discrete/DiscreteConditional.h>
 #include <gtsam/discrete/TableFactor.h>
 #include <gtsam/hybrid/HybridValues.h>
+#include <gtsam/inference/Ordering.h>
 
 #include <utility>
 
diff --git a/gtsam/discrete/TableFactor.h b/gtsam/discrete/TableFactor.h
@@ -21,7 +21,6 @@
 #include <gtsam/discrete/DiscreteFactor.h>
 #include <gtsam/discrete/DiscreteKey.h>
 #include <gtsam/discrete/Ring.h>
-#include <gtsam/inference/Ordering.h>
 
 #include <Eigen/Sparse>
 #include <algorithm>
diff --git a/gtsam/hybrid/HybridGaussianFactorGraph.h b/gtsam/hybrid/HybridGaussianFactorGraph.h
@@ -25,7 +25,6 @@
 #include <gtsam/hybrid/HybridGaussianFactor.h>
 #include <gtsam/inference/EliminateableFactorGraph.h>
 #include <gtsam/inference/FactorGraph.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/linear/GaussianFactor.h>
 #include <gtsam/linear/VectorValues.h>
 
diff --git a/gtsam/hybrid/HybridNonlinearISAM.cpp b/gtsam/hybrid/HybridNonlinearISAM.cpp
@@ -19,7 +19,6 @@
 #include <gtsam/hybrid/HybridGaussianFactorGraph.h>
 #include <gtsam/hybrid/HybridNonlinearFactor.h>
 #include <gtsam/hybrid/HybridNonlinearISAM.h>
-#include <gtsam/inference/Ordering.h>
 
 #include <iostream>
 
diff --git a/gtsam/inference/BayesTreeCliqueBase-inst.h b/gtsam/inference/BayesTreeCliqueBase-inst.h
@@ -18,6 +18,7 @@
 
 #include <gtsam/inference/BayesTreeCliqueBase.h>
 #include <gtsam/inference/FactorGraph-inst.h>
+#include <gtsam/inference/Ordering.h>
 #include <gtsam/base/timing.h>
 
 namespace gtsam {
diff --git a/gtsam/inference/BayesTreeCliqueBase.h b/gtsam/inference/BayesTreeCliqueBase.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include <gtsam/inference/Key.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/base/types.h>
 #include <gtsam/base/FastVector.h>
 
diff --git a/gtsam/inference/ClusterTree-inst.h b/gtsam/inference/ClusterTree-inst.h
@@ -11,7 +11,6 @@
 
 #include <gtsam/inference/ClusterTree.h>
 #include <gtsam/inference/BayesTree.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/base/timing.h>
 #include <gtsam/base/treeTraversal-inst.h>
 
diff --git a/gtsam/linear/JacobianFactor.cpp b/gtsam/linear/JacobianFactor.cpp
@@ -24,7 +24,6 @@
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/VectorValues.h>
 #include <gtsam/inference/VariableSlots.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/base/debug.h>
 #include <gtsam/base/timing.h>
 #include <gtsam/base/Matrix.h>
diff --git a/gtsam/linear/Scatter.cpp b/gtsam/linear/Scatter.cpp
@@ -18,7 +18,6 @@
 
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/Scatter.h>
-#include <gtsam/inference/Ordering.h>
 
 #include <algorithm>
 
diff --git a/gtsam/linear/SubgraphBuilder.cpp b/gtsam/linear/SubgraphBuilder.cpp
@@ -18,7 +18,6 @@
 #include <gtsam/base/DSFVector.h>
 #include <gtsam/base/FastMap.h>
 #include <gtsam/base/WeightedSampler.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/inference/VariableIndex.h>
 #include <gtsam/linear/Errors.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
diff --git a/gtsam/linear/VectorValues.h b/gtsam/linear/VectorValues.h
@@ -18,7 +18,6 @@
 #pragma once
 
 #include <gtsam/linear/Scatter.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/base/Vector.h>
 #include <gtsam/base/ConcurrentMap.h>
 #include <gtsam/base/FastVector.h>
diff --git a/gtsam/nonlinear/DoglegOptimizerImpl.h b/gtsam/nonlinear/DoglegOptimizerImpl.h
@@ -20,7 +20,7 @@
 #include <cassert>
 
 #include <gtsam/linear/VectorValues.h>
-#include <gtsam/inference/Ordering.h>
+#include <gtsam/base/timing.h>
 
 namespace gtsam {
 
diff --git a/gtsam/nonlinear/LevenbergMarquardtOptimizer.cpp b/gtsam/nonlinear/LevenbergMarquardtOptimizer.cpp
@@ -24,7 +24,6 @@
 #include <gtsam/nonlinear/Values.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/linearExceptions.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/base/Vector.h>
 #if GTSAM_USE_BOOST_FEATURES
 #include <gtsam/base/timing.h>
diff --git a/gtsam/nonlinear/NonlinearFactorGraph.cpp b/gtsam/nonlinear/NonlinearFactorGraph.cpp
@@ -25,7 +25,6 @@
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/linearExceptions.h>
 #include <gtsam/linear/VectorValues.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/inference/FactorGraph-inst.h>
 #include <gtsam/config.h> // for GTSAM_USE_TBB
 
diff --git a/gtsam/nonlinear/NonlinearISAM.cpp b/gtsam/nonlinear/NonlinearISAM.cpp
@@ -17,7 +17,6 @@
 
 #include <gtsam/nonlinear/NonlinearISAM.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
-#include <gtsam/inference/Ordering.h>
 
 #include <iostream>
 
diff --git a/gtsam/nonlinear/NonlinearOptimizer.cpp b/gtsam/nonlinear/NonlinearOptimizer.cpp
@@ -25,7 +25,6 @@
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/VectorValues.h>
 
-#include <gtsam/inference/Ordering.h>
 
 #include <stdexcept>
 #include <iostream>
diff --git a/gtsam/nonlinear/Values.cpp b/gtsam/nonlinear/Values.cpp
@@ -24,6 +24,7 @@
 
 #include <gtsam/nonlinear/Values.h>
 #include <gtsam/linear/VectorValues.h>
+#include <gtsam/base/timing.h>
 
 #include <list>
 #include <memory>
diff --git a/gtsam/symbolic/SymbolicFactor.cpp b/gtsam/symbolic/SymbolicFactor.cpp
@@ -16,7 +16,6 @@
  */
 
 #include <gtsam/base/FastVector.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/symbolic/SymbolicFactor.h>
 #include <gtsam/symbolic/SymbolicConditional.h>
 #include <gtsam/symbolic/SymbolicFactorGraph.h>
diff --git a/gtsam/symbolic/tests/symbolicExampleGraphs.h b/gtsam/symbolic/tests/symbolicExampleGraphs.h
@@ -25,7 +25,6 @@
 #include <gtsam/symbolic/SymbolicFactor.h>
 #include <gtsam/symbolic/SymbolicConditional.h>
 #include <gtsam/symbolic/SymbolicBayesTree.h>
-#include <gtsam/inference/Ordering.h>
 #include <gtsam/inference/Symbol.h>
 
 namespace gtsam {
