Index: trunk/psLib/src/math/psConstants.h
===================================================================
--- trunk/psLib/src/math/psConstants.h	(revision 4028)
+++ trunk/psLib/src/math/psConstants.h	(revision 4029)
@@ -6,6 +6,6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-05-25 19:25:29 $
+ *  @version $Revision: 1.69 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-05-25 20:26:55 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -59,5 +59,5 @@
 *****************************************************************************/
 
-#define PS_INT_CHECK_EQUALS(NAME1, NAME2, RVAL) \
+#define PS_ASSERT_INT_UNEQUAL(NAME1, NAME2, RVAL) \
 if (NAME1 == NAME2) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
@@ -67,5 +67,5 @@
 }
 
-#define PS_INT_CHECK_NON_EQUALS(NAME1, NAME2, RVAL) \
+#define PS_ASSERT_INT_EQUAL(NAME1, NAME2, RVAL) \
 if (NAME1 != NAME2) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
@@ -76,5 +76,5 @@
 
 // Return an error if the arg is less than zero.
-#define PS_INT_CHECK_NEGATIVE(NAME, RVAL) \
+#define PS_ASSERT_INT_NONNEGATIVE(NAME, RVAL) \
 if (NAME < 0) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
@@ -86,5 +86,5 @@
 // XXX: This naming scheme is opposite most other macros.  This should be
 // corrected as soon as a fresh checkin/out can be performed.
-#define PS_INT_CHECK_NON_NEGATIVE(NAME, RVAL) \
+#define PS_ASSERT_INT_NONNEGATIVE(NAME, RVAL) \
 if (NAME < 0) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
@@ -96,5 +96,5 @@
 // XXX: This naming scheme is opposite most other macros.  This should be
 // corrected as soon as a fresh checkin/out can be performed.
-#define PS_INT_CHECK_POSITIVE(NAME, RVAL) \
+#define PS_ASSERT_INT_POSITIVE(NAME, RVAL) \
 if (NAME < 1) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
@@ -104,5 +104,5 @@
 
 // Return an error if the arg is not equal to zero.
-#define PS_INT_CHECK_NON_ZERO(NAME, RVAL) \
+#define PS_ASSERT_INT_ZERO(NAME, RVAL) \
 if (NAME != 0) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
@@ -112,5 +112,5 @@
 
 // Return an error if the arg is equal to zero.
-#define PS_INT_CHECK_ZERO(NAME, RVAL) \
+#define PS_ASSERT_INT_NONZERO(NAME, RVAL) \
 if (NAME == 0) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
@@ -120,5 +120,5 @@
 
 // Return an error if the arg is lies outside the supplied range.
-#define PS_INT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \
+#define PS_ASSERT_INT_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \
 if ((int)NAME < LOWER || (int)NAME > UPPER) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
@@ -148,5 +148,5 @@
 // Generate an error if the two floats are equal.
 // XXX: Inconsistent naming.
-#define PS_FLOAT_CHECK_NON_EQUAL(NAME1, NAME2, RVAL) \
+#define PS_ASSERT_FLOAT_NON_EQUAL(NAME1, NAME2, RVAL) \
 if (fabs(NAME2 - NAME1) < FLT_EPSILON) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
@@ -157,5 +157,5 @@
 
 // Return an error if the arg is lies outside the supplied range.
