diff --git a/gtsam/3rdparty/Eigen/Eigen/src/Core/GeneralProduct.h b/gtsam/3rdparty/Eigen/Eigen/src/Core/GeneralProduct.h index ee63f6a89..9e805a80f 100644 --- a/gtsam/3rdparty/Eigen/Eigen/src/Core/GeneralProduct.h +++ b/gtsam/3rdparty/Eigen/Eigen/src/Core/GeneralProduct.h @@ -257,7 +257,7 @@ template class GeneralProduct : public ProductBase, Lhs, Rhs> { - template struct IsRowMajorType : internal::conditional<(int(T::Flags)&RowMajorBit), internal::true_type, internal::false_type>::type {}; + template struct IsRowMajor : internal::conditional<(int(T::Flags)&RowMajorBit), internal::true_type, internal::false_type>::type {}; public: EIGEN_PRODUCT_PUBLIC_INTERFACE(GeneralProduct) @@ -281,22 +281,22 @@ class GeneralProduct template inline void evalTo(Dest& dest) const { - internal::outer_product_selector_run(*this, dest, set(), IsRowMajorType()); + internal::outer_product_selector_run(*this, dest, set(), IsRowMajor()); } template inline void addTo(Dest& dest) const { - internal::outer_product_selector_run(*this, dest, add(), IsRowMajorType()); + internal::outer_product_selector_run(*this, dest, add(), IsRowMajor()); } template inline void subTo(Dest& dest) const { - internal::outer_product_selector_run(*this, dest, sub(), IsRowMajorType()); + internal::outer_product_selector_run(*this, dest, sub(), IsRowMajor()); } template void scaleAndAddTo(Dest& dest, const Scalar& alpha) const { - internal::outer_product_selector_run(*this, dest, adds(alpha), IsRowMajorType()); + internal::outer_product_selector_run(*this, dest, adds(alpha), IsRowMajor()); } }; diff --git a/gtsam/navigation/tests/testImuFactor.cpp b/gtsam/navigation/tests/testImuFactor.cpp index daa8d0b26..084213e20 100644 --- a/gtsam/navigation/tests/testImuFactor.cpp +++ b/gtsam/navigation/tests/testImuFactor.cpp @@ -156,7 +156,7 @@ bool MonteCarlo(const PreintegratedImuMeasurements& pim, for (size_t i = 0; i < N; i++) { Vector9 xi = samples.col(i); xi -= sampleMean; - Q += xi * xi.transpose() / (N - 1); + Q += xi * (xi.transpose() / (N - 1)); } // Compare MonteCarlo value with actual (computed) value