Changeset 578 for trunk/psLib/src/collections/psSort.c

Timestamp:

May 5, 2004, 10:43:57 AM (22 years ago)

Author:

harman

Message:

Updated per SDR documentation bug fixes

File:

• trunk/psLib/src/collections/psSort.c (modified) (8 diffs)

trunk/psLib/src/collections/psSort.c

@@ -14 +14 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-21 00:40:32 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-05-05 20:43:22 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -104 +104 @@
 /*****************************************************************************/
 
-psFloatArray *psSort(
-    psFloatArray *restrict outArray,        /**< Sorted output array. */
-    const psFloatArray *restrict inArray    /**< Input array to sort. */
+psArray *psSort(
+    psArray *restrict outArray,        /**< Sorted output array. */
+    const psArray *restrict inArray    /**< Input array to sort. */
 )
 {
@@ -129 +129 @@
     inN = inArray->n;
     outN = outArray->n;
-    inArr = inArray->arr;
-    outArr = outArray->arr;
+    inArr = inArray->arr.fltArr;
+    outArr = outArray->arr.fltArr;
     elSize = sizeof(float);
 
@@ -139 +139 @@
     }
 
+    if(inN == 0) {
+        psError(__func__, " : Line %d - No elements in use for input array\n", __LINE__);
+        return outArray;
+    }
+
+    if(outN == 0) {
+        psError(__func__, " : Line %d - No elements in use for output array\n", __LINE__);
+        return outArray;
+    }
+
     // Copy input array values into output array
     for(i=0; i<inN; i++) {
@@ -150 +160 @@
 }
 
-psIntArray *psSortIndex(
-    psIntArray *restrict outArray,          /**< Output array of sorted indices. */
-    const psFloatArray *restrict inArray    /**< Input array to be sorted. */
+psArray *psSortIndex(
+    psArray *restrict outArray,         /**< Output array of sorted indices. */
+    const psArray *restrict inArray     /**< Input array to be sorted. */
 )
 {
@@ -163 +173 @@
     int *outArr = NULL;
     float diff = 0.0f;
-    psFloatArray *tmpFloatArray = NULL;
+    psArray *tmpFloatArray = NULL;
 
     if(outArray == NULL) {
@@ -178 +188 @@
     inN = inArray->n;
     outN = outArray->n;
-    inArr = inArray->arr;
-    outArr = outArray->arr;
+    inArr = inArray->arr.fltArr;
+    outArr = outArray->arr.intArr;
 
     if(inN != outN) {
@@ -188 +198 @@
 
     tmpFloatArray = psFloatArrayAlloc(inN);
+    tmpFloatArray->n = inN;
     tmpFloatArray = psSort(tmpFloatArray, inArray);
 
     for(i=0; i<inN; i++) {
-        tempVal = tmpFloatArray->arr[i];
+        tempVal = tmpFloatArray->arr.fltArr[i];
         for(j=0; j<inN; j++) {
             diff = fabsf(tempVal - inArr[j]);