-#define PS_FLOAT_CHECK_RANGE(NAME, LOWER, UPPER, RVAL) \
+#define PS_ASSERT_FLOAT_WITHIN_RANGE(NAME, LOWER, UPPER, RVAL) \
 if ((NAME) < (LOWER) || (NAME) > (UPPER)) { \
     psError(PS_ERR_BAD_PARAMETER_VALUE, true, \
@@ -169,6 +169,6 @@
 the wrong type.
 *****************************************************************************/
-#define PS_PTR_CHECK_NULL(NAME, RVAL) PS_PTR_CHECK_NULL_GENERAL(NAME, return RVAL)
-#define PS_PTR_CHECK_NULL_GENERAL(NAME, CLEANUP) \
+#define PS_ASSERT_PTR_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_PTR_NON_NULL(NAME, return RVAL)
+#define PS_ASSERT_GENERAL_PTR_NON_NULL(NAME, CLEANUP) \
 if (NAME == NULL) { \
     psError(PS_ERR_BAD_PARAMETER_NULL, true, \
@@ -178,5 +178,5 @@
 }
 
-#define PS_PTR_CHECK_TYPE(NAME, TYPE, RVAL) \
+#define PS_ASSERT_PTR_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
@@ -186,6 +186,6 @@
 }
 
-#define PS_PTR_CHECK_DIMEN(NAME, DIMEN, RVAL) PS_PTR_CHECK_DIMEN_GENERAL(NAME, DIMEN, return RVAL)
-#define PS_PTR_CHECK_DIMEN_GENERAL(NAME, DIMEN, CLEANUP) \
+#define PS_ASSERT_PTR_DIMEN(NAME, DIMEN, RVAL) PS_ASSERT_GENERAL_PTR_DIMEN(NAME, DIMEN, return RVAL)
+#define PS_ASSERT_GENERAL_PTR_DIMEN(NAME, DIMEN, CLEANUP) \
 if (NAME->type.dimen != DIMEN) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
@@ -195,5 +195,5 @@
 }
 
-#define PS_PTR_CHECK_DIMEN_GENERAL_NOT(NAME, DIMEN, CLEANUP) \
+#define PS_ASSERT_PTR_DIMEN_GENERAL_NOT(NAME, DIMEN, CLEANUP) \
 if (NAME->type.dimen == DIMEN) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
@@ -204,5 +204,5 @@
 
 
-#define PS_PTR_CHECK_SIZE_EQUAL(PTR1, PTR2, RVAL) \
+#define PS_ASSERT_PTRS_SIZE_EQUAL(PTR1, PTR2, RVAL) \
 if (PTR1->n != PTR2->n) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
@@ -212,7 +212,6 @@
 }
 
-#define PS_PTR_CHECK_TYPE_EQUAL(PTR1, PTR2, RVAL) PS_PTR_CHECK_TYPE_EQUAL_GENERAL(PTR1, PTR2, return RVAL)
-
-#define PS_PTR_CHECK_TYPE_EQUAL_GENERAL(PTR1, PTR2, CLEANUP) \
+#define PS_ASSERT_PTR_TYPE_EQUAL(PTR1, PTR2, RVAL) PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(PTR1, PTR2, return RVAL)
+#define PS_ASSERT_PTRS_TYPE_EQUAL_GENERAL(PTR1, PTR2, CLEANUP) \
 if (PTR1->type.type != PTR2->type.type) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
@@ -226,6 +225,6 @@
     PS_VECTOR macros:
  *****************************************************************************/
-#define PS_VECTOR_CHECK_NULL(NAME, RVAL) PS_VECTOR_CHECK_NULL_GENERAL(NAME, return RVAL)
-#define PS_VECTOR_CHECK_NULL_GENERAL(NAME, CLEANUP) \
+#define PS_ASSERT_VECTOR_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_VECTOR_NON_NULL(NAME, return RVAL)
+#define PS_ASSERT_GENERAL_VECTOR_NON_NULL(NAME, CLEANUP) \
 if (NAME == NULL || NAME->data.U8 == NULL) { \
     psError(PS_ERR_BAD_PARAMETER_NULL, true, \
@@ -235,6 +234,6 @@
 } \
 
-#define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) PS_VECTOR_CHECK_EMPTY_GENERAL(NAME, return RVAL)
-#define PS_VECTOR_CHECK_EMPTY_GENERAL(NAME, CLEANUP) \
+#define PS_ASSERT_VECTOR_NON_EMPTY(NAME, RVAL) PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(NAME, return RVAL)
+#define PS_ASSERT_GENERAL_VECTOR_NON_EMPTY(NAME, CLEANUP) \
 if (NAME->n < 1) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
@@ -244,5 +243,5 @@
 } \
 
-#define PS_VECTOR_CHECK_TYPE_F32_OR_F64(NAME, RVAL) \
+#define PS_ASSERT_VECTOR_TYPE_F32_OR_F64(NAME, RVAL) \
 if ((NAME->type.type != PS_TYPE_F32) && (NAME->type.type != PS_TYPE_F64)) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
@@ -252,5 +251,5 @@
 } \
 
-#define PS_VECTOR_CHECK_TYPE_S16_S32_F32(NAME, RVAL) \
+#define PS_ASSERT_VECTOR_TYPE_S16_S32_F32(NAME, RVAL) \
 if ((NAME->type.type != PS_TYPE_S16) && (NAME->type.type != PS_TYPE_S32) && (NAME->type.type != PS_TYPE_F32)) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
@@ -260,5 +259,5 @@
 } \
 
-#define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \
+#define PS_ASSERT_VECTOR_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
@@ -268,5 +267,5 @@
 }
 
-#define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \
+#define PS_ASSERT_VECTORS_SIZE_EQUAL(VEC1, VEC2, RVAL) \
 if (VEC1->n != VEC2->n) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
