King_DuckZ/DoorKeeper
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix vector comparison and add unit test.

Browse source
This commit is contained in:
King_DuckZ 2015-07-30 01:48:29 +02:00
parent 6aa4d15381
commit 971cd54688
3 changed files with 39 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
include/doorkeeper/implem/vector.inl
View file

@ -199,35 +199,27 @@ namespace cloonel {
///-------------------------------------------------------------------------- ///--------------------------------------------------------------------------
template <typename T, typename U, uint32_t S> template <typename T, typename U, uint32_t S>
inline bool operator< (const Vector<T, S>& parA, const Vector<U, S>& parB) { inline bool operator< (const Vector<T, S>& parA, const Vector<U, S>& parB) {
bool retVal = false; bool retVal = true;
for (uint32_t z = 0; z < S; ++z) { for (uint32_t z = 0; z < S; ++z) {
retVal |= static_cast<bool>(parA[z] < parB[z]); retVal &= static_cast<bool>(parA[z] < parB[z]);
} }
return retVal; return retVal;
} }
template <typename T, typename U, uint32_t S> template <typename T, typename U, uint32_t S>
inline bool operator> (const Vector<T, S>& parA, const Vector<U, S>& parB) { inline bool operator> (const Vector<T, S>& parA, const Vector<U, S>& parB) {
bool retVal = false; return not (parA <= parB);
for (uint32_t z = 0; z < S; ++z) {
retVal |= static_cast<bool>(parA[z] > parB[z]);
}
return retVal;
} }
template <typename T, typename U, uint32_t S> template <typename T, typename U, uint32_t S>
inline bool operator<= (const Vector<T, S>& parA, const Vector<U, S>& parB) { inline bool operator<= (const Vector<T, S>& parA, const Vector<U, S>& parB) {
bool retVal = false; bool retVal = true;
for (uint32_t z = 0; z < S; ++z) { for (uint32_t z = 0; z < S; ++z) {
retVal |= static_cast<bool>(parA[z] <= parB[z]); retVal &= static_cast<bool>(parA[z] <= parB[z]);
} }
return retVal; return retVal;
} }
template <typename T, typename U, uint32_t S> template <typename T, typename U, uint32_t S>
inline bool operator>= (const Vector<T, S>& parA, const Vector<U, S>& parB) { inline bool operator>= (const Vector<T, S>& parA, const Vector<U, S>& parB) {
bool retVal = false; return not (parA < parB);
for (uint32_t z = 0; z < S; ++z) {
retVal |= static_cast<bool>(parA[z] >= parB[z]);
}
return retVal;
} }
template <typename T, typename U, uint32_t S> template <typename T, typename U, uint32_t S>
inline bool operator== (const Vector<T, S>& parA, const Vector<U, S>& parB) { inline bool operator== (const Vector<T, S>& parA, const Vector<U, S>& parB) {

1
test/unit/CMakeLists.txt
View file

@ -11,6 +11,7 @@ include_directories(SYSTEM
add_executable(${PROJECT_NAME} add_executable(${PROJECT_NAME}
"${CMAKE_CURRENT_SOURCE_DIR}/../gtest-1.7.0/src/gtest_main.cc" "${CMAKE_CURRENT_SOURCE_DIR}/../gtest-1.7.0/src/gtest_main.cc"
tilecoords.cpp tilecoords.cpp
vector.cpp
) )
target_link_libraries(${PROJECT_NAME} target_link_libraries(${PROJECT_NAME}

32
test/unit/vector.cpp Normal file
View file

@ -0,0 +1,32 @@
#include <gtest/gtest.h>
#include "doorkeeper/primitivetypes.hpp"
TEST(misc, vector) {
{
typedef dk::Vector<2> coords2;
const coords2 small(5, 6);
EXPECT_EQ(small.x(), 5);
EXPECT_EQ(small.y(), 6);
const coords2 med(1200, 4000);
EXPECT_LT(small, med);
EXPECT_LE(small, med);
EXPECT_GT(med, small);
EXPECT_GE(med, small);
const coords2 big(10000, 12345);
EXPECT_GT(big, med);
EXPECT_GT(big, small);
EXPECT_LT(small, big);
const coords2 med2_a(1200, 4001);
EXPECT_LE(med, med2_a);
EXPECT_GE(med2_a, med);
EXPECT_FALSE(med2_a < med);
EXPECT_FALSE(med2_a == med);
EXPECT_FALSE(med > med2_a);
}
}