Moved Symbol and LabeledSymbol to inference as they are no longer specific to nonlinear optimization

examples/CameraResectioning.cpp

@@ -16,7 +16,7 @@
  * @date    Aug 23, 2011
  */
 
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
 #include <gtsam/geometry/SimpleCamera.h>
 #include <boost/make_shared.hpp>

examples/PlanarSLAMExample.cpp

@@ -33,7 +33,7 @@
 // Each variable in the system (poses and landmarks) must be identified with a unique key.
 // We can either use simple integer keys (1, 2, 3, ...) or symbols (X1, X2, L1).
 // Here we will use Symbols
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 // In GTSAM, measurement functions are represented as 'factors'. Several common factors
 // have been provided with the library for solving robotics/SLAM/Bundle Adjustment problems.

examples/RangeISAMExample_plaza2.cpp

@@ -22,7 +22,7 @@
 // Each variable in the system (poses and landmarks) must be identified with a unique key.
 // We can either use simple integer keys (1, 2, 3, ...) or symbols (X1, X2, L1).
 // Here we will use Symbols
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 // We want to use iSAM2 to solve the range-SLAM problem incrementally
 #include <gtsam/nonlinear/ISAM2.h>

examples/SimpleRotation.cpp

@@ -28,7 +28,7 @@
 // Each variable in the system (poses) must be identified with a unique key.
 // We can either use simple integer keys (1, 2, 3, ...) or symbols (X1, X2, L1).
 // Here we will use symbols
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 // In GTSAM, measurement functions are represented as 'factors'. Several common factors
 // have been provided with the library for solving robotics/SLAM/Bundle Adjustment problems.

examples/SolverComparer.cpp

@@ -20,7 +20,7 @@
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/slam/BearingRangeFactor.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/ISAM2.h>
 #include <gtsam/nonlinear/GaussNewtonOptimizer.h>
 #include <gtsam/nonlinear/Marginals.h>

examples/VisualISAM2Example.cpp

@@ -34,7 +34,7 @@
 // Each variable in the system (poses and landmarks) must be identified with a unique key.
 // We can either use simple integer keys (1, 2, 3, ...) or symbols (X1, X2, L1).
 // Here we will use Symbols
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 // We want to use iSAM2 to solve the structure-from-motion problem incrementally, so
 // include iSAM2 here

examples/VisualISAMExample.cpp

@@ -34,7 +34,7 @@
 // Each variable in the system (poses and landmarks) must be identified with a unique key.
 // We can either use simple integer keys (1, 2, 3, ...) or symbols (X1, X2, L1).
 // Here we will use Symbols
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 // In GTSAM, measurement functions are represented as 'factors'. Several common factors
 // have been provided with the library for solving robotics/SLAM/Bundle Adjustment problems.

examples/VisualSLAMExample.cpp

@@ -33,7 +33,7 @@
 // Each variable in the system (poses and landmarks) must be identified with a unique key.
 // We can either use simple integer keys (1, 2, 3, ...) or symbols (X1, X2, L1).
 // Here we will use Symbols
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 // In GTSAM, measurement functions are represented as 'factors'. Several common factors
 // have been provided with the library for solving robotics/SLAM/Bundle Adjustment problems.

examples/easyPoint2KalmanFilter.cpp

@@ -22,7 +22,7 @@
  */
 
 #include <gtsam/nonlinear/ExtendedKalmanFilter.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/geometry/Point2.h>

examples/elaboratePoint2KalmanFilter.cpp

@@ -23,7 +23,7 @@
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/slam/BetweenFactor.h>
 //#include <gtsam/nonlinear/Ordering.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/GaussianBayesNet.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/NoiseModel.h>

gtsam.h