@@ -276,5 +275,5 @@
 }
 
-#define PS_VECTOR_CHECK_TYPE_EQUAL(VEC1, VEC2, RVAL) \
+#define PS_ASSERT_VECTOR_TYPE_EQUAL(VEC1, VEC2, RVAL) \
 if (VEC1->type.type != VEC2->type.type) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
@@ -428,5 +427,5 @@
     PS_POLY macros:
 *****************************************************************************/
-#define PS_POLY_CHECK_NULL(NAME, RVAL) \
+#define PS_ASSERT_POLY_NON_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->coeff == NULL) { \
     psError(PS_ERR_BAD_PARAMETER_NULL, true, \
@@ -436,5 +435,5 @@
 } \
 
-#define PS_POLY_CHECK_TYPE(NAME, TYPE, RVAL) \
+#define PS_ASSERT_POLY_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type != TYPE) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
@@ -508,6 +507,6 @@
     PS_IMAGE macros:
 *****************************************************************************/
-#define PS_IMAGE_CHECK_NULL(NAME, RVAL) PS_IMAGE_CHECK_NULL_GENERAL(NAME, return RVAL)
-#define PS_IMAGE_CHECK_NULL_GENERAL(NAME, CLEANUP) \
+#define PS_ASSERT_IMAGE_NON_NULL(NAME, RVAL) PS_ASSERT_GENERAL_IMAGE_NON_NULL(NAME, return RVAL)
+#define PS_ASSERT_GENERAL_IMAGE_NON_NULL(NAME, CLEANUP) \
 if (NAME == NULL || NAME->data.V == NULL) { \
     psError(PS_ERR_BAD_PARAMETER_NULL, true, \
@@ -517,6 +516,6 @@
 }
 
-#define PS_IMAGE_CHECK_EMPTY(NAME, RVAL) PS_IMAGE_CHECK_EMPTY_GENERAL(NAME, return RVAL)
-#define PS_IMAGE_CHECK_EMPTY_GENERAL(NAME, CLEANUP) \
+#define PS_ASSERT_IMAGE_NON_EMPTY(NAME, RVAL) PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(NAME, return RVAL)
+#define PS_ASSERT_GENERAL_IMAGE_NON_EMPTY(NAME, CLEANUP) \
 if (NAME->numCols < 1 || NAME->numRows < 1) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
@@ -526,5 +525,5 @@
 }
 
-#define PS_IMAGE_CHECK_TYPE(NAME, TYPE, RVAL) \
+#define PS_ASSERT_IMAGE_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \
@@ -534,5 +533,5 @@
 }
 
-#define PS_IMAGE_CHECK_SIZE_EQUAL(NAME1, NAME2, RVAL) \
+#define PS_ASSERT_IMAGES_SIZE_EQUAL(NAME1, NAME2, RVAL) \
 if ((NAME1->numCols != NAME2->numCols) || \
         (NAME1->numRows != NAME2->numRows)) { \
@@ -543,5 +542,5 @@
 }
 
-#define PS_IMAGE_CHECK_SIZE(NAME1, NUM_COLS, NUM_ROWS, RVAL) \
+#define PS_ASSERT_IMAGE_SIZE(NAME1, NUM_COLS, NUM_ROWS, RVAL) \
 if ((NAME1->numCols != NUM_COLS) || \
         (NAME1->numRows != NUM_ROWS)) { \
@@ -634,5 +633,5 @@
     PS_READOUT macros:
 *****************************************************************************/
-#define PS_READOUT_CHECK_NULL(NAME, RVAL) \
+#define PS_ASSERT_READOUT_NON_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->image == NULL) { \
     psError(PS_ERR_BAD_PARAMETER_NULL, true, \
@@ -642,5 +641,5 @@
 }
 
-#define PS_READOUT_CHECK_EMPTY(NAME, RVAL) \
+#define PS_ASSERT_READOUT_NON_EMPTY(NAME, RVAL) \
 if (NAME->image->numCols < 1 || NAME->image->numRows < 1) { \
     psError(PS_ERR_BAD_PARAMETER_SIZE, true, \
@@ -649,5 +648,5 @@
 }
 
-#define PS_READOUT_CHECK_TYPE(NAME, TYPE, RVAL) \
+#define PS_ASSERT_READOUT_TYPE(NAME, TYPE, RVAL) \
 if (NAME->image->type.type != TYPE) { \
     psError(PS_ERR_BAD_PARAMETER_TYPE, true, \