Changeset 2204 for trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.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_psMatrixVectorArithmetic01.c (modified) (8 diffs)

trunk/psLib/test/dataManip/tst_psMatrixVectorArithmetic01.c

@@ -10 +10 @@
  *  @author  Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $  $Name: not supported by cvs2svn $
- *  @date  $Date: 2004-08-27 23:31:22 $
+ *  @version $Revision: 1.5 $  $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 @@
     printf("%f+%fi ", creal(SCALAR->data.TYPE), cimag(SCALAR->data.TYPE));                               \
 } else if(PS_IS_PSELEMTYPE_INT(SCALAR->type.type)) {                                                     \
-    printf("%d ", (int)SCALAR->data.TYPE);                                                               \
+    printf("%d ", (psS32)SCALAR->data.TYPE);                                                               \
 } else {                                                                                                 \
     printf("%f ", (double)SCALAR->data.TYPE);                                                            \
@@ -31 +31 @@
 
 #define PRINT_VECTOR(VECTOR,TYPE)                                                                            \
-for(int i=0; i<VECTOR->n; i++) {                                                                         \
+for(psS32 i=0; i<VECTOR->n; i++) {                                                                         \
     if(PS_IS_PSELEMTYPE_COMPLEX(VECTOR->type.type)) {                                                    \
         printf("%f+%fi ", creal(VECTOR->data.TYPE[i]), cimag(VECTOR->data.TYPE[i]));                     \
     } else if(PS_IS_PSELEMTYPE_INT(VECTOR->type.type)) {                                                 \
-        printf("%d ", (int)VECTOR->data.TYPE[i]);                                                        \
+        printf("%d ", (psS32)VECTOR->data.TYPE[i]);                                                        \
     } else {                                                                                             \
         printf("%f ", (double)VECTOR->data.TYPE[i]);                                                     \
@@ -44 +44 @@
 
 #define PRINT_MATRIX(IMAGE,TYPE)                                                                             \
-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(PS_IS_PSELEMTYPE_COMPLEX(IMAGE->type.type)) {                                                 \
             printf("%f+%fi ", creal(IMAGE->data.TYPE[i][j]), cimag(IMAGE->data.TYPE[i][j]));             \
         } else if(PS_IS_PSELEMTYPE_INT(IMAGE->type.type)) {                                              \
-            printf("%d ", (int)IMAGE->data.TYPE[i][j]);                                                  \
+            printf("%d ", (psS32)IMAGE->data.TYPE[i][j]);                                                  \
         } else {                                                                                         \
             printf("%f ", (double)IMAGE->data.TYPE[i][j]);                                               \
@@ -61 +61 @@
 #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;                                                                          \
 }                                                                                                        \
@@ -69 +69 @@
 #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;                                                                   \
     }                                                                                                    \
@@ -78 +78 @@
 #define CHECK_MEMORY                                                                                         \
 psMemCheckLeaks(0, NULL, stdout);                                                                        \
-int nBad = psMemCheckCorruption(0);                                                                      \
+psS32 nBad = psMemCheckCorruption(0);                                                                      \
 if(nBad) {                                                                                               \
     printf("ERROR: Found %d bad memory blocks\n", nBad);                                                 \
@@ -84 +84 @@
 
 
-int main(int argc, char* argv[])
+psS32 main(psS32 argc, char* argv[])
 {