Changeset 2204 for trunk/psLib/src/collections/psVector.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/src/collections/psVector.c (modified) (9 diffs)

trunk/psLib/src/collections/psVector.c

@@ -10 +10 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.28 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2004-10-07 19:51:30 $
+*  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2004-10-27 00:57:31 $
 *
 *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -42 +42 @@
 // FUNCTION IMPLEMENTATION - PUBLIC
 
-psVector* psVectorAlloc(unsigned int nalloc, psElemType elemType)
+psVector* psVectorAlloc(psU32 nalloc, psElemType elemType)
 {
     psVector* psVec = NULL;
-    int elementSize = 0;
+    psS32 elementSize = 0;
 
     elementSize = PSELEMTYPE_SIZEOF(elemType);
@@ -64 +64 @@
 }
 
-psVector* psVectorRealloc(psVector* restrict in, unsigned int nalloc)
-{
-    int elementSize = 0;
+psVector* psVectorRealloc(psVector* restrict in, psU32 nalloc)
+{
+    psS32 elementSize = 0;
     psElemType elemType;
 
@@ -88 +88 @@
 }
 
-psVector* psVectorRecycle(psVector* restrict in, unsigned int n, psElemType type)
-{
-    int byteSize;
+psVector* psVectorRecycle(psVector* restrict in, psU32 n, psElemType type)
+{
+    psS32 byteSize;
 
     if (in == NULL) {
@@ -129 +129 @@
     }
 
-    int nElements = in->n;
+    psS32 nElements = in->n;
 
     out = psVectorRecycle(out, nElements, type);
@@ -136 +136 @@
         ps##INTYPE *inVec = in->data.INTYPE; \
         ps##OUTTYPE *outVec = out->data.OUTTYPE; \
-        for (int col=0;col<nElements;col++) { \
+        for (psS32 col=0;col<nElements;col++) { \
             *(outVec++) = *(inVec++); \
         } \
@@ -225 +225 @@
 psVector* psVectorSort(psVector* restrict outVector, const psVector* restrict inVector)
 {
-    int N = 0;
-    int elSize = 0;
-    void *inVec = NULL;
-    void *outVec = NULL;
+    psS32 N = 0;
+    psS32 elSize = 0;
+    psPtr inVec = NULL;
+    psPtr outVec = NULL;
     psElemType inType = 0;
 
@@ -311 +311 @@
 psVector* psVectorSortIndex(psVector* restrict outVector, const psVector* restrict inVector)
 {
-    int N = 0;
+    psS32 N = 0;
     psVector* tmpVector = NULL;
     psElemType inType = 0;
@@ -350 +350 @@
         ps##TYPE* tmpVec = tmpVector->data.TYPE;                              \
         ps##TYPE  diff;                                                       \
-        for(int i=0; i<N; i++) {                                              \
-            for(int j=0; j<N; j++) {                                          \
+        for(psS32 i=0; i<N; i++) {                                              \
+            for(psS32 j=0; j<N; j++) {                                          \
                 diff = absfcn(tmpVec[i] - inVec[j]);                          \
                 if(diff < maxError) {                                         \