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

Timestamp:

Oct 26, 2004, 3:17:53 PM (22 years ago)

Author:

gusciora

Message:

More macros for parameters.

File:

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

trunk/psLib/src/dataManip/psConstants.h

@@ -6 +6 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-10-27 01:15:47 $
+ *  @version $Revision: 1.16 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-10-27 01:17:53 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -54 +54 @@
 p_psMemSetPersistent(VEC, true); \
 p_psMemSetPersistent(VEC->data.V, true); \
-for (psS32 i=0;i<N;i++) { \
+for (int i=0;i<N;i++) { \
     VEC->data.F32[i] = 1.0; \
 } \
@@ -62 +62 @@
 p_psMemSetPersistent(VEC, true); \
 p_psMemSetPersistent(VEC->data.V, true); \
-for (psS32 i=0;i<N;i++) { \
+for (int i=0;i<N;i++) { \
     VEC->data.F64[i] = 1.0; \
 } \
@@ -70 +70 @@
 p_psMemSetPersistent(VEC, true); \
 p_psMemSetPersistent(VEC->data.V, true); \
-for (psS32 i=0;i<N;i++) { \
+for (int i=0;i<N;i++) { \
     VEC->data.F32[i] = (float) i; \
 } \
@@ -78 +78 @@
 p_psMemSetPersistent(VEC, true); \
 p_psMemSetPersistent(VEC->data.V, true); \
-for (psS32 i=0;i<N;i++) { \
+for (int i=0;i<N;i++) { \
     VEC->data.F64[i] = (float) i; \
 } \
@@ -114 +114 @@
 }
 
-
-
 /** Preprocessor macro to generate error for zero length vector */
-#define PS_CHECK_EMPTY_VECTOR_RETURN_NULL(NAME) \
+#define PS_CHECK_EMPTY_VECTOR(NAME, RVAL) \
 if (NAME->n < 1) { \
     psError(__func__,"Unallowable operation: %s has zero n value.", #NAME); \
-    return(NULL); \
-} \
-
-/** Preprocessor macro to generate error for zero length vector */
-#define PS_CHECK_EMPTY_VECTOR_RETURN_F0(NAME) \
-if (NAME->n < 1) { \
-    psError(__func__,"Unallowable operation: %s has zero n value.", #NAME); \
-    return(0.0); \
-} \
+    return(RVAL); \
+} \
+
+
 
 /** Preprocessor macro to generate error on differing size vectors */
@@ -190 +183 @@
 
 #define PS_PRINT_VECTOR(NAME) \
-for (psS32 my_i=0;my_i<NAME->n;my_i++) { \
+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]); \
 } \
@@ -197 +190 @@
 #define PS_VECTOR_F64_TO_F32(X64, X32) \
 psVector *X32 = psVectorAlloc(X64->n, PS_TYPE_F32); \
-for (psS32 i=0;i<X64->n;i++) { \
+for (int i=0;i<X64->n;i++) { \
     X32->data.F32[i] = (float) X64->data.F64[i]; \
 } \
@@ -203 +196 @@
 #define PS_VECTOR_F32_TO_F64(X32, X64) \
 psVector *X64 = psVectorAlloc(X32->n, PS_TYPE_F64); \
-for (psS32 i=0;i<X32->n;i++) { \
+for (int i=0;i<X32->n;i++) { \
     X64->data.F64[i] = (float) X32->data.F32[i]; \
 } \