From 324fe7f43a01151080f04d5d31e78ff0ac88ca2e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tom=C3=A1=C5=A1=20Oberhuber?= <oberhuber.tomas@gmail.com>
Date: Thu, 11 Jul 2019 21:23:31 +0200
Subject: [PATCH] Fixed vector unit tests.
---
src/UnitTests/Containers/VectorTest-1.h | 4 ++--
src/UnitTests/Containers/VectorTest-5.h | 4 ++--
src/UnitTests/Containers/VectorTest-6.h | 2 +-
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/UnitTests/Containers/VectorTest-1.h b/src/UnitTests/Containers/VectorTest-1.h
index 0dd8f8f85c..9706834f6c 100644
--- a/src/UnitTests/Containers/VectorTest-1.h
+++ b/src/UnitTests/Containers/VectorTest-1.h
@@ -260,8 +260,8 @@ TYPED_TEST( VectorTest, addVectors )
VectorType expected1( size ), expected2( size );
for( int i = 0; i < size; i++ ) {
- expected1.setElement( i, 1.0 + 3.0 * i + 2.0;
- expected2.setElement( i, 2.0 + 3.0 * i + 2.0;
+ expected1.setElement( i, 1.0 + 3.0 * i + 2.0 );
+ expected2.setElement( i, 2.0 + 3.0 * i + 2.0 );
}
setConstantSequence( x, 1 );
diff --git a/src/UnitTests/Containers/VectorTest-5.h b/src/UnitTests/Containers/VectorTest-5.h
index 0e460af0f3..e4bf72a19d 100644
--- a/src/UnitTests/Containers/VectorTest-5.h
+++ b/src/UnitTests/Containers/VectorTest-5.h
@@ -51,8 +51,8 @@ TYPED_TEST( VectorTest, differenceMin )
EXPECT_EQ( min( u - v ), - size / 2 );
EXPECT_EQ( min( u_view - v_view ), - size / 2 );
EXPECT_EQ( VectorOperations::getVectorDifferenceMin( u, v ), - size / 2 );
- EXPECT_TRUE( min( v, u ) == size / 2 - size + 1 );
- EXPECT_TRUE( min( v_view, u_view ) == size / 2 - size + 1 );
+ EXPECT_TRUE( min( v - u ) == size / 2 - size + 1 );
+ EXPECT_TRUE( min( v_view - u_view ) == size / 2 - size + 1 );
EXPECT_EQ( VectorOperations::getVectorDifferenceMin( v, u ), size / 2 - size + 1 );
}
diff --git a/src/UnitTests/Containers/VectorTest-6.h b/src/UnitTests/Containers/VectorTest-6.h
index 5bdc13b5d1..62dd1581ce 100644
--- a/src/UnitTests/Containers/VectorTest-6.h
+++ b/src/UnitTests/Containers/VectorTest-6.h
@@ -82,7 +82,7 @@ TYPED_TEST( VectorTest, verticalOperations )
//EXPECT_EQ( sign( u ), v );
for( int i = 0; i < size; i++ )
- EXPECT_NEAR( sign( u ).getElement( i ), v.getElement( i ), 1.0e-6 );
+ EXPECT_NEAR( sign( u ).getElement( i ), sign( u.getElement( i ) ), 1.0e-6 );
}
// TODO: test prefix sum with custom begin and end parameters
--
GitLab