Merge pull request #260 from borglab/fix/cmake-wrapper-warnings
Fixed some wrapper warningsrelease/4.3a0
commit
9361d5b491
|
@ -421,6 +421,10 @@ add_subdirectory(CppUnitLite)
|
||||||
# Build wrap
|
# Build wrap
|
||||||
if (GTSAM_BUILD_WRAP)
|
if (GTSAM_BUILD_WRAP)
|
||||||
add_subdirectory(wrap)
|
add_subdirectory(wrap)
|
||||||
|
# suppress warning of cython line being too long
|
||||||
|
if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
|
||||||
|
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-misleading-indentation")
|
||||||
|
endif()
|
||||||
endif(GTSAM_BUILD_WRAP)
|
endif(GTSAM_BUILD_WRAP)
|
||||||
|
|
||||||
# Build GTSAM library
|
# Build GTSAM library
|
||||||
|
|
|
@ -159,7 +159,7 @@ TEST (EssentialMatrix, rotate) {
|
||||||
Matrix actH1, actH2;
|
Matrix actH1, actH2;
|
||||||
try {
|
try {
|
||||||
bodyE.rotate(cRb, actH1, actH2);
|
bodyE.rotate(cRb, actH1, actH2);
|
||||||
} catch (exception e) {
|
} catch (exception& e) {
|
||||||
} // avoid exception
|
} // avoid exception
|
||||||
Matrix expH1 = numericalDerivative21(rotate_, bodyE, cRb), //
|
Matrix expH1 = numericalDerivative21(rotate_, bodyE, cRb), //
|
||||||
expH2 = numericalDerivative22(rotate_, bodyE, cRb);
|
expH2 = numericalDerivative22(rotate_, bodyE, cRb);
|
||||||
|
|
|
@ -29,6 +29,13 @@ struct GTSAM_EXPORT PreintegrationParams: PreintegratedRotationParams {
|
||||||
bool use2ndOrderCoriolis; ///< Whether to use second order Coriolis integration
|
bool use2ndOrderCoriolis; ///< Whether to use second order Coriolis integration
|
||||||
Vector3 n_gravity; ///< Gravity vector in nav frame
|
Vector3 n_gravity; ///< Gravity vector in nav frame
|
||||||
|
|
||||||
|
/// Default constructor for serialization only
|
||||||
|
PreintegrationParams()
|
||||||
|
: accelerometerCovariance(I_3x3),
|
||||||
|
integrationCovariance(I_3x3),
|
||||||
|
use2ndOrderCoriolis(false),
|
||||||
|
n_gravity(0, 0, -1) {}
|
||||||
|
|
||||||
/// The Params constructor insists on getting the navigation frame gravity vector
|
/// The Params constructor insists on getting the navigation frame gravity vector
|
||||||
/// For convenience, two commonly used conventions are provided by named constructors below
|
/// For convenience, two commonly used conventions are provided by named constructors below
|
||||||
PreintegrationParams(const Vector3& n_gravity)
|
PreintegrationParams(const Vector3& n_gravity)
|
||||||
|
@ -60,8 +67,6 @@ struct GTSAM_EXPORT PreintegrationParams: PreintegratedRotationParams {
|
||||||
bool getUse2ndOrderCoriolis() const { return use2ndOrderCoriolis; }
|
bool getUse2ndOrderCoriolis() const { return use2ndOrderCoriolis; }
|
||||||
|
|
||||||
protected:
|
protected:
|
||||||
/// Default constructor for serialization only: uninitialized!
|
|
||||||
PreintegrationParams() {}
|
|
||||||
|
|
||||||
/** Serialization function */
|
/** Serialization function */
|
||||||
friend class boost::serialization::access;
|
friend class boost::serialization::access;
|
||||||
|
|
|
@ -64,9 +64,9 @@ TEST(ImuFactor, serialization) {
|
||||||
|
|
||||||
ImuFactor factor(1, 2, 3, 4, 5, pim);
|
ImuFactor factor(1, 2, 3, 4, 5, pim);
|
||||||
|
|
||||||
EXPECT(equalsObj(factor));
|
EXPECT(equalsObj<ImuFactor>(factor));
|
||||||
EXPECT(equalsXML(factor));
|
EXPECT(equalsXML<ImuFactor>(factor));
|
||||||
EXPECT(equalsBinary(factor));
|
EXPECT(equalsBinary<ImuFactor>(factor));
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ************************************************************************* */
|
/* ************************************************************************* */
|
||||||
|
|
|
@ -175,6 +175,8 @@ public:
|
||||||
|
|
||||||
/// @}
|
/// @}
|
||||||
|
|
||||||
|
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
/** Serialization function */
|
/** Serialization function */
|
||||||
|
@ -263,6 +265,8 @@ public:
|
||||||
traits<X>::Print(value_, "Value");
|
traits<X>::Print(value_, "Value");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
/** Serialization function */
|
/** Serialization function */
|
||||||
|
@ -327,6 +331,8 @@ public:
|
||||||
return traits<X>::Local(x1,x2);
|
return traits<X>::Local(x1,x2);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
/** Serialization function */
|
/** Serialization function */
|
||||||
|
|
|
@ -237,13 +237,16 @@ Values localToWorld(const Values& local, const Pose2& base,
|
||||||
// if value is a Pose2, compose it with base pose
|
// if value is a Pose2, compose it with base pose
|
||||||
Pose2 pose = local.at<Pose2>(key);
|
Pose2 pose = local.at<Pose2>(key);
|
||||||
world.insert(key, base.compose(pose));
|
world.insert(key, base.compose(pose));
|
||||||
} catch (std::exception e1) {
|
} catch (const std::exception& e1) {
|
||||||
try {
|
try {
|
||||||
// if value is a Point2, transform it from base pose
|
// if value is a Point2, transform it from base pose
|
||||||
Point2 point = local.at<Point2>(key);
|
Point2 point = local.at<Point2>(key);
|
||||||
world.insert(key, base.transformFrom(point));
|
world.insert(key, base.transformFrom(point));
|
||||||
} catch (std::exception e2) {
|
} catch (const std::exception& e2) {
|
||||||
// if not Pose2 or Point2, do nothing
|
// if not Pose2 or Point2, do nothing
|
||||||
|
#ifndef NDEBUG
|
||||||
|
std::cerr << "Values[key] is neither Pose2 nor Point2, so skip" << std::endl;
|
||||||
|
#endif
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -77,6 +77,8 @@ public:
|
||||||
void print(const std::string& s = "") const;
|
void print(const std::string& s = "") const;
|
||||||
|
|
||||||
virtual ~AHRS();
|
virtual ~AHRS();
|
||||||
|
|
||||||
|
EIGEN_MAKE_ALIGNED_OPERATOR_NEW
|
||||||
};
|
};
|
||||||
|
|
||||||
} /* namespace gtsam */
|
} /* namespace gtsam */
|
||||||
|
|
Loading…
Reference in New Issue