Merged latest updates from trunk

This commit is contained in:
Benoit Steiner 2016-05-17 09:14:22 -07:00
commit a910bcee43
2 changed files with 3 additions and 3 deletions

View File

@ -525,7 +525,7 @@ template<typename ArrayType> void array_complex(const ArrayType& m)
// scalar by array division // scalar by array division
Scalar s1 = internal::random<Scalar>(); Scalar s1 = internal::random<Scalar>();
const RealScalar tiny = sqrt(std::numeric_limits<RealScalar>::epsilon()); const RealScalar tiny = std::sqrt(std::numeric_limits<RealScalar>::epsilon());
s1 += Scalar(tiny); s1 += Scalar(tiny);
m1 += ArrayType::Constant(rows,cols,Scalar(tiny)); m1 += ArrayType::Constant(rows,cols,Scalar(tiny));
VERIFY_IS_APPROX(s1/m1, s1 * m1.inverse()); VERIFY_IS_APPROX(s1/m1, s1 * m1.inverse());

View File

@ -16,8 +16,8 @@ using Eigen::RowMajor;
static void test_1d() static void test_1d()
{ {
Tensor<float, 1> vec1({6}); Tensor<float, 1> vec1(6);
Tensor<float, 1, RowMajor> vec2({6}); Tensor<float, 1, RowMajor> vec2(6);
vec1(0) = 4.0; vec2(0) = 0.0; vec1(0) = 4.0; vec2(0) = 0.0;
vec1(1) = 8.0; vec2(1) = 1.0; vec1(1) = 8.0; vec2(1) = 1.0;