Changeset 2224 for trunk/psLib/src/math/psConstants.h

Timestamp:

Oct 27, 2004, 2:22:53 PM (22 years ago)

Author:

gusciora

Message:

Added parameter checking to psStats.c

File:

• trunk/psLib/src/math/psConstants.h (modified) (3 diffs)

trunk/psLib/src/math/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 23:31:43 $
+ *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-28 00:22:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
 #define PS_INT_CHECK_NON_NEGATIVE(NAME, RVAL) \
 if (NAME < 0) { \
-    psError(__func__,"%s is less than 0.", #NAME); \
+    psError(__func__,"Error: %s is less than 0.", #NAME); \
     return(RVAL); \
 }
@@ -38 +38 @@
 #define PS_INT_CHECK_POSITIVE(NAME, RVAL) \
 if (NAME < 1) { \
-    psError(__func__,"%s is 0 or less.", #NAME); \
-    return(RVAL); \
-}
-
+    psError(__func__,"Error: %s is 0 or less.", #NAME); \
+    return(RVAL); \
+}
+
+// Produce an error if ((NAME1 > NAME2)
 #define PS_INT_COMPARE(NAME1, NAME2, RVAL) \
-if (NAME1 < NAME2) { \
-    psError(__func__,"%s is less than %s (%d < %D).", #NAME1, #NAME2, NAME1, NAME2); \
-    return(RVAL); \
-}
-
-
+if (NAME1 > NAME2) { \
+    psError(__func__,"Error: (%s > %s) (%d %d).", #NAME1, #NAME2, NAME1, NAME2); \
+    return(RVAL); \
+}
+
+
+// Produce an error if ((NAME1 > NAME2)
 #define PS_FLOAT_COMPARE(NAME1, NAME2, RVAL) \
-if ((NAME1 - NAME2) < -FLT_EPSILON) { \
-    psError(__func__,"%s is less than %s.", #NAME1, #NAME2); \
-    return(RVAL); \
-}
-
-
+if (NAME1 > NAME2) { \
+    psError(__func__,"Error: (%s > %s) (%f %f)", #NAME1, #NAME2, NAME1, NAME2); \
+    return(RVAL); \
+}
+
+#define PS_FLOAT_CHECK_NON_EQUAL(NAME1, NAME2, RVAL) \
+if (fabs(NAME2 - NAME1) < FLT_EPSILON) { \
+    psError(__func__,"Error: %s and %s are equal.", #NAME1, #NAME2); \
+    return(RVAL); \
+}
 
 /*****************************************************************************