Changeset 9730 for trunk/psLib/src/mathtypes

Timestamp:

Oct 24, 2006, 12:55:05 PM (20 years ago)

Author:

Paul Price

Message:

Following today's meeting, we agreed that psVectorAlloc (and therefore
psArrayAlloc also) shall set the number of elements in use to equal the
number of elements allocated. We introduce new functions,
psVectorAllocEmpty and psArrayAllocEmpty, that allocate a vector and set
the length to zero.

Location:

trunk/psLib/src/mathtypes

Files:

• psVector.c (modified) (3 diffs)
• psVector.h (modified) (3 diffs)

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.86 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2006-10-14 00:12:39 $
+*  @version $Revision: 1.87 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2006-10-24 22:52:56 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -68 +68 @@
 
 
-psVector* psVectorAlloc(long nalloc,
-                        psElemType type)
-{
-    psVector* psVec = NULL;
-    psS32 elementSize = 0;
-
-    elementSize = PSELEMTYPE_SIZEOF(type);
+// Allocate a psVector; does not set vector->n (left to the caller)
+static psVector *vectorAlloc(long nalloc, // Number of elements to allocate
+                             psElemType type // Type of elements
+                            )
+{
+    int elementSize = PSELEMTYPE_SIZEOF(type); // Size, in bytes, of element
     if (elementSize < 1) {
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
@@ -81 +80 @@
     }
 
-
     // Create vector struct
-    psVec = (psVector* ) psAlloc(sizeof(psVector));
-    psMemSetDeallocator(psVec, (psFreeFunc) vectorFree);
-
-    psVec->type.dimen = PS_DIMEN_VECTOR;
-    psVec->type.type = type;
-    P_PSVECTOR_SET_NALLOC(psVec,nalloc);
-    //    psVec->n = nalloc;
-    psVec->n = 0;
+    psVector *vector = (psVector*) psAlloc(sizeof(psVector));
+    psMemSetDeallocator(vector, (psFreeFunc) vectorFree);
+
+    vector->type.dimen = PS_DIMEN_VECTOR;
+    vector->type.type = type;
+    P_PSVECTOR_SET_NALLOC(vector, nalloc);
 
     // Create vector data array
-    psVec->data.U8 = psAlloc(nalloc * elementSize);
-
-    return psVec;
+    vector->data.U8 = psAlloc(nalloc * elementSize);
+
+    return vector;
+}
+
+psVector* psVectorAlloc(long nalloc,
+                        psElemType type)
+{
+    psVector *vector = vectorAlloc(nalloc, type);
+    if (!vector) {
+        return NULL;
+    }
+    vector->n = nalloc;
+    return vector;
+}
+
+psVector* psVectorAllocEmpty(long nalloc,
+                             psElemType type)
+{
+    psVector *vector = vectorAlloc(nalloc, type);
+    if (!vector) {
+        return NULL;
+    }
+    vector->n = 0;
+    return vector;
 }
 

trunk/psLib/src/mathtypes/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.58 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-10-14 00:07:13 $
+ *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-10-24 22:52:56 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -74 +74 @@
         ;
 
-/** Allocate a vector.
+/** Allocate a vector, with length set to number allocated
  *
  *  Uses psLib memory allocation functions to create a vector collection of
@@ -82 +82 @@
  */
 psVector* psVectorAlloc(
+    long nalloc,                       ///< Total number of elements to make available.
+    psElemType type                    ///< Type of data to be held by vector.
+);
+
+/** Allocate a vector, with length set to zero
+ *
+ *  Uses psLib memory allocation functions to create a vector collection of
+ *  data as defined by the psType type.
+ *
+ * @return psVector*    Pointer to psVector.
+ */
+psVector* psVectorAllocEmpty(
     long nalloc,                       ///< Total number of elements to make available.
     psElemType type                    ///< Type of data to be held by vector.