From 4e5e361d3f3ce1bdf40bbc2c7cf29de397fba555 Mon Sep 17 00:00:00 2001
From: Alex Cunningham <alexgcunningham@gmail.com>
Date: Sun, 22 Jan 2012 16:46:38 +0000
Subject: [PATCH] Removed extraneous references to gtsam/inference/graph.h -
 now only in SubgraphSolver

---
 examples/vSLAMexample/vISAMexample.cpp                | 1 -
 examples/vSLAMexample/vSFMexample.cpp                 | 1 -
 gtsam/inference/FactorGraph-inl.h                     | 1 -
 gtsam/inference/FactorGraph.h                         | 1 -
 gtsam/linear/SubgraphSolver-inl.h                     | 1 +
 gtsam/slam/dataset.cpp                                | 1 -
 gtsam/slam/dataset.h                                  | 1 -
 gtsam/slam/tests/testGeneralSFMFactor.cpp             | 1 -
 gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp | 1 -
 gtsam/slam/tests/testStereoFactor.cpp                 | 1 -
 gtsam/slam/tests/testVSLAM.cpp                        | 1 -
 11 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/examples/vSLAMexample/vISAMexample.cpp b/examples/vSLAMexample/vISAMexample.cpp
index 6cdc34f17..c9a656ff5 100644
--- a/examples/vSLAMexample/vISAMexample.cpp
+++ b/examples/vSLAMexample/vISAMexample.cpp
@@ -25,7 +25,6 @@ using namespace boost;
 
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/NonlinearOptimizer.h>
-#include <gtsam/inference/graph-inl.h>
 #include <gtsam/slam/visualSLAM.h>
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/nonlinear/NonlinearISAM.h>
diff --git a/examples/vSLAMexample/vSFMexample.cpp b/examples/vSLAMexample/vSFMexample.cpp
index 9dc8bfe34..f5e386ed7 100644
--- a/examples/vSLAMexample/vSFMexample.cpp
+++ b/examples/vSLAMexample/vSFMexample.cpp
@@ -24,7 +24,6 @@ using namespace boost;
 
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/NonlinearOptimizer.h>
-#include <gtsam/inference/graph-inl.h>
 #include <gtsam/slam/visualSLAM.h>
 #include <gtsam/slam/PriorFactor.h>
 
diff --git a/gtsam/inference/FactorGraph-inl.h b/gtsam/inference/FactorGraph-inl.h
index 9772cc790..5689eff0a 100644
--- a/gtsam/inference/FactorGraph-inl.h
+++ b/gtsam/inference/FactorGraph-inl.h
@@ -22,7 +22,6 @@
 
 #pragma once
 
-#include <gtsam/inference/graph-inl.h>
 #include <gtsam/inference/BayesTree.h>
 #include <gtsam/base/DSF.h>
 
diff --git a/gtsam/inference/FactorGraph.h b/gtsam/inference/FactorGraph.h
index 96786b88f..0ea0eecc9 100644
--- a/gtsam/inference/FactorGraph.h
+++ b/gtsam/inference/FactorGraph.h
@@ -28,7 +28,6 @@
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/FastMap.h>
 #include <gtsam/inference/BayesNet.h>
-#include <gtsam/inference/graph.h>
 
 namespace gtsam {
 
diff --git a/gtsam/linear/SubgraphSolver-inl.h b/gtsam/linear/SubgraphSolver-inl.h
index 63a497ac1..6f7ad5f50 100644
--- a/gtsam/linear/SubgraphSolver-inl.h
+++ b/gtsam/linear/SubgraphSolver-inl.h
@@ -14,6 +14,7 @@
 #include <boost/foreach.hpp>
 
 #include <gtsam/linear/iterative-inl.h>
+#include <gtsam/inference/graph-inl.h>
 #include <gtsam/inference/EliminationTree.h>
 
 using namespace std;
diff --git a/gtsam/slam/dataset.cpp b/gtsam/slam/dataset.cpp
index b5322ee47..d24058204 100644
--- a/gtsam/slam/dataset.cpp
+++ b/gtsam/slam/dataset.cpp
@@ -20,7 +20,6 @@
 #include <fstream>
 #include <sstream>
 #include <cstdlib>
-#include <gtsam/inference/graph-inl.h>
 
 #include <gtsam/slam/dataset.h>
 
diff --git a/gtsam/slam/dataset.h b/gtsam/slam/dataset.h
index d808dfa24..e221f9da3 100644
--- a/gtsam/slam/dataset.h
+++ b/gtsam/slam/dataset.h
@@ -21,7 +21,6 @@
 
 #include <string>
 #include <gtsam/slam/pose2SLAM.h>
-#include <gtsam/inference/graph.h>
 
 namespace gtsam
 {
diff --git a/gtsam/slam/tests/testGeneralSFMFactor.cpp b/gtsam/slam/tests/testGeneralSFMFactor.cpp
index 8f9c9d09e..dc53c098c 100644
--- a/gtsam/slam/tests/testGeneralSFMFactor.cpp
+++ b/gtsam/slam/tests/testGeneralSFMFactor.cpp
@@ -18,7 +18,6 @@ using namespace boost;
 #include <gtsam/base/Testable.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/NonlinearOptimizer.h>
-#include <gtsam/inference/graph.h>
 #include <gtsam/linear/VectorValues.h>
 #include <gtsam/nonlinear/TupleValues.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
diff --git a/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp b/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp
index 3f4e6df6f..c75450cfa 100644
--- a/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp
+++ b/gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp
@@ -18,7 +18,6 @@ using namespace boost;
 #include <gtsam/base/Testable.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/NonlinearOptimizer.h>
-#include <gtsam/inference/graph.h>
 #include <gtsam/linear/VectorValues.h>
 #include <gtsam/nonlinear/TupleValues.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
diff --git a/gtsam/slam/tests/testStereoFactor.cpp b/gtsam/slam/tests/testStereoFactor.cpp
index 50a84d8b6..2955e1ef9 100644
--- a/gtsam/slam/tests/testStereoFactor.cpp
+++ b/gtsam/slam/tests/testStereoFactor.cpp
@@ -24,7 +24,6 @@
 #include <gtsam/nonlinear/NonlinearOptimizer.h>
 #include <gtsam/slam/StereoFactor.h>
 
-#include <gtsam/inference/graph.h>
 #include <gtsam/slam/visualSLAM.h>
 
 using namespace std;
diff --git a/gtsam/slam/tests/testVSLAM.cpp b/gtsam/slam/tests/testVSLAM.cpp
index c25b4260d..cb208bfeb 100644
--- a/gtsam/slam/tests/testVSLAM.cpp
+++ b/gtsam/slam/tests/testVSLAM.cpp
@@ -27,7 +27,6 @@ using namespace boost;
 
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/NonlinearOptimizer.h>
-#include <gtsam/inference/graph.h>
 #include <gtsam/slam/visualSLAM.h>
 
 using namespace std;