Changeset 2214 for trunk/psLib/src/dataManip/psConstants.h

Timestamp:

Oct 27, 2004, 10:20:11 AM (22 years ago)

Author:

gusciora

Message:

I've been unifying the naming conventions for various macros that check
functions parameters for type, size, non-NULL ...

File:

• trunk/psLib/src/dataManip/psConstants.h (modified) (12 diffs)

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 20:11:46 $
+ *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 20:20:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -109 +109 @@
     return(RVAL); \
 }
-/*****************************************************************************
- 
+
+
+/*****************************************************************************
+Macros which take a psVector type and determine if it is NULL, or has the
+wrong type.
  *****************************************************************************/
 #define PS_VECTOR_CHECK_TYPE_F32_OR_F64(VEC, RVAL) \
@@ -118 +121 @@
 } \
 
-/** Preprocessor macro to generate error on an incorrect type */
 #define PS_VECTOR_CHECK_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
@@ -125 +127 @@
 }
 
-/** Preprocessor macro to generate error on a NULL vector */
-#define PS_VECTOR_CHEC_NULL(NAME, RVAL) \
+#define PS_VECTOR_CHECK_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->data.V == NULL) { \
     psError(__func__,"Unallowable operation: %s or its data is NULL.", #NAME); \
@@ -132 +133 @@
 } \
 
-/** Preprocessor macro to generate error for zero length vector */
 #define PS_VECTOR_CHECK_EMPTY(NAME, RVAL) \
 if (NAME->n < 1) { \
@@ -139 +139 @@
 } \
 
-/** Preprocessor macro to generate error on differing size vectors */
 #define PS_VECTOR_CHECK_SIZE_EQUAL(VEC1, VEC2, RVAL) \
 if (VEC1->n != VEC2->n) { \
@@ -145 +144 @@
     return(RVAL); \
 }
-
-#define PS_VECTOR_PRINT(NAME) \
-for (int my_i=0;my_i<NAME->n;my_i++) { \
-    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \
-} \
-printf("\n"); \
 
 #define PS_VECTOR_F64_TO_F32(X64, X32) \
@@ -164 +157 @@
 } \
 
+#define PS_VECTOR_PRINT(NAME) \
+for (int my_i=0;my_i<NAME->n;my_i++) { \
+    printf("%s->data.F32[%d] is %f\n", #NAME, my_i, NAME->data.F32[my_i]); \
+} \
+printf("\n"); \
 
 
@@ -169 +167 @@
  
 *****************************************************************************/
-#define PS_CHECK_NULL_POLY(NAME, NULL) \
+#define PS_POLY_CHECK_NULL(NAME, NULL) \
 if (NAME == NULL || NAME->coeff == NULL) { \
     psError(__func__,"Unallowable operation: polynomial %s or its coeffs is NULL.", #NAME); \
@@ -175 +173 @@
 } \
 
-
-
-
-
 /*****************************************************************************
  
 *****************************************************************************/
-/** Preprocessor macro to generate error on a NULL image */
-#define PS_CHECK_NULL_IMAGE(NAME, RVAL) \
+#define PS_IMAGE_CHECK_NULL(NAME, RVAL) \
 if (NAME == NULL || NAME->data.V == NULL) { \
     psError(__func__,"Unallowable operation: psImage %s or its data is NULL.", #NAME); \
@@ -189 +182 @@
 }
 
-/** Preprocessor macro to generate error for zero length rows or columns */
-#define PS_CHECK_EMPTY_IMAGE(NAME, RVAL) \
+#define PS_IMAGE_CHECK_EMPTY(NAME, RVAL) \
 if (NAME->numCols < 1 || NAME->numRows < 1) { \
     psError(__func__,"Unallowable operation: psImage %s has zero rows or columns (%dx%d).", #NAME, \
@@ -197 +189 @@
 }
 
-#define PS_CHECK_IMAGE_TYPE(NAME, TYPE, RVAL) \
+#define PS_IMAGE_CHECK_TYPE(NAME, TYPE, RVAL) \
 if (NAME->type.type != TYPE) { \
     psError(__func__,"Unallowable operation: psImage %s has incorrect type.", #NAME); \
     return(RVAL); \
 }
-
 /*****************************************************************************
  
  *****************************************************************************/
 /** Preprocessor macro to generate error on a NULL image */
-#define PS_CHECK_NULL_IMAGE_READOUT(NAME, RVAL) \
-if (NAME == NULL || NAME->image == NULL) {                                                         \
+#define PS_READOUT_CHECK_NULL(NAME, RVAL) \
+if (NAME == NULL || NAME->image == NULL) { \
     psError(__func__,"Unallowable operation: psReadout %s or its data is NULL.", #NAME); \
     return(RVAL); \