Changeset 19843

Timestamp:

Oct 2, 2008, 10:48:12 AM (18 years ago)

Author:

eugene

Message:

remove error call for matrix with non-finite elements

File:

• trunk/psLib/src/math/psMatrix.c (modified) (4 diffs)

trunk/psLib/src/math/psMatrix.c

@@ -22 +22 @@
  *  @author Andy Becker, University of Washington (SVD).
  *
- *  @version $Revision: 1.57 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2008-05-07 23:10:46 $
+ *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2008-10-02 20:48:12 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -329 +329 @@
     PS_ASSERT_VECTOR_SIZE(b, (long int)a->numCols, false);
 
+# if (0)
+    // XXX expand this out explicitly below
     // Check for non-finite entries
 #define MATRIX_CHECK_NONFINITE_CASE(TYPE,MATRIX) \
@@ -337 +339 @@
           for (int j = 0; j < numCols; j++) { \
               if (!isfinite(values[i][j])) { \
-                  psError(PS_ERR_BAD_PARAMETER_VALUE, 3, \
-                          "Input matrix contains non-finite elements: matrix[%d][%d] is %.2f\n", \
-                          i, j, values[i][j]); \
+                  // psError(PS_ERR_BAD_PARAMETER_VALUE, 3,             
+                  // "Input matrix contains non-finite elements: matrix[%d][%d] is %.2f\n", 
+                  // i, j, values[i][j]);                               
                   return false; \
               } \
@@ -346 +348 @@
       break; \
   }
+# endif
 
     // Check for non-finite entries in matrix
     switch (a->type.type) {
-        MATRIX_CHECK_NONFINITE_CASE(F32, a);
-        MATRIX_CHECK_NONFINITE_CASE(F64, a);
+      case PS_TYPE_F32: {
+          psF32 **values = a->data.F32; /* Dereference */
+          int numCols = a->numCols, numRows = a->numRows; /* Size of matrix */
+          for (int i = 0; i < numRows; i++) {
+              for (int j = 0; j < numCols; j++) {
+                  if (!isfinite(values[i][j])) {
+                      // psError(PS_ERR_BAD_PARAMETER_VALUE, 3,
+                      // "Input matrix contains non-finite elements: matrix[%d][%d] is %.2f\n",
+                      // i, j, values[i][j]);
+                      return false;
+                  }
+              }
+          }
+          break;
+      }
+      case PS_TYPE_F64: {
+          psF64 **values = a->data.F64; /* Dereference */
+          int numCols = a->numCols, numRows = a->numRows; /* Size of matrix */
+          for (int i = 0; i < numRows; i++) {
+              for (int j = 0; j < numCols; j++) {
+                  if (!isfinite(values[i][j])) {
+                      // psError(PS_ERR_BAD_PARAMETER_VALUE, 3,
+                      // "Input matrix contains non-finite elements: matrix[%d][%d] is %.2f\n",
+                      // i, j, values[i][j]);
+                      return false;
+                  }
+              }
+          }
+          break;
+      }
+        // MATRIX_CHECK_NONFINITE_CASE(F32, a);
+        // MATRIX_CHECK_NONFINITE_CASE(F64, a);
       default:
-        psAbort("Should never get here.");
+        psAbort("Should never get here.");
     }