Bläddra i källkod

fixed Nice::isNaN

unknown 12 år sedan
förälder
incheckning
2a947930ab
4 ändrade filer med 7 tillägg och 7 borttagningar
  1. 3 3
      core/basics/cppunitex.h
  2. 1 1
      core/vector/MatrixT.tcc
  3. 1 1
      core/vector/RowMatrixT.tcc
  4. 2 2
      core/vector/cppunitex.h

+ 3 - 3
core/basics/cppunitex.h

@@ -29,13 +29,13 @@
  * CppUnit macro asserting that \c b is NOT NaN (Not a Number)
  */
 #define CPPUNIT_ASSERT_NOT_NAN(b) \
-        CPPUNIT_ASSERT_MESSAGE("Value is NaN", !isNaN(b));
+        CPPUNIT_ASSERT_MESSAGE("Value is NaN", !NICE::isNaN(b));
 
 /**
  * CppUnit macro asserting that \c b IS NaN (Not a Number)
  */
 #define CPPUNIT_ASSERT_IS_NAN(b) \
-        CPPUNIT_ASSERT_MESSAGE("Value is not NaN", isNaN(b));
+        CPPUNIT_ASSERT_MESSAGE("Value is not NaN", NICE::isNaN(b));
 
 
 /**
@@ -44,7 +44,7 @@
 #define CPPUNIT_ASSERT_DOUBLES_EQUAL_NOT_NAN_STREAMABLE(a,b,c,s) \
   { \
     bool uaieuaieOK = true; \
-    if (!isZero(double(a) - double(b), double(c)) || isNaN(b)) { \
+    if (!isZero(double(a) - double(b), double(c)) || NICE::isNaN(b)) { \
       uaieuaieOK = false; \
     } \
     CPPUNIT_ASSERT_STREAMABLE(uaieuaieOK, \

+ 1 - 1
core/vector/MatrixT.tcc

@@ -673,7 +673,7 @@ MatrixT<ElementType>::operator _Op##= (const MatrixT<ElementType>& v) {   \
 		{
 			for (unsigned int r = 0; r < rows(); r++)
 			{
-				if (isNaN((*this)(r, c)))
+				if (NICE::isNaN((*this)(r, c)))
 				{
 					return true;
 				}

+ 1 - 1
core/vector/RowMatrixT.tcc

@@ -383,7 +383,7 @@ template<typename ElementType>
 bool RowMatrixT<ElementType>::containsNaN() const {
   for (unsigned int r = 0; r < rows(); r++) {
     for (unsigned int c = 0; c < cols(); c++) {
-      if (isNaN((*this)(r, c))) {
+      if (NICE::isNaN((*this)(r, c))) {
         return true;
       }
     }

+ 2 - 2
core/vector/cppunitex.h

@@ -23,7 +23,7 @@
     bool uaieuaieOK = true; \
     for (uint uiaeuiae = 0; uiaeuiae < (a).size(); ++uiaeuiae) { \
       if (!isZero((a)[uiaeuiae] - (b)[uiaeuiae], (c)) \
-          || isNaN((b)[uiaeuiae])) { \
+          || NICE::isNaN((b)[uiaeuiae])) { \
         uaieuaieOK = false; \
         break; \
       } \
@@ -51,7 +51,7 @@
     for (uint uiaeuiae = 0; uiaeuiae < (a).cols(); ++uiaeuiae) { \
       for (uint uiaeuiae2 = 0; uiaeuiae2 < (a).rows(); ++uiaeuiae2) { \
         if (!isZero((a)(uiaeuiae,uiaeuiae2) - (b)(uiaeuiae, uiaeuiae2), (c)) \
-            || isNaN((b)(uiaeuiae, uiaeuiae2))) {\
+            || NICE::isNaN((b)(uiaeuiae, uiaeuiae2))) {\
           uaieuaieOK = false; \
           break; \
         } \