Merged develop into fix/matlab-serialization-test

release/4.3a0
Chris Beall 2015-05-20 22:57:21 -04:00
commit 899b8df6a8
2 changed files with 2 additions and 1 deletions

View File

@ -21,6 +21,7 @@
#include <gtsam/base/FastDefaultAllocator.h>
#include <boost/mpl/has_xxx.hpp>
#include <boost/utility/enable_if.hpp>
#include <boost/serialization/serialization.hpp>
#include <boost/serialization/nvp.hpp>
#include <boost/serialization/set.hpp>
#include <set>

View File

@ -132,7 +132,7 @@ TEST(AHRSFactor, Error) {
pre_int_data.integrateMeasurement(measuredOmega, deltaT);
// Create factor
AHRSFactor factor(X(1), X(2), B(1), pre_int_data, omegaCoriolis, false);
AHRSFactor factor(X(1), X(2), B(1), pre_int_data, omegaCoriolis, boost::none);
Vector3 errorActual = factor.evaluateError(x1, x2, bias);