From 003e7a06ab59d2de54ad2656d9f7aa3d5306ae7a Mon Sep 17 00:00:00 2001
From: cbeall3 <cbeall3@gatech.edu>
Date: Wed, 3 Dec 2014 23:11:36 -0500
Subject: [PATCH] 3rdparty/ceres include paths

---
 gtsam/3rdparty/ceres/autodiff.h                      | 8 ++++----
 gtsam/3rdparty/ceres/example.h                       | 2 +-
 gtsam/3rdparty/ceres/fixed_array.h                   | 4 ++--
 gtsam/3rdparty/ceres/jet.h                           | 2 +-
 gtsam/3rdparty/ceres/variadic_evaluate.h             | 6 +++---
 gtsam_unstable/nonlinear/AdaptAutoDiff.h             | 2 +-
 gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp | 2 +-
 gtsam_unstable/timing/timeAdaptAutoDiff.cpp          | 2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/gtsam/3rdparty/ceres/autodiff.h b/gtsam/3rdparty/ceres/autodiff.h
index 2a0ac8987..f124425cc 100644
--- a/gtsam/3rdparty/ceres/autodiff.h
+++ b/gtsam/3rdparty/ceres/autodiff.h
@@ -142,10 +142,10 @@
 
 #include <stddef.h>
 
-#include <gtsam_unstable/nonlinear/ceres_jet.h>
-#include <gtsam_unstable/nonlinear/ceres_eigen.h>
-#include <gtsam_unstable/nonlinear/ceres_fixed_array.h>
-#include <gtsam_unstable/nonlinear/ceres_variadic_evaluate.h>
+#include <gtsam/3rdparty/ceres/jet.h>
+#include <gtsam/3rdparty/ceres/eigen.h>
+#include <gtsam/3rdparty/ceres/fixed_array.h>
+#include <gtsam/3rdparty/ceres/variadic_evaluate.h>
 #define DCHECK assert
 #define DCHECK_GT(a,b) assert((a)>(b))
 
diff --git a/gtsam/3rdparty/ceres/example.h b/gtsam/3rdparty/ceres/example.h
index 45ec3428e..6b051fce0 100644
--- a/gtsam/3rdparty/ceres/example.h
+++ b/gtsam/3rdparty/ceres/example.h
@@ -33,7 +33,7 @@
 
 #pragma once
 
-#include <gtsam_unstable/nonlinear/ceres_rotation.h>
+#include <gtsam/3rdparty/ceres/rotation.h>
 
 // Templated pinhole camera model for used with Ceres. The camera is
 // parameterized using 9 parameters: 3 for rotation, 3 for translation, 1 for
diff --git a/gtsam/3rdparty/ceres/fixed_array.h b/gtsam/3rdparty/ceres/fixed_array.h
index 69a426379..db1591636 100644
--- a/gtsam/3rdparty/ceres/fixed_array.h
+++ b/gtsam/3rdparty/ceres/fixed_array.h
@@ -34,8 +34,8 @@
 
 #include <cstddef>
 #include <gtsam/3rdparty/gtsam_eigen_includes.h>
-#include <gtsam_unstable/nonlinear/ceres_macros.h>
-#include <gtsam_unstable/nonlinear/ceres_manual_constructor.h>
+#include <gtsam/3rdparty/ceres/macros.h>
+#include <gtsam/3rdparty/ceres/manual_constructor.h>
 
 namespace ceres {
 namespace internal {
diff --git a/gtsam/3rdparty/ceres/jet.h b/gtsam/3rdparty/ceres/jet.h
index ed4834caf..12d4e8bc9 100644
--- a/gtsam/3rdparty/ceres/jet.h
+++ b/gtsam/3rdparty/ceres/jet.h
@@ -163,7 +163,7 @@
 #include <string>
 
 #include <gtsam/3rdparty/gtsam_eigen_includes.h>
-#include <gtsam_unstable/nonlinear/ceres_fpclassify.h>
+#include <gtsam/3rdparty/ceres/fpclassify.h>
 
 namespace ceres {
 
diff --git a/gtsam/3rdparty/ceres/variadic_evaluate.h b/gtsam/3rdparty/ceres/variadic_evaluate.h
index 7d22fe22e..86aec4829 100644
--- a/gtsam/3rdparty/ceres/variadic_evaluate.h
+++ b/gtsam/3rdparty/ceres/variadic_evaluate.h
@@ -34,9 +34,9 @@
 
 #include <stddef.h>
 
-#include <gtsam_unstable/nonlinear/ceres_jet.h>
-#include <gtsam_unstable/nonlinear/ceres_eigen.h>
-#include <gtsam_unstable/nonlinear/ceres_fixed_array.h>
+#include <gtsam/3rdparty/ceres/jet.h>
+#include <gtsam/3rdparty/ceres/eigen.h>
+#include <gtsam/3rdparty/ceres/fixed_array.h>
 
 namespace ceres {
 namespace internal {
diff --git a/gtsam_unstable/nonlinear/AdaptAutoDiff.h b/gtsam_unstable/nonlinear/AdaptAutoDiff.h
index 96978d9cf..d5cd3e809 100644
--- a/gtsam_unstable/nonlinear/AdaptAutoDiff.h
+++ b/gtsam_unstable/nonlinear/AdaptAutoDiff.h
@@ -18,7 +18,7 @@
 
 #pragma once
 
-#include <gtsam_unstable/nonlinear/ceres_autodiff.h>
+#include <gtsam/3rdparty/ceres/autodiff.h>
 #include <gtsam/base/Manifold.h>
 
 namespace gtsam {
diff --git a/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp b/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp
index a8151ec11..e618d0a1a 100644
--- a/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp
+++ b/gtsam_unstable/nonlinear/tests/testAdaptAutoDiff.cpp
@@ -17,7 +17,7 @@
  * @brief unit tests for Block Automatic Differentiation
  */
 
-#include <gtsam_unstable/nonlinear/ceres_example.h>
+#include <gtsam/3rdparty/ceres/example.h>
 #include <gtsam_unstable/nonlinear/AdaptAutoDiff.h>
 #include <gtsam/nonlinear/Expression.h>
 #include <gtsam/geometry/PinholeCamera.h>
diff --git a/gtsam_unstable/timing/timeAdaptAutoDiff.cpp b/gtsam_unstable/timing/timeAdaptAutoDiff.cpp
index 32bce9ba5..be11453b5 100644
--- a/gtsam_unstable/timing/timeAdaptAutoDiff.cpp
+++ b/gtsam_unstable/timing/timeAdaptAutoDiff.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "timeLinearize.h"
-#include <gtsam_unstable/nonlinear/ceres_example.h>
+#include <gtsam/3rdparty/ceres/example.h>
 #include <gtsam_unstable/nonlinear/AdaptAutoDiff.h>
 #include <gtsam_unstable/nonlinear/ExpressionFactor.h>
 #include <gtsam/slam/GeneralSFMFactor.h>