Changeset 2204 for trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c

Timestamp:

Oct 26, 2004, 2:57:34 PM (22 years ago)

Author:

desonia

Message:

converted native C types to ps Types, where practical.

File:

• trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c (modified) (9 diffs)

trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic02.c

@@ -10 +10 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.6 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-10-12 20:50:40 $
+ *  @version $Revision: 1.7 $  $Name: not supported by cvs2svn $
+ *  @date  $Date: 2004-10-27 00:57:33 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -24 +24 @@
 
 #define CHECK_VECTOR(VECTOR,TYPE,TRUTH)                                                                      \
-for(int i=0; i<VECTOR->n; i++) {                                                                             \
+for(psS32 i=0; i<VECTOR->n; i++) {                                                                             \
     if(cabs(VECTOR->data.TYPE[i])-cabs(TRUTH) > FLT_EPSILON){                                                \
         printf("ERROR:Truth and calculated values don't match for vector operation:\n");                     \
@@ -31 +31 @@
             printf("Calculated: %.2f%+.2fi\n", creal(TRUTH), cimag(TRUTH));                                  \
         } else if(PS_IS_PSELEMTYPE_INT(VECTOR->type.type)) {                                                 \
-            printf("Truth: %d\n", (int)(VECTOR->data.TYPE[i]));                                              \
-            printf("Calculated: %d\n", (int)(TRUTH));                                                        \
+            printf("Truth: %d\n", (psS32)(VECTOR->data.TYPE[i]));                                              \
+            printf("Calculated: %d\n", (psS32)(TRUTH));                                                        \
         } else {                                                                                             \
             printf("Truth: %.2f\n", (double)(VECTOR->data.TYPE[i]));                                         \
@@ -43 +43 @@
 
 #define CHECK_MATRIX(IMAGE,TYPE,TRUTH)                                                                       \
-for(int i=IMAGE->numRows-1; i>-1; i--) {                                                                     \
-    for(int j=0; j<IMAGE->numCols; j++) {                                                                    \
+for(psS32 i=IMAGE->numRows-1; i>-1; i--) {                                                                     \
+    for(psS32 j=0; j<IMAGE->numCols; j++) {                                                                    \
         if(cabs(IMAGE->data.TYPE[i][j])-cabs(TRUTH) > FLT_EPSILON){                                          \
             printf("ERROR:Truth and calculated values don't match for matrix operation:\n");                 \
@@ -51 +51 @@
                 printf("Calculated: %.2f%+.2fi\n", creal(TRUTH), cimag(TRUTH));                              \
             } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) {                                              \
-                printf("Truth: %d\n", (int)(IMAGE->data.TYPE[i][j]));                                        \
-                printf("Calculated: %d\n", (int)(TRUTH));                                                    \
+                printf("Truth: %d\n", (psS32)(IMAGE->data.TYPE[i][j]));                                        \
+                printf("Calculated: %d\n", (psS32)(TRUTH));                                                    \
             } else {                                                                                         \
                 printf("Truth: %.2f\n", (double)(IMAGE->data.TYPE[i][j]));                                   \
@@ -66 +66 @@
 #define CREATE_AND_SET_VECTOR(NAME,TYPE,VALUE,SIZE)                                                          \
 psVector *NAME = (psVector*)psVectorAlloc(SIZE, PS_TYPE_##TYPE);                                             \
-for(int i=0; i<SIZE; i++) {                                                                                  \
+for(psS32 i=0; i<SIZE; i++) {                                                                                  \
     NAME->data.TYPE[i] = VALUE;                                                                              \
 }                                                                                                            \
@@ -74 +74 @@
 #define CREATE_AND_SET_IMAGE(NAME,TYPE,VALUE,NROWS,NCOLS)                                                    \
 psImage *NAME = (psImage*)psImageAlloc(NCOLS,NROWS,PS_TYPE_##TYPE);                                          \
-for(int i=0; i<NAME->numRows; i++) {                                                                         \
-    for(int j=0; j<NAME->numCols; j++) {                                                                     \
+for(psS32 i=0; i<NAME->numRows; i++) {                                                                         \
+    for(psS32 j=0; j<NAME->numCols; j++) {                                                                     \
         NAME->data.TYPE[i][j] = VALUE;                                                                       \
     }                                                                                                        \
@@ -86 +86 @@
     return 50; \
 } \
-int nBad = psMemCheckCorruption(0); \
+psS32 nBad = psMemCheckCorruption(0); \
 if(nBad) { \
     psError(__func__,"ERROR: Found %d bad memory blocks\n", nBad); \
@@ -93 +93 @@
 
 
-int main( int argc, char* argv[] )
+psS32 main( psS32 argc, char* argv[] )
 {