From 19e7b6bf39ba37c19b52155f57ba5c19a9925be2 Mon Sep 17 00:00:00 2001
From: dellaert <dellaert@cc.gatech.edu>
Date: Sat, 21 Feb 2015 12:39:50 +0100
Subject: [PATCH] Deal with incomplete Pose2 type by including <Pose2.h>

---
 gtsam/geometry/tests/testSerializationGeometry.cpp |  2 --
 gtsam/geometry/tests/testSimpleCamera.cpp          | 10 +++++-----
 .../nonlinear/tests/testSerializationNonlinear.cpp |  1 +
 gtsam/slam/expressions.h                           |  1 +
 gtsam/slam/tests/testDataset.cpp                   | 14 +++++++-------
 gtsam/slam/tests/testLago.cpp                      |  1 +
 tests/testManifold.cpp                             |  3 +--
 7 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/gtsam/geometry/tests/testSerializationGeometry.cpp b/gtsam/geometry/tests/testSerializationGeometry.cpp
index 84fe5980e..dfef0a9c5 100644
--- a/gtsam/geometry/tests/testSerializationGeometry.cpp
+++ b/gtsam/geometry/tests/testSerializationGeometry.cpp
@@ -16,8 +16,6 @@
  * @date Feb 7, 2012
  */
 
-#include <gtsam/geometry/Point2.h>
-#include <gtsam/geometry/Point3.h>
 #include <gtsam/geometry/Pose2.h>
 #include <gtsam/geometry/Unit3.h>
 #include <gtsam/geometry/EssentialMatrix.h>
diff --git a/gtsam/geometry/tests/testSimpleCamera.cpp b/gtsam/geometry/tests/testSimpleCamera.cpp
index 002cbe51b..71979481c 100644
--- a/gtsam/geometry/tests/testSimpleCamera.cpp
+++ b/gtsam/geometry/tests/testSimpleCamera.cpp
@@ -15,13 +15,13 @@
  * @brief test SimpleCamera class
  */
 
-#include <cmath>
-#include <iostream>
-
-#include <CppUnitLite/TestHarness.h>
+#include <gtsam/geometry/SimpleCamera.h>
+#include <gtsam/geometry/Pose2.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/numericalDerivative.h>
-#include <gtsam/geometry/SimpleCamera.h>
+#include <CppUnitLite/TestHarness.h>
+#include <cmath>
+#include <iostream>
 
 using namespace std;
 using namespace gtsam;
diff --git a/gtsam/nonlinear/tests/testSerializationNonlinear.cpp b/gtsam/nonlinear/tests/testSerializationNonlinear.cpp
index 2bdc04d5b..6dc3e3d2f 100644
--- a/gtsam/nonlinear/tests/testSerializationNonlinear.cpp
+++ b/gtsam/nonlinear/tests/testSerializationNonlinear.cpp
@@ -19,6 +19,7 @@
 #include <gtsam/nonlinear/Values.h>
 #include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/PinholeCamera.h>
+#include <gtsam/geometry/Pose2.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/geometry/Cal3DS2.h>
 #include <gtsam/geometry/Cal3Bundler.h>
diff --git a/gtsam/slam/expressions.h b/gtsam/slam/expressions.h
index f7314c73f..b819993ef 100644
--- a/gtsam/slam/expressions.h
+++ b/gtsam/slam/expressions.h
@@ -8,6 +8,7 @@
 #pragma once
 
 #include <gtsam/nonlinear/expressions.h>
+#include <gtsam/geometry/Pose2.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/geometry/Cal3Bundler.h>
 #include <gtsam/geometry/PinholeCamera.h>
diff --git a/gtsam/slam/tests/testDataset.cpp b/gtsam/slam/tests/testDataset.cpp
index d6a5ffa8c..0406c3d27 100644
--- a/gtsam/slam/tests/testDataset.cpp
+++ b/gtsam/slam/tests/testDataset.cpp
@@ -15,16 +15,16 @@
  * @author  Richard Roberts, Luca Carlone
  */
 
-#include <CppUnitLite/TestHarness.h>
-
-#include <boost/algorithm/string.hpp>
-
-#include <gtsam/inference/Symbol.h>
-#include <gtsam/base/TestableAssertions.h>
-#include <gtsam/inference/Symbol.h>
 
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/slam/dataset.h>
+#include <gtsam/geometry/Pose2.h>
+#include <gtsam/inference/Symbol.h>
+#include <gtsam/base/TestableAssertions.h>
+
+#include <boost/algorithm/string.hpp>
+
+#include <CppUnitLite/TestHarness.h>
 
 using namespace gtsam::symbol_shorthand;
 using namespace std;
diff --git a/gtsam/slam/tests/testLago.cpp b/gtsam/slam/tests/testLago.cpp
index 2d1793417..7db71d8ce 100644
--- a/gtsam/slam/tests/testLago.cpp
+++ b/gtsam/slam/tests/testLago.cpp
@@ -23,6 +23,7 @@
 #include <gtsam/slam/dataset.h>
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/slam/PriorFactor.h>
+#include <gtsam/geometry/Pose2.h>
 #include <gtsam/inference/Symbol.h>
 
 #include <CppUnitLite/TestHarness.h>
diff --git a/tests/testManifold.cpp b/tests/testManifold.cpp
index f6180fb73..ef0456146 100644
--- a/tests/testManifold.cpp
+++ b/tests/testManifold.cpp
@@ -17,9 +17,8 @@
  * @brief unit tests for Block Automatic Differentiation
  */
 
-#include <gtsam/geometry/Point2.h>
 #include <gtsam/geometry/PinholeCamera.h>
-#include <gtsam/geometry/Pose3.h>
+#include <gtsam/geometry/Pose2.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/geometry/Cal3Bundler.h>
 #include <gtsam/base/VectorSpace.h>