Comment out IMU things for now to have Jenkins check everything else
dellaert
parent
569b608a51
commit
8333172ee6
186
gtsam.h
186
gtsam.h
|
|
@ -2479,99 +2479,99 @@ class ConstantBias {
|
||||||
|
|
||||||
}///\namespace imuBias
|
}///\namespace imuBias
|
||||||
|
|
||||||
#include <gtsam/navigation/ImuFactor.h>
|
//#include <gtsam/navigation/ImuFactor.h>
|
||||||
class PoseVelocityBias{
|
//class PoseVelocityBias{
|
||||||
PoseVelocityBias(const gtsam::Pose3& pose, Vector velocity, const gtsam::imuBias::ConstantBias& bias);
|
// PoseVelocityBias(const gtsam::Pose3& pose, Vector velocity, const gtsam::imuBias::ConstantBias& bias);
|
||||||
};
|
// };
|
||||||
class PreintegratedImuMeasurements {
|
//class PreintegratedImuMeasurements {
|
||||||
// Standard Constructor
|
// // Standard Constructor
|
||||||
PreintegratedImuMeasurements(const gtsam::imuBias::ConstantBias& bias, Matrix measuredAccCovariance,Matrix measuredOmegaCovariance, Matrix integrationErrorCovariance, bool use2ndOrderIntegration);
|
// PreintegratedImuMeasurements(const gtsam::imuBias::ConstantBias& bias, Matrix measuredAccCovariance,Matrix measuredOmegaCovariance, Matrix integrationErrorCovariance, bool use2ndOrderIntegration);
|
||||||
PreintegratedImuMeasurements(const gtsam::imuBias::ConstantBias& bias, Matrix measuredAccCovariance,Matrix measuredOmegaCovariance, Matrix integrationErrorCovariance);
|
// PreintegratedImuMeasurements(const gtsam::imuBias::ConstantBias& bias, Matrix measuredAccCovariance,Matrix measuredOmegaCovariance, Matrix integrationErrorCovariance);
|
||||||
// PreintegratedImuMeasurements(const gtsam::PreintegratedImuMeasurements& rhs);
|
// // PreintegratedImuMeasurements(const gtsam::PreintegratedImuMeasurements& rhs);
|
||||||
|
//
|
||||||
// Testable
|
// // Testable
|
||||||
void print(string s) const;
|
// void print(string s) const;
|
||||||
bool equals(const gtsam::PreintegratedImuMeasurements& expected, double tol);
|
// bool equals(const gtsam::PreintegratedImuMeasurements& expected, double tol);
|
||||||
|
//
|
||||||
double deltaTij() const;
|
// double deltaTij() const;
|
||||||
gtsam::Rot3 deltaRij() const;
|
// gtsam::Rot3 deltaRij() const;
|
||||||
Vector deltaPij() const;
|
// Vector deltaPij() const;
|
||||||
Vector deltaVij() const;
|
// Vector deltaVij() const;
|
||||||
Vector biasHatVector() const;
|
// Vector biasHatVector() const;
|
||||||
Matrix delPdelBiasAcc() const;
|
// Matrix delPdelBiasAcc() const;
|
||||||
Matrix delPdelBiasOmega() const;
|
// Matrix delPdelBiasOmega() const;
|
||||||
Matrix delVdelBiasAcc() const;
|
// Matrix delVdelBiasAcc() const;
|
||||||
Matrix delVdelBiasOmega() const;
|
// Matrix delVdelBiasOmega() const;
|
||||||
Matrix delRdelBiasOmega() const;
|
// Matrix delRdelBiasOmega() const;
|
||||||
Matrix preintMeasCov() const;
|
// Matrix preintMeasCov() const;
|
||||||
|
//
|
||||||
// Standard Interface
|
// // Standard Interface
|
||||||
void integrateMeasurement(Vector measuredAcc, Vector measuredOmega, double deltaT);
|
// void integrateMeasurement(Vector measuredAcc, Vector measuredOmega, double deltaT);
|
||||||
gtsam::PoseVelocityBias predict(const gtsam::Pose3& pose_i, Vector vel_i, const gtsam::imuBias::ConstantBias& bias,
|
// gtsam::PoseVelocityBias predict(const gtsam::Pose3& pose_i, Vector vel_i, const gtsam::imuBias::ConstantBias& bias,
|
||||||
Vector gravity, Vector omegaCoriolis) const;
|
// Vector gravity, Vector omegaCoriolis) const;
|
||||||
};
|
//};
|
||||||
|
//
|
||||||
virtual class ImuFactor : gtsam::NonlinearFactor {
|
//virtual class ImuFactor : gtsam::NonlinearFactor {
|
||||||
ImuFactor(size_t pose_i, size_t vel_i, size_t pose_j, size_t vel_j, size_t bias,
|
// ImuFactor(size_t pose_i, size_t vel_i, size_t pose_j, size_t vel_j, size_t bias,
|
||||||
const gtsam::PreintegratedImuMeasurements& preintegratedMeasurements, Vector gravity, Vector omegaCoriolis);
|
// const gtsam::PreintegratedImuMeasurements& preintegratedMeasurements, Vector gravity, Vector omegaCoriolis);
|
||||||
ImuFactor(size_t pose_i, size_t vel_i, size_t pose_j, size_t vel_j, size_t bias,
|
// ImuFactor(size_t pose_i, size_t vel_i, size_t pose_j, size_t vel_j, size_t bias,
|
||||||
const gtsam::PreintegratedImuMeasurements& preintegratedMeasurements, Vector gravity, Vector omegaCoriolis,
|
// const gtsam::PreintegratedImuMeasurements& preintegratedMeasurements, Vector gravity, Vector omegaCoriolis,
|
||||||
const gtsam::Pose3& body_P_sensor);
|
// const gtsam::Pose3& body_P_sensor);
|
||||||
// Standard Interface
|
// // Standard Interface
|
||||||
gtsam::PreintegratedImuMeasurements preintegratedMeasurements() const;
|
// gtsam::PreintegratedImuMeasurements preintegratedMeasurements() const;
|
||||||
};
|
//};
|
||||||
|
//
|
||||||
#include <gtsam/navigation/CombinedImuFactor.h>
|
//#include <gtsam/navigation/CombinedImuFactor.h>
|
||||||
class PreintegratedCombinedMeasurements {
|
//class PreintegratedCombinedMeasurements {
|
||||||
// Standard Constructor
|
// // Standard Constructor
|
||||||
PreintegratedCombinedMeasurements(
|
// PreintegratedCombinedMeasurements(
|
||||||
const gtsam::imuBias::ConstantBias& bias,
|
// const gtsam::imuBias::ConstantBias& bias,
|
||||||
Matrix measuredAccCovariance,
|
// Matrix measuredAccCovariance,
|
||||||
Matrix measuredOmegaCovariance,
|
// Matrix measuredOmegaCovariance,
|
||||||
Matrix integrationErrorCovariance,
|
// Matrix integrationErrorCovariance,
|
||||||
Matrix biasAccCovariance,
|
// Matrix biasAccCovariance,
|
||||||
Matrix biasOmegaCovariance,
|
// Matrix biasOmegaCovariance,
|
||||||
Matrix biasAccOmegaInit);
|
// Matrix biasAccOmegaInit);
|
||||||
PreintegratedCombinedMeasurements(
|
// PreintegratedCombinedMeasurements(
|
||||||
const gtsam::imuBias::ConstantBias& bias,
|
// const gtsam::imuBias::ConstantBias& bias,
|
||||||
Matrix measuredAccCovariance,
|
// Matrix measuredAccCovariance,
|
||||||
Matrix measuredOmegaCovariance,
|
// Matrix measuredOmegaCovariance,
|
||||||
Matrix integrationErrorCovariance,
|
// Matrix integrationErrorCovariance,
|
||||||
Matrix biasAccCovariance,
|
// Matrix biasAccCovariance,
|
||||||
Matrix biasOmegaCovariance,
|
// Matrix biasOmegaCovariance,
|
||||||
Matrix biasAccOmegaInit,
|
// Matrix biasAccOmegaInit,
|
||||||
bool use2ndOrderIntegration);
|
// bool use2ndOrderIntegration);
|
||||||
// PreintegratedCombinedMeasurements(const gtsam::PreintegratedCombinedMeasurements& rhs);
|
// // PreintegratedCombinedMeasurements(const gtsam::PreintegratedCombinedMeasurements& rhs);
|
||||||
|
//
|
||||||
// Testable
|
// // Testable
|
||||||
void print(string s) const;
|
// void print(string s) const;
|
||||||
bool equals(const gtsam::PreintegratedCombinedMeasurements& expected, double tol);
|
// bool equals(const gtsam::PreintegratedCombinedMeasurements& expected, double tol);
|
||||||
|
//
|
||||||
double deltaTij() const;
|
// double deltaTij() const;
|
||||||
gtsam::Rot3 deltaRij() const;
|
// gtsam::Rot3 deltaRij() const;
|
||||||
Vector deltaPij() const;
|
// Vector deltaPij() const;
|
||||||
Vector deltaVij() const;
|
// Vector deltaVij() const;
|
||||||
Vector biasHatVector() const;
|
// Vector biasHatVector() const;
|
||||||
Matrix delPdelBiasAcc() const;
|
// Matrix delPdelBiasAcc() const;
|
||||||
Matrix delPdelBiasOmega() const;
|
// Matrix delPdelBiasOmega() const;
|
||||||
Matrix delVdelBiasAcc() const;
|
// Matrix delVdelBiasAcc() const;
|
||||||
Matrix delVdelBiasOmega() const;
|
// Matrix delVdelBiasOmega() const;
|
||||||
Matrix delRdelBiasOmega() const;
|
// Matrix delRdelBiasOmega() const;
|
||||||
Matrix preintMeasCov() const;
|
// Matrix preintMeasCov() const;
|
||||||
|
//
|
||||||
// Standard Interface
|
// // Standard Interface
|
||||||
void integrateMeasurement(Vector measuredAcc, Vector measuredOmega, double deltaT);
|
// void integrateMeasurement(Vector measuredAcc, Vector measuredOmega, double deltaT);
|
||||||
gtsam::PoseVelocityBias predict(const gtsam::Pose3& pose_i, Vector vel_i, const gtsam::imuBias::ConstantBias& bias,
|
// gtsam::PoseVelocityBias predict(const gtsam::Pose3& pose_i, Vector vel_i, const gtsam::imuBias::ConstantBias& bias,
|
||||||
Vector gravity, Vector omegaCoriolis) const;
|
// Vector gravity, Vector omegaCoriolis) const;
|
||||||
};
|
//};
|
||||||
|
//
|
||||||
virtual class CombinedImuFactor : gtsam::NonlinearFactor {
|
//virtual class CombinedImuFactor : gtsam::NonlinearFactor {
|
||||||
CombinedImuFactor(size_t pose_i, size_t vel_i, size_t pose_j, size_t vel_j, size_t bias_i, size_t bias_j,
|
// CombinedImuFactor(size_t pose_i, size_t vel_i, size_t pose_j, size_t vel_j, size_t bias_i, size_t bias_j,
|
||||||
const gtsam::PreintegratedCombinedMeasurements& CombinedPreintegratedMeasurements, Vector gravity, Vector omegaCoriolis);
|
// const gtsam::PreintegratedCombinedMeasurements& CombinedPreintegratedMeasurements, Vector gravity, Vector omegaCoriolis);
|
||||||
// Standard Interface
|
// // Standard Interface
|
||||||
gtsam::PreintegratedCombinedMeasurements preintegratedMeasurements() const;
|
// gtsam::PreintegratedCombinedMeasurements preintegratedMeasurements() const;
|
||||||
};
|
//};
|
||||||
|
//
|
||||||
#include <gtsam/navigation/AHRSFactor.h>
|
#include <gtsam/navigation/AHRSFactor.h>
|
||||||
class PreintegratedAhrsMeasurements {
|
class PreintegratedAhrsMeasurements {
|
||||||
// Standard Constructor
|
// Standard Constructor
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue