diff --git a/gtsam.h b/gtsam.h index 47158734e..d16ad9837 100644 --- a/gtsam.h +++ b/gtsam.h @@ -2019,6 +2019,24 @@ virtual class GenericStereoFactor : gtsam::NonlinearFactor { }; typedef gtsam::GenericStereoFactor GenericStereoFactor3D; +#include +template +virtual class PoseTranslationPrior : gtsam::NonlinearFactor { + PoseTranslationPrior(size_t key, const POSE& pose_z, const gtsam::noiseModel::Base* noiseModel); +}; + +typedef gtsam::PoseTranslationPrior PoseTranslationPrior2D; +typedef gtsam::PoseTranslationPrior PoseTranslationPrior3D; + +#include +template +virtual class PoseRotationPrior : gtsam::NonlinearFactor { + PoseRotationPrior(size_t key, const POSE& pose_z, const gtsam::noiseModel::Base* noiseModel); +}; + +typedef gtsam::PoseRotationPrior PoseRotationPrior2D; +typedef gtsam::PoseRotationPrior PoseRotationPrior3D; + #include pair load2D(string filename, gtsam::noiseModel::Diagonal* model, int maxID, bool addNoise, bool smart); diff --git a/gtsam_unstable/gtsam_unstable.h b/gtsam_unstable/gtsam_unstable.h index ca27cd738..33c3a0b6d 100644 --- a/gtsam_unstable/gtsam_unstable.h +++ b/gtsam_unstable/gtsam_unstable.h @@ -570,26 +570,6 @@ virtual class ConcurrentBatchSmoother : gtsam::ConcurrentSmoother { //************************************************************************* // slam //************************************************************************* -#include - -#include -template -virtual class PoseTranslationPrior : gtsam::NonlinearFactor { - PoseTranslationPrior(size_t key, const POSE& pose_z, const gtsam::noiseModel::Base* noiseModel); -}; - -typedef gtsam::PoseTranslationPrior PoseTranslationPrior2D; -typedef gtsam::PoseTranslationPrior PoseTranslationPrior3D; - -#include -template -virtual class PoseRotationPrior : gtsam::NonlinearFactor { - PoseRotationPrior(size_t key, const POSE& pose_z, const gtsam::noiseModel::Base* noiseModel); -}; - -typedef gtsam::PoseRotationPrior PoseRotationPrior2D; -typedef gtsam::PoseRotationPrior PoseRotationPrior3D; - #include virtual class RelativeElevationFactor: gtsam::NonlinearFactor { RelativeElevationFactor();