Changeset 4be8f0 for src/base/helper.hpp

Timestamp:

May 2, 2013, 12:40:49 PM (13 years ago)

Author:

Frederik Heber <heber@…>

Children:

240f83

Parents:

092b175

git-author:

Frederik Heber <heber@…> (08/10/12 21:38:23)

git-committer:

Frederik Heber <heber@…> (05/02/13 12:40:49)

Message:

FIX: Disabled has_quiet_NaN() and has_signaling_NaN() check in Helpers::CheckNumber().

File:

• src/base/helper.hpp (modified) (1 diff)

src/base/helper.hpp

@@ -85 +85 @@
   {
     bool valid = true;
-
-    // Check for nan
+/*
+    if (std::numeric_limits<vmg_float>::has_quiet_NaN) {
+      valid &= number != std::numeric_limits<vmg_float>::quiet_NaN();
+      assert(number != std::numeric_limits<vmg_float>::quiet_NaN());
+    }
+
+    if (std::numeric_limits<vmg_float>::has_signaling_NaN) {
+      valid &= number != std::numeric_limits<vmg_float>::signaling_NaN();
+      assert(number != std::numeric_limits<vmg_float>::signaling_NaN());
+    }
+*/
     valid &= number == number;
     assert(number == number);
 
-    // Check for infinity
-    if (!std::numeric_limits<T>::is_integer && std::numeric_limits<T>::has_denorm == std::denorm_present) {
-      valid &= number >= -1 * std::numeric_limits<T>::max();
-      valid &= number <= std::numeric_limits<T>::max();
-      assert(number >= -1 * std::numeric_limits<T>::max());
-      assert(number <= std::numeric_limits<T>::max());
-    }else {
-      valid &= number >= std::numeric_limits<T>::min();
-      valid &= number <= std::numeric_limits<T>::max();
-      assert(number >= std::numeric_limits<T>::min());
-      assert(number <= std::numeric_limits<T>::max());
+    if (std::numeric_limits<vmg_float>::has_infinity) {
+      valid &= number != std::numeric_limits<vmg_float>::infinity();
+      valid &= number != -1 * std::numeric_limits<vmg_float>::infinity();
+      assert(number != std::numeric_limits<vmg_float>::infinity());
+      assert(number != -1 * std::numeric_limits<vmg_float>::infinity());
     }