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

Timestamp:

Apr 20, 2004, 2:18:05 PM (22 years ago)

Author:

harman

Message:

Added Integer array

File:

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

trunk/psLib/src/collections/psSort.c

@@ -14 +14 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-19 20:10:46 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-04-21 00:18:05 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -22 +22 @@
 /******************************************************************************/
 /*  INCLUDE FILES                                                             */
-/******************************************************************************/  
+/******************************************************************************/
 
 #include <stdio.h>
@@ -71 +71 @@
  *  @return  int: Result of comparsion (-1, 0, or 1).
  */
- 
+
 static int psCompare(
     const void *x,  /**< First float to compare. */
@@ -79 +79 @@
     float *item1 = NULL;
     float *item2 = NULL;
-    
+
     if(x == NULL || y == NULL) {
         psError(__func__, " : Line %d - Null input argument: x=%d y=%d\n", __LINE__, x, y);
     }
-    
+
     item1 = (float*)x;
     item2 = (float*)y;
-    
+
     if(item1 == NULL || item2 == NULL) {
         psError(__func__, " : Line %d - Improper cast to float: item1=%d item2=%d\n", __LINE__, item1, item2);
     }
-    
+
     if(*item1 < *item2) {
         return -1;
-    }
-    else if(*item1 > *item2) {
+    } else if(*item1 > *item2) {
         return 1;
-    }
-    else {
+    } else {
         return 0;
     }
@@ -122 +120 @@
         return outArray;
     }
-    
+
     if(inArray == NULL) {
         psError(__func__, " : Line %d - Null input array\n", __LINE__);
         return outArray;
     }
-        
+
     // Initialize values
     inN = inArray->n;
@@ -134 +132 @@
     outArr = outArray->arr;
     elSize = sizeof(float);
-    
+
     if(inN != outN) {
         psError(__func__, " : Line %d - Input and output array sizes are not equal: in=%d out=%d\n", __LINE__,
@@ -140 +138 @@
         return outArray;
     }
-    
+
     // Copy input array values into output array
     for(i=0; i<inN; i++) {
         outArr[i] = inArr[i];
     }
-    
+
     // Sort output array
     qsort((void*)outArr, inN, elSize, psCompare);
-    
+
     return outArray;
 }
@@ -166 +164 @@
     float diff = 0.0f;
     psFloatArray *tmpFloatArray = NULL;
-    
+
     if(outArray == NULL) {
         psError(__func__, " : Line %d - Null output array\n", __LINE__);
         return outArray;
     }
-    
+
     if(inArray == NULL) {
         psError(__func__, " : Line %d - Null input array\n", __LINE__);
@@ -189 +187 @@
     }
 
-    tmpFloatArray = psFloatArrayAlloc(inN);
+    tmpFloatArray = psFloatArrayAlloc(inN, inN);
     tmpFloatArray = psSort(tmpFloatArray, inArray);
-    
+
     for(i=0; i<inN; i++) {
         tempVal = tmpFloatArray->arr[i];
@@ -200 +198 @@
                 break;
             }
-        } 
-    }
-    
+        }
+    }
+
     // Free temp memory
-    psFreeFloatArray(tmpFloatArray);
-    
-    return outArray;    
+    psFloatArrayFree(tmpFloatArray);
+
+    return outArray;
 }