Changeset 4597 for trunk/psLib/src/mathtypes

Timestamp:

Jul 22, 2005, 12:19:31 PM (21 years ago)

Author:

drobbin

Message:

* empty log message *

Location:

trunk/psLib/src/mathtypes

Files:

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

trunk/psLib/src/mathtypes/psVector.c

@@ -9 +9 @@
 *  @author Robert DeSonia, MHPCC
 *
-*  @version $Revision: 1.46 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-07-12 19:12:01 $
+*  @version $Revision: 1.47 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-22 22:18:23 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -30 +30 @@
 typedef struct
 {
-    p_psVectorData data; // need this first for psVectorSortIndex to work.
+    union {
+        psU8* U8;                      ///< Unsigned 8-bit integer data.
+        psU16* U16;                    ///< Unsigned 16-bit integer data.
+        psU32* U32;                    ///< Unsigned 32-bit integer data.
+        psU64* U64;                    ///< Unsigned 64-bit integer data.
+        psS8* S8;                      ///< Signed 8-bit integer data.
+        psS16* S16;                    ///< Signed 16-bit integer data.
+        psS32* S32;                    ///< Signed 32-bit integer data.
+        psS64* S64;                    ///< Signed 64-bit integer data.
+        psF32* F32;                    ///< Single-precision float data.
+        psF64* F64;                    ///< Double-precision float data.
+        psC32* C32;                    ///< Single-precision complex data.
+        psC64* C64;                    ///< Double-precision complex data.
+    } data;
     psU32 index;
 }
@@ -48 +61 @@
 // FUNCTION IMPLEMENTATION - PUBLIC
 
-psVector* psVectorAlloc( long nalloc, psElemType type)
+psVector* psVectorAlloc(long nalloc,
+                        psElemType type)
 {
     psVector* psVec = NULL;
@@ -76 +90 @@
 }
 
-psVector* psVectorRealloc(psVector* vector, long nalloc)
+psVector* psVectorRealloc(psVector* vector,
+                          long nalloc)
 {
     psS32 elementSize = 0;
@@ -99 +114 @@
 }
 
-psVector* psVectorRecycle(psVector* vector, long nalloc, psElemType type)
+psVector* psVectorRecycle(psVector* vector,
+                          long nalloc,
+                          psElemType type)
 {
     psS32 byteSize;
@@ -129 +146 @@
 }
 
-psVector *psVectorExtend(psVector *vector, long delta, long nExtend)
+psVector *psVectorExtend(psVector *vector,
+                         long delta,
+                         long nExtend)
 {
     // can't handle a NULL vector (don't know the data type to allocate)
@@ -166 +185 @@
 }
 
-psVector* psVectorCopy(psVector* output, const psVector* input, psElemType type)
+psVector* psVectorCopy(psVector* output,
+                       const psVector* input,
+                       psElemType type)
 {
     if (input == NULL) {
@@ -267 +288 @@
 }
 
-psVector* psVectorSort(psVector* outVector, const psVector* inVector)
+psVector* psVectorSort(psVector* outVector,
+                       const psVector* inVector)
 {
     psS32 N = 0;
@@ -353 +375 @@
 }
 
-psVector* psVectorSortIndex(psVector* outVector, const psVector* inVector)
+psVector* psVectorSortIndex(psVector* outVector,
+                            const psVector* inVector)
 {
     psS32 N = 0;
@@ -437 +460 @@
 }
 
-char* psVectorToString(psVector* vector, int maxLength)
+char* psVectorToString(psVector* vector,
+                       int maxLength)
 {
 
@@ -570 +594 @@
 }
 
-bool p_psVectorPrint (FILE *f, psVector *a, char *name)
+bool p_psVectorPrint (FILE *f,
+                      psVector *a,
+                      char *name)
 {
 

trunk/psLib/src/mathtypes/psVector.h

@@ -11 +11 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.38 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2005-07-12 19:12:01 $
+ *  @version $Revision: 1.39 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2005-07-22 22:18:18 $
  *
  *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 
 ///< Union of psVector data types.
+/*
 typedef union {
     psU8* U8;                          ///< Unsigned 8-bit integer data.
@@ -43 +44 @@
 }
 p_psVectorData;
-
+*/
 /** An vector to support primitive types.
  *
@@ -54 +55 @@
     long n;                            ///< Number of elements in use.
     const long nalloc;                 ///< Total number of elements available.
-    p_psVectorData data;               ///< Union for data types.
+    union {
+        psU8* U8;                      ///< Unsigned 8-bit integer data.
+        psU16* U16;                    ///< Unsigned 16-bit integer data.
+        psU32* U32;                    ///< Unsigned 32-bit integer data.
+        psU64* U64;                    ///< Unsigned 64-bit integer data.
+        psS8* S8;                      ///< Signed 8-bit integer data.
+        psS16* S16;                    ///< Signed 16-bit integer data.
+        psS32* S32;                    ///< Signed 32-bit integer data.
+        psS64* S64;                    ///< Signed 64-bit integer data.
+        psF32* F32;                    ///< Single-precision float data.
+        psF64* F64;                    ///< Double-precision float data.
+        psC32* C32;                    ///< Single-precision complex data.
+        psC64* C64;                    ///< Double-precision complex data.
+    } data;
     void *lock;                        ///< Optional lock for thread safety.
 }