@@ -1456,7 +1456,7 @@ class KalmanFilter {
 // nonlinear
 //*************************************************************************
 
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 size_t symbol(char chr, size_t index);
 char symbolChr(size_t key);
 size_t symbolIndex(size_t key);
@@ -1465,7 +1465,7 @@ size_t symbolIndex(size_t key);
 void printKeySet(const gtsam::KeySet& keys);
 void printKeySet(const gtsam::KeySet& keys, string s);
 
-#include <gtsam/nonlinear/LabeledSymbol.h>
+#include <gtsam/inference/LabeledSymbol.h>
 class LabeledSymbol {
   LabeledSymbol(size_t full_key);
   LabeledSymbol(const gtsam::LabeledSymbol& key);

gtsam/base/types.cpp

@@ -20,7 +20,7 @@
 #include <boost/lexical_cast.hpp>
 
 #include <gtsam/base/types.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 namespace gtsam {
 

gtsam/inference/Key.cpp

@@ -23,7 +23,7 @@
 #include <boost/foreach.hpp>
 
 #include <gtsam/inference/Key.h>
-#include <gtsam/nonlinear/LabeledSymbol.h>
+#include <gtsam/inference/LabeledSymbol.h>
 
 namespace gtsam {
 

gtsam/inference/LabeledSymbol.cpp

@@ -26,7 +26,7 @@
 
 #include <boost/lexical_cast.hpp>
 
-#include <gtsam/nonlinear/LabeledSymbol.h>
+#include <gtsam/inference/LabeledSymbol.h>
 
 namespace gtsam {
 

gtsam/inference/LabeledSymbol.h

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 namespace gtsam {
 

gtsam/inference/Symbol.cpp

@@ -16,7 +16,7 @@
  * @author: Richard Roberts
  */
 
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 #include <boost/mpl/char.hpp>
 #include <boost/format.hpp>

gtsam/inference/tests/testKey.cpp

@@ -20,7 +20,7 @@ using namespace boost::assign;
 #include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/TestableAssertions.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 using namespace std;
 using namespace gtsam;

gtsam/inference/tests/testLabeledSymbol.cpp

@@ -21,7 +21,7 @@ using namespace boost::assign;
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/TestableAssertions.h>
 
-#include <gtsam/nonlinear/LabeledSymbol.h>
+#include <gtsam/inference/LabeledSymbol.h>
   
 using namespace std;
 using namespace gtsam;

gtsam/inference/tests/testOrdering.cpp

@@ -14,7 +14,7 @@
  * @author Alex Cunningham
  */
 
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/symbolic/SymbolicFactorGraph.h>
 #include <gtsam/inference/Ordering.h>
 #include <gtsam/base/TestableAssertions.h>

gtsam/navigation/tests/testCombinedImuFactor.cpp

@@ -16,7 +16,7 @@
  */
 
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/navigation/ImuFactor.h>
 #include <gtsam/navigation/CombinedImuFactor.h>
 #include <gtsam/navigation/ImuBias.h>

gtsam/navigation/tests/testImuFactor.cpp

@@ -17,7 +17,7 @@
 
 #include <gtsam/navigation/ImuFactor.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/navigation/ImuBias.h>
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/base/LieVector.h>

gtsam/nonlinear/ISAM2-impl.cpp

@@ -17,7 +17,7 @@
  */
 
 #include <gtsam/nonlinear/ISAM2-impl.h>
-#include <gtsam/nonlinear/Symbol.h> // for selective linearization thresholds
+#include <gtsam/inference/Symbol.h> // for selective linearization thresholds
 #include <gtsam/base/debug.h>
 #include <functional>
 #include <boost/range/adaptors.hpp>

gtsam/nonlinear/tests/testSerializationNonlinear.cpp

@@ -17,7 +17,7 @@
  */
 
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/PinholeCamera.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/geometry/Cal3DS2.h>

gtsam/nonlinear/tests/testValues.cpp

@@ -15,7 +15,7 @@
  */
 
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/VectorValues.h>
 #include <gtsam/geometry/Pose2.h>
 #include <gtsam/geometry/Pose3.h>

gtsam/slam/dataset.cpp

@@ -24,7 +24,7 @@
 
 #include <gtsam/geometry/Pose2.h>
 #include <gtsam/linear/Sampler.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/slam/dataset.h>
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/slam/BearingRangeFactor.h>

gtsam/slam/tests/testBetweenFactor.cpp

@@ -7,7 +7,7 @@
 
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/geometry/Rot3.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/slam/BetweenFactor.h>
 #include <CppUnitLite/TestHarness.h>
 

gtsam/slam/tests/testGeneralSFMFactor.cpp

@@ -20,7 +20,7 @@
 #include <gtsam/slam/RangeFactor.h>
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
 #include <gtsam/linear/VectorValues.h>

gtsam/slam/tests/testGeneralSFMFactor_Cal3Bundler.cpp

@@ -20,7 +20,7 @@
 #include <gtsam/slam/RangeFactor.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
 #include <gtsam/linear/VectorValues.h>
 #include <gtsam/geometry/Point3.h>

gtsam/slam/tests/testProjectionFactor.cpp

@@ -17,7 +17,7 @@
  */
 
 #include <gtsam/slam/ProjectionFactor.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/Cal3DS2.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/geometry/Pose3.h>

gtsam/slam/tests/testReferenceFrameFactor.cpp

@@ -23,7 +23,7 @@
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/geometry/Pose2.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>

gtsam/slam/tests/testStereoFactor.cpp

@@ -20,7 +20,7 @@
 #include <gtsam/nonlinear/GaussNewtonOptimizer.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/StereoCamera.h>
 #include <gtsam/geometry/Cal3_S2Stereo.h>
 #include <gtsam/geometry/Pose3.h>

gtsam/symbolic/tests/symbolicExampleGraphs.h

@@ -25,7 +25,7 @@
 #include <gtsam/symbolic/SymbolicConditional.h>
 #include <gtsam/symbolic/SymbolicBayesTree.h>
 #include <gtsam/inference/Ordering.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <boost/assign/list_of.hpp>
 
 namespace gtsam {

gtsam/symbolic/tests/testSymbolicBayesTree.cpp

@@ -19,7 +19,7 @@
 
 #include <gtsam/symbolic/SymbolicBayesTree.h>
 #include <gtsam/symbolic/SymbolicBayesNet.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/symbolic/tests/symbolicExampleGraphs.h>
 
 #include <boost/assign/list_of.hpp>

gtsam/symbolic/tests/testSymbolicEliminationTree.cpp

@@ -23,7 +23,7 @@
 
 #include <gtsam/base/TestableAssertions.h>
 #include <gtsam/symbolic/SymbolicEliminationTree.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 #include "symbolicExampleGraphs.h"
 

gtsam_unstable/dynamics/tests/testPendulumFactors.cpp

@@ -4,7 +4,7 @@
  */
 
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam_unstable/dynamics/Pendulum.h>
 
 /* ************************************************************************* */

gtsam_unstable/dynamics/tests/testSimpleHelicopter.cpp

@@ -5,7 +5,7 @@
 
 #include <CppUnitLite/TestHarness.h>
 #include <gtsam/base/numericalDerivative.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam_unstable/dynamics/SimpleHelicopter.h>
 
 /* ************************************************************************* */

gtsam_unstable/dynamics/tests/testVelocityConstraint3.cpp

@@ -5,7 +5,7 @@
 
 #include <CppUnitLite/TestHarness.h>
 
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam_unstable/dynamics/VelocityConstraint3.h>
 
 /* ************************************************************************* */

gtsam_unstable/examples/SmartProjectionFactorExample_kitti.cpp

@@ -22,7 +22,7 @@
 // Each variable in the system (poses and landmarks) must be identified with a unique key.
 // We can either use simple integer keys (1, 2, 3, ...) or symbols (X1, X2, L1).
 // Here we will use Symbols
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 // We want to use iSAM2 to solve the range-SLAM problem incrementally
 #include <gtsam/nonlinear/ISAM2.h>

gtsam_unstable/examples/SmartRangeExample_plaza1.cpp

@@ -22,7 +22,7 @@
 // Each variable in the system (poses and landmarks) must be identified with a unique key.
 // We can either use simple integer keys (1, 2, 3, ...) or symbols (X1, X2, L1).
 // Here we will use Symbols
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 // We want to use iSAM2 to solve the range-SLAM problem incrementally
 #include <gtsam/nonlinear/ISAM2.h>

gtsam_unstable/examples/SmartRangeExample_plaza2.cpp

@@ -22,7 +22,7 @@
 // Each variable in the system (poses and landmarks) must be identified with a unique key.
 // We can either use simple integer keys (1, 2, 3, ...) or symbols (X1, X2, L1).
 // Here we will use Symbols
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 // We want to use iSAM2 to solve the range-SLAM problem incrementally
 #include <gtsam/nonlinear/ISAM2.h>

gtsam_unstable/nonlinear/tests/testConcurrentBatchFilter.cpp

@@ -24,7 +24,7 @@
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LinearContainerFactor.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/inference/Ordering.h>
 #include <gtsam/inference/Key.h>
 #include <gtsam/inference/JunctionTree.h>

gtsam_unstable/nonlinear/tests/testConcurrentBatchSmoother.cpp

@@ -24,7 +24,7 @@
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LinearContainerFactor.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/inference/Ordering.h>
 #include <gtsam/inference/Key.h>
 #include <gtsam/inference/JunctionTree.h>

gtsam_unstable/nonlinear/tests/testConcurrentIncrementalFilter.cpp

@@ -24,7 +24,7 @@
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LinearContainerFactor.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/inference/Key.h>
 #include <gtsam/inference/JunctionTree.h>
 #include <gtsam/geometry/Pose3.h>

gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherDL.cpp

@@ -24,7 +24,7 @@
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LinearContainerFactor.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/inference/Key.h>
 #include <gtsam/inference/Ordering.h>
 #include <gtsam/inference/JunctionTree.h>

gtsam_unstable/nonlinear/tests/testConcurrentIncrementalSmootherGN.cpp

@@ -24,7 +24,7 @@
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LinearContainerFactor.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/inference/Key.h>
 #include <gtsam/inference/JunctionTree.h>
 #include <gtsam/geometry/Pose3.h>

gtsam_unstable/nonlinear/tests/testIncrementalFixedLagSmoother.cpp

@@ -29,7 +29,7 @@
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 using namespace std;
 using namespace gtsam;

gtsam_unstable/slam/serialization.cpp

@@ -19,7 +19,7 @@
 #include <gtsam/slam/RangeFactor.h>
 #include <gtsam/slam/StereoFactor.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/GaussianISAM.h>
 #include <gtsam/linear/GaussianMultifrontalSolver.h>
 #include <gtsam/base/LieVector.h>

gtsam_unstable/slam/tests/testInvDepthFactor3.cpp

@@ -11,7 +11,7 @@
 #include <gtsam/nonlinear/NonlinearEquality.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 #include <gtsam_unstable/slam/InvDepthFactor3.h>
 

gtsam_unstable/slam/tests/testInvDepthFactorVariant1.cpp

@@ -10,7 +10,7 @@
 #include <gtsam/nonlinear/NonlinearEquality.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/PinholeCamera.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/geometry/Pose3.h>

gtsam_unstable/slam/tests/testInvDepthFactorVariant2.cpp

@@ -10,7 +10,7 @@
 #include <gtsam/nonlinear/NonlinearEquality.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/PinholeCamera.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/geometry/Pose3.h>

gtsam_unstable/slam/tests/testInvDepthFactorVariant3.cpp

@@ -10,7 +10,7 @@
 #include <gtsam/nonlinear/NonlinearEquality.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/PinholeCamera.h>
 #include <gtsam/geometry/Cal3_S2.h>
 #include <gtsam/geometry/Pose3.h>

gtsam_unstable/slam/tests/testMultiProjectionFactor.cpp

@@ -26,7 +26,7 @@
 #include <gtsam/nonlinear/LinearContainerFactor.h>
 #include <gtsam/inference/Ordering.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/inference/Key.h>
 #include <gtsam/inference/JunctionTree.h>
 #include <gtsam/geometry/Pose3.h>

gtsam_unstable/slam/tests/testPoseBetweenFactor.cpp

@@ -17,7 +17,7 @@
  */
 
 #include <gtsam_unstable/slam/PoseBetweenFactor.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/base/TestableAssertions.h>

gtsam_unstable/slam/tests/testPosePriorFactor.cpp

@@ -17,7 +17,7 @@
  */
 
 #include <gtsam_unstable/slam/PosePriorFactor.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <gtsam/base/TestableAssertions.h>

gtsam_unstable/slam/tests/testSmartProjectionFactor.cpp

@@ -31,7 +31,7 @@
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LinearContainerFactor.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/inference/JunctionTree.h>
 #include <gtsam_unstable/geometry/triangulation.h>
 #include <gtsam/geometry/Pose3.h>

tests/smallExample.h

@@ -22,7 +22,7 @@
 #pragma once
 
 #include <tests/simulated2D.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/linear/GaussianBayesNet.h>
 #include <gtsam/linear/GaussianFactorGraph.h>

tests/testBoundingConstraint.cpp

@@ -16,7 +16,7 @@
  */
 
 #include <tests/simulated2DConstraints.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>
 

tests/testDoglegOptimizer.cpp

@@ -19,7 +19,7 @@
 
 #include <tests/smallExample.h>
 #include <gtsam/nonlinear/DoglegOptimizerImpl.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/JacobianFactor.h>
 #include <gtsam/linear/GaussianBayesTree.h>
 #include <gtsam/base/numericalDerivative.h>

tests/testExtendedKalmanFilter.cpp

@@ -18,7 +18,7 @@
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/nonlinear/ExtendedKalmanFilter-inl.h>
 #include <gtsam/nonlinear/NonlinearFactor.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/Point2.h>
 
 #include <CppUnitLite/TestHarness.h>

tests/testGaussianBayesTree.cpp

@@ -16,7 +16,7 @@
  */
 
 #include <tests/smallExample.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/GaussianBayesTree.h>
 #include <gtsam/linear/GaussianBayesNet.h>
 #include <gtsam/linear/GaussianConditional.h>

tests/testGaussianFactorGraphB.cpp

@@ -16,7 +16,7 @@
  **/
 
 #include <tests/smallExample.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/GaussianBayesNet.h>
 #include <gtsam/linear/GaussianBayesTree.h>
 #include <gtsam/linear/GaussianFactorGraph.h>

tests/testGaussianISAM.cpp

@@ -18,7 +18,7 @@
 #include <CppUnitLite/TestHarness.h>
 
 #include <tests/smallExample.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/GaussianISAM.h>
 #include <gtsam/inference/Ordering.h>
 

tests/testGaussianJunctionTreeB.cpp

@@ -26,7 +26,7 @@
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/Values.h>
 #include <gtsam/nonlinear/Ordering.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/GaussianJunctionTree.h>
 #include <gtsam/inference/BayesTree.h>
 #include <gtsam/geometry/Pose2.h>

tests/testIterative.cpp

@@ -19,7 +19,7 @@
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/iterative.h>
 #include <gtsam/geometry/Pose2.h>
 

tests/testMarginals.cpp

@@ -19,7 +19,7 @@
 #include <CppUnitLite/TestHarness.h>
 
 // for all nonlinear keys
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 // for points and poses
 #include <gtsam/geometry/Point2.h>

tests/testNonlinearEquality.cpp

@@ -18,7 +18,7 @@
 
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/slam/ProjectionFactor.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/LevenbergMarquardtOptimizer.h>

tests/testNonlinearFactor.cpp

@@ -32,7 +32,7 @@
 #include <tests/simulated2D.h>
 #include <gtsam/linear/GaussianFactor.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 using namespace std;
 using namespace gtsam;

tests/testNonlinearFactorGraph.cpp

@@ -32,7 +32,7 @@ using namespace boost::assign;
 #include <tests/smallExample.h>
 #include <gtsam/inference/FactorGraph.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 
 using namespace gtsam;
 using namespace example;

tests/testNonlinearISAM.cpp

@@ -10,7 +10,7 @@
 #include <gtsam/nonlinear/NonlinearISAM.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/Sampler.h>
 #include <gtsam/geometry/Pose2.h>
 

tests/testNonlinearOptimizer.cpp

@@ -20,7 +20,7 @@
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/Values.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/GaussNewtonOptimizer.h>
 #include <gtsam/nonlinear/DoglegOptimizer.h>

tests/testRot3Optimization.cpp

@@ -24,7 +24,7 @@
 #include <gtsam/geometry/Rot3.h>
 #include <gtsam/nonlinear/NonlinearFactorGraph.h>
 #include <gtsam/nonlinear/GaussNewtonOptimizer.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/slam/PriorFactor.h>
 

tests/testSerializationSLAM.cpp

@@ -33,7 +33,7 @@
 #include <gtsam/slam/RangeFactor.h>
 #include <gtsam/slam/StereoFactor.h>
 #include <gtsam/nonlinear/NonlinearEquality.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/GaussianISAM.h>
 #include <gtsam/base/LieVector.h>
 #include <gtsam/base/LieMatrix.h>

tests/testSimulated2DOriented.cpp

@@ -18,7 +18,7 @@
 
 #include <tests/simulated2D.h>
 #include <tests/simulated2DOriented.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/numericalDerivative.h>
 

tests/testSimulated3D.cpp

@@ -16,7 +16,7 @@
  **/
 
 #include <tests/simulated3D.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/numericalDerivative.h>

tests/testSubgraphPreconditioner.cpp

@@ -20,7 +20,7 @@
 #if 0
 
 #include <tests/smallExample.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/iterative.h>
 #include <gtsam/linear/GaussianFactorGraph.h>
 #include <gtsam/linear/SubgraphPreconditioner.h>

tests/testSubgraphSolver.cpp

@@ -20,7 +20,7 @@
 #if 0
 
 #include <tests/smallExample.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/linear/GaussianBayesNet.h>
 #include <gtsam/linear/iterative.h>
 #include <gtsam/linear/GaussianFactorGraph.h>

tests/timeIncremental.cpp

@@ -20,7 +20,7 @@
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/slam/BetweenFactor.h>
 #include <gtsam/slam/BearingRangeFactor.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/ISAM2.h>
 #include <gtsam/nonlinear/Marginals.h>
 

tests/timeiSAM2Chain.cpp

@@ -19,7 +19,7 @@
 #include <gtsam/geometry/Pose2.h>
 #include <gtsam/slam/PriorFactor.h>
 #include <gtsam/slam/BetweenFactor.h>
-#include <gtsam/nonlinear/Symbol.h>
+#include <gtsam/inference/Symbol.h>
 #include <gtsam/nonlinear/ISAM2.h>
 #include <gtsam/nonlinear/Marginals.h>