Changeset 831 for trunk/psLib/src/collections/psSort.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/psSort.c (modified) (4 diffs)

trunk/psLib/src/collections/psSort.c

@@ -14 +14 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.9 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-05-13 22:47:52 $
+ *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-02 23:29:14 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -129 +129 @@
     inN = inVector->n;
     outN = outVector->n;
-    inVec = inVector->vec.f;
-    outVec = outVector->vec.f;
+    inVec = inVector->data.F32;
+    outVec = outVector->data.F32;
     elSize = sizeof(float);
 
@@ -188 +188 @@
     inN = inVector->n;
     outN = outVector->n;
-    inVec = inVector->vec.f;
-    outVec = outVector->vec.i32;
+    inVec = inVector->data.F32;
+    outVec = outVector->data.S32;
 
     if(inN != outN) {
@@ -197 +197 @@
     }
 
-    tmpFloatVector = psVectorAlloc(PS_TYPE_FLOAT, inN);
+    tmpFloatVector = psVectorAlloc(inN, PS_TYPE_F32);
     tmpFloatVector->n = inN;
     tmpFloatVector = psSort(tmpFloatVector, inVector);
 
     for(i=0; i<inN; i++) {
-        tempVal = tmpFloatVector->vec.f[i];
+        tempVal = tmpFloatVector->data.F32[i];
         for(j=0; j<inN; j++) {
             diff = fabsf(tempVal - inVec[j]);