Changeset 831 for trunk/psLib/src/collections/psVector.c

Timestamp:

Jun 2, 2004, 1:29:39 PM (22 years ago)

Author:

harman

Message:

Changed psVector to be consistent with psImage

File:

• trunk/psLib/src/collections/psVector.c (modified) (9 diffs)

trunk/psLib/src/collections/psVector.c

@@ -19 +19 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-29 01:08:46 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-02 23:29:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -64 +64 @@
 /* FUNCTION IMPLEMENTATION - PUBLIC                                          */
 /*****************************************************************************/
-psVector* psVectorAlloc(psElemType elemType, unsigned int nalloc)
+psVector* psVectorAlloc(unsigned int nalloc, psElemType elemType)
 {
     psVector *psVec = NULL;
@@ -86 +86 @@
 
     // Create vector data array
-    psVec->vec.v = psAlloc(nalloc*elementSize);
+    psVec->data.V = psAlloc(nalloc*elementSize);
 
     return psVec;
 }
 
-psVector *psVectorRealloc(psVector *restrict in, unsigned int nalloc)
+psVector *psVectorRealloc(unsigned int nalloc, psVector *restrict in)
 {
     int elementSize = 0;
@@ -110 +110 @@
             if (elemType == PS_TYPE_PTR) {
                 for (int i = nalloc; i < in->n; i++) {   // For reduction in vector size
-                    psMemDecrRefCounter(in->vec.vp[i]);
+                    psMemDecrRefCounter(in->data.PTR[i]);
                 }
             }
@@ -117 +117 @@
 
         // Realloc after decrementation to avoid accessing freed array elements
-        in->vec.v = psRealloc(in->vec.v,nalloc*elementSize);
+        in->data.V = psRealloc(in->data.V,nalloc*elementSize);
         in->nalloc = nalloc;
     }
@@ -129 +129 @@
 
     if (in == NULL) {
-        return psVectorAlloc(type,nalloc);
+        return psVectorAlloc(nalloc, type);
     }
 
@@ -150 +150 @@
     if (elemType == PS_TYPE_PTR) {
         for (int i = 0; i < in->n; i++) {   // For reduction in vector size
-            psMemDecrRefCounter(in->vec.vp[i]);
-            in->vec.vp[i] = NULL;
+            psMemDecrRefCounter(in->data.PTR[i]);
+            in->data.PTR[i] = NULL;
         }
     }
 
-    in->vec.v = psRealloc(in->vec.v,nalloc*PSELEMTYPE_SIZEOF(elemType));
+    in->data.V = psRealloc(in->data.V,nalloc*PSELEMTYPE_SIZEOF(elemType));
 
     in->n = 0;
@@ -170 +170 @@
     }
 
-    psFree(psVec->vec.v);
+    psFree(psVec->data.V);
     psFree(psVec);
 }
@@ -188 +188 @@
     for(int i = 0; i < psVec->nalloc; i++) {
         if(elemFree == NULL) {
-            psMemDecrRefCounter(psVec->vec.vp[i]);
+            psMemDecrRefCounter(psVec->data.PTR[i]);
         } else {
-            elemFree(psMemDecrRefCounter(psVec->vec.vp[i]));
+            elemFree(psMemDecrRefCounter(psVec->data.PTR[i]));
         }
-        psVec->vec.vp[i] = NULL;
+        psVec->data.PTR[i] = NULL;
     }
 }