From d9fea3946ae23cf96091219f14040596f739a258 Mon Sep 17 00:00:00 2001 From: Alex Cunningham Date: Fri, 5 Nov 2010 15:26:33 +0000 Subject: [PATCH] Fixed references to "CONFIG" in instantiation macros --- gtsam/nonlinear/LieValues-inl.h | 2 +- gtsam/nonlinear/TupleValues-inl.h | 12 ++++++------ gtsam/slam/Simulated3D.cpp | 6 +++--- gtsam/slam/planarSLAM.cpp | 4 ++-- gtsam/slam/pose2SLAM.cpp | 2 +- gtsam/slam/pose3SLAM.cpp | 2 +- gtsam/slam/saveGraph.cpp | 2 +- gtsam/slam/simulated2D.cpp | 4 ++-- gtsam/slam/visualSLAM.cpp | 2 +- 9 files changed, 18 insertions(+), 18 deletions(-) diff --git a/gtsam/nonlinear/LieValues-inl.h b/gtsam/nonlinear/LieValues-inl.h index be0aa60ee..0dab4f256 100644 --- a/gtsam/nonlinear/LieValues-inl.h +++ b/gtsam/nonlinear/LieValues-inl.h @@ -29,7 +29,7 @@ #include -#define INSTANTIATE_LIE_CONFIG(J) \ +#define INSTANTIATE_LIE_VALUES(J) \ /*INSTANTIATE_LIE(T);*/ \ /*template LieValues expmap(const LieValues&, const VectorValues&);*/ \ /*template LieValues expmap(const LieValues&, const Vector&);*/ \ diff --git a/gtsam/nonlinear/TupleValues-inl.h b/gtsam/nonlinear/TupleValues-inl.h index aad3327dd..f398cd799 100644 --- a/gtsam/nonlinear/TupleValues-inl.h +++ b/gtsam/nonlinear/TupleValues-inl.h @@ -22,22 +22,22 @@ #include // TupleValues instantiations for N = 1-6 -#define INSTANTIATE_TUPLE_CONFIG1(Values1) \ +#define INSTANTIATE_TUPLE_VALUES1(Values1) \ template class TupleValues1; -#define INSTANTIATE_TUPLE_CONFIG2(Values1, Values2) \ +#define INSTANTIATE_TUPLE_VALUES2(Values1, Values2) \ template class TupleValues2; -#define INSTANTIATE_TUPLE_CONFIG3(Values1, Values2, Values3) \ +#define INSTANTIATE_TUPLE_VALUES3(Values1, Values2, Values3) \ template class TupleValues3; -#define INSTANTIATE_TUPLE_CONFIG4(Values1, Values2, Values3, Values4) \ +#define INSTANTIATE_TUPLE_VALUES4(Values1, Values2, Values3, Values4) \ template class TupleValues4; -#define INSTANTIATE_TUPLE_CONFIG5(Values1, Values2, Values3, Values4, Values5) \ +#define INSTANTIATE_TUPLE_VALUES5(Values1, Values2, Values3, Values4, Values5) \ template class TupleValues5; -#define INSTANTIATE_TUPLE_CONFIG6(Values1, Values2, Values3, Values4, Values5, Values6) \ +#define INSTANTIATE_TUPLE_VALUES6(Values1, Values2, Values3, Values4, Values5, Values6) \ template class TupleValues6; diff --git a/gtsam/slam/Simulated3D.cpp b/gtsam/slam/Simulated3D.cpp index c1e2b4276..4d1583f65 100644 --- a/gtsam/slam/Simulated3D.cpp +++ b/gtsam/slam/Simulated3D.cpp @@ -22,9 +22,9 @@ namespace gtsam { using namespace simulated3D; -INSTANTIATE_LIE_CONFIG(PointKey) -INSTANTIATE_LIE_CONFIG(PoseKey) -INSTANTIATE_TUPLE_CONFIG2(PoseValues, PointValues) +INSTANTIATE_LIE_VALUES(PointKey) +INSTANTIATE_LIE_VALUES(PoseKey) +INSTANTIATE_TUPLE_VALUES2(PoseValues, PointValues) namespace simulated3D { diff --git a/gtsam/slam/planarSLAM.cpp b/gtsam/slam/planarSLAM.cpp index da597d5b8..756d5228f 100644 --- a/gtsam/slam/planarSLAM.cpp +++ b/gtsam/slam/planarSLAM.cpp @@ -24,8 +24,8 @@ namespace gtsam { using namespace planarSLAM; - INSTANTIATE_LIE_CONFIG(PointKey) - INSTANTIATE_TUPLE_CONFIG2(PoseValues, PointValues) + INSTANTIATE_LIE_VALUES(PointKey) + INSTANTIATE_TUPLE_VALUES2(PoseValues, PointValues) INSTANTIATE_NONLINEAR_FACTOR_GRAPH(Values) INSTANTIATE_NONLINEAR_OPTIMIZER(Graph, Values) diff --git a/gtsam/slam/pose2SLAM.cpp b/gtsam/slam/pose2SLAM.cpp index 8f6af27db..e606f8d85 100644 --- a/gtsam/slam/pose2SLAM.cpp +++ b/gtsam/slam/pose2SLAM.cpp @@ -24,7 +24,7 @@ namespace gtsam { using namespace pose2SLAM; - INSTANTIATE_LIE_CONFIG(Key) + INSTANTIATE_LIE_VALUES(Key) INSTANTIATE_NONLINEAR_FACTOR_GRAPH(Values) INSTANTIATE_NONLINEAR_OPTIMIZER(Graph, Values) template class NonlinearOptimizer; diff --git a/gtsam/slam/pose3SLAM.cpp b/gtsam/slam/pose3SLAM.cpp index 55902a042..c0897b87c 100644 --- a/gtsam/slam/pose3SLAM.cpp +++ b/gtsam/slam/pose3SLAM.cpp @@ -24,7 +24,7 @@ namespace gtsam { using namespace pose3SLAM; - INSTANTIATE_LIE_CONFIG(Key) + INSTANTIATE_LIE_VALUES(Key) INSTANTIATE_NONLINEAR_FACTOR_GRAPH(Values) INSTANTIATE_NONLINEAR_OPTIMIZER(Graph, Values) diff --git a/gtsam/slam/saveGraph.cpp b/gtsam/slam/saveGraph.cpp index 907aaf535..2c9dcf7c1 100644 --- a/gtsam/slam/saveGraph.cpp +++ b/gtsam/slam/saveGraph.cpp @@ -28,7 +28,7 @@ using namespace std; namespace gtsam { - INSTANTIATE_LIE_CONFIG(Symbol, Point2) + INSTANTIATE_LIE_VALUES(Symbol, Point2) /* ************************************************************************* */ void saveGraph(const SymbolicFactorGraph& fg, const SymbolicValues& config, const std::string& s) { diff --git a/gtsam/slam/simulated2D.cpp b/gtsam/slam/simulated2D.cpp index 427be5a8a..0cb44506f 100644 --- a/gtsam/slam/simulated2D.cpp +++ b/gtsam/slam/simulated2D.cpp @@ -23,8 +23,8 @@ namespace gtsam { using namespace simulated2D; - INSTANTIATE_LIE_CONFIG(PoseKey) - INSTANTIATE_TUPLE_CONFIG2(PoseValues, PointValues) + INSTANTIATE_LIE_VALUES(PoseKey) + INSTANTIATE_TUPLE_VALUES2(PoseValues, PointValues) namespace simulated2D { diff --git a/gtsam/slam/visualSLAM.cpp b/gtsam/slam/visualSLAM.cpp index c68071efa..5368dab93 100644 --- a/gtsam/slam/visualSLAM.cpp +++ b/gtsam/slam/visualSLAM.cpp @@ -22,7 +22,7 @@ #include namespace gtsam { - INSTANTIATE_TUPLE_CONFIG2(visualSLAM::PoseValues, visualSLAM::PointValues) + INSTANTIATE_TUPLE_VALUES2(visualSLAM::PoseValues, visualSLAM::PointValues) INSTANTIATE_NONLINEAR_FACTOR_GRAPH(visualSLAM::Values) INSTANTIATE_NONLINEAR_OPTIMIZER(visualSLAM::Graph, visualSLAM::Values)