Changeset 3476 for trunk/psLib/src/collections

Timestamp:

Mar 22, 2005, 11:52:49 AM (21 years ago)

Author:

desonia

Message:

* empty log message *

Location:

trunk/psLib/src/collections

Files:

• psVector.c (modified) (8 diffs)
• psVector.h (modified) (4 diffs)

trunk/psLib/src/collections/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-03-11 20:38:56 $
+*  @version $Revision: 1.36 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-03-22 21:52:49 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
     }
 
-    psFree(psVec->data.V);
+    psFree(psVec->data.U8);
 }
 
@@ -59 +59 @@
 
     // Create vector data array
-    psVec->data.V = psAlloc(nalloc * elementSize);
+    psVec->data.U8 = psAlloc(nalloc * elementSize);
 
     return psVec;
@@ -80 +80 @@
         }
         // Realloc after decrementation to avoid accessing freed array elements
-        in->data.V = psRealloc(in->data.V, nalloc * elementSize);
+        in->data.U8 = psRealloc(in->data.U8, nalloc * elementSize);
         in->nalloc = nalloc;
     }
@@ -107 +107 @@
     // need to increase data buffer?
     if (byteSize > in->nalloc*PSELEMTYPE_SIZEOF(in->type.type)) {
-        in->data.V = psRealloc(in->data.V, byteSize);
+        in->data.U8 = psRealloc(in->data.U8, byteSize);
         in->nalloc = n;
     }
@@ -235 +235 @@
     inType = inVector->type.type;
     N = inVector->n;
-    inVec = inVector->data.V;
+    inVec = (psPtr)inVector->data.U8;
     elSize = PSELEMTYPE_SIZEOF(inType);
 
@@ -249 +249 @@
     }
     outVector->n = N;
-    outVec = outVector->data.V;
+    outVec = outVector->data.U8;
 
     if (N == 0) {
@@ -496 +496 @@
 }
 
+psF64 p_psVectorGetElementF64(psVector* vector,
+                              int position)
+{
+    if (vector == NULL) {
+        return NAN;
+    }
+    if (position < 0 || position >= vector->n) {
+        return NAN;
+    }
+
+    switch (vector->type.type) {
+    case PS_TYPE_U8:
+        return vector->data.U8[position];
+        break;
+    case PS_TYPE_U16:
+        return vector->data.U16[position];
+        break;
+    case PS_TYPE_U32:
+        return vector->data.U32[position];
+        break;
+    case PS_TYPE_U64:
+        return vector->data.U64[position];
+        break;
+    case PS_TYPE_S8:
+        return vector->data.S8[position];
+        break;
+    case PS_TYPE_S16:
+        return vector->data.S16[position];
+        break;
+    case PS_TYPE_S32:
+        return vector->data.S32[position];
+        break;
+    case PS_TYPE_S64:
+        return vector->data.S64[position];
+        break;
+    case PS_TYPE_F32:
+        return vector->data.F32[position];
+        break;
+    case PS_TYPE_F64:
+        return vector->data.F64[position];
+    default:
+        return NAN;
+    }
+}

trunk/psLib/src/collections/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.29 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-03-11 20:38:56 $
+ *  @version $Revision: 1.30 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-03-22 21:52:49 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -37 +37 @@
 
     union {
-        psBool B;               ///< Boolean data.
         psU8* U8;               ///< Unsigned 8-bit integer data.
         psU16* U16;             ///< Unsigned 16-bit integer data.
@@ -50 +49 @@
         psC32* C32;             ///< Single-precision complex data.
         psC64* C64;             ///< Double-precision complex data.
-        psPtr V;                ///< Pointer to data.
     } data;                     ///< Union for data types.
 }
@@ -153 +151 @@
 );
 
+/** Returns an element in the vector as a psF64 value
+ *
+ *  @return psF64          the value at specified position, or NAN if position is invalid.
+ */
+psF64 p_psVectorGetElementF64(
+    psVector* vector,                  ///< vector to retrieve element
+    int position                       ///< the vector position to get
+);
+
+
 /// @}