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

Timestamp:

Apr 19, 2004, 10:10:46 AM (22 years ago)

Author:

harman

Message:

Changed print statements to logging statements

File:

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

trunk/psLib/src/collections/psSort.c

@@ -1 @@
-/** @file  psSort.h
- *
- *  @brief Sorts an array of floats
+/** @file  psSort.c
+ *
+ *  @brief Sorts arrays
  *
  *  The psSort functions use the qsort() stdlib function with a user-defined callback to sort an array of 
@@ -14 +14 @@
  *  @author Ross Harman, MHPCC
  *   
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-04-17 02:43:59 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-04-19 20:10:46 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -32 +32 @@
 #include "psArray.h"
 #include "psSort.h"
+#include "psError.h"
 
 /******************************************************************************/
@@ -80 +81 @@
     
     if(x == NULL || y == NULL) {
-        printf("Null input argument\n");
+        psError(__func__, " : Line %d - Null input argument: x=%d y=%d\n", __LINE__, x, y);
     }
     
@@ -87 +88 @@
     
     if(item1 == NULL || item2 == NULL) {
-        printf("Improper cast to float\n");
+        psError(__func__, " : Line %d - Improper cast to float: item1=%d item2=%d\n", __LINE__, item1, item2);
     }
     
@@ -101 +102 @@
 }
 
-/** Sort an array of floats.
- *
- *  Sorts an array of floats in ascendin order with the qsort() stdlib function.
- *
- *  @return  psFloatArray*: Pointer to sorted psFloatArray.
- */
- 
+/*****************************************************************************/
+/* FUNCTION IMPLEMENTATION - PUBLIC                                          */
+/*****************************************************************************/
+
 psFloatArray *psSort(
     psFloatArray *restrict outArray,        /**< Sorted output array. */
@@ -121 +119 @@
 
     if(outArray == NULL) {
-        printf("NULL output array n");
+        psError(__func__, " : Line %d - Null output array\n", __LINE__);
         return outArray;
     }
     
     if(inArray == NULL) {
-        printf("NULL input array\n");
+        psError(__func__, " : Line %d - Null input array\n", __LINE__);
         return outArray;
     }
@@ -138 +136 @@
     
     if(inN != outN) {
-        printf("Input and output array sizes are not equal");
+        psError(__func__, " : Line %d - Input and output array sizes are not equal: in=%d out=%d\n", __LINE__,
+                inN, outN);
         return outArray;
     }
@@ -152 +151 @@
     return outArray;
 }
-
-/** Creates an array of indices based on sort odred of float array.
- *
- *  Sorts an array of floats and creates an integer array holding indices of sorted float values based on 
- *  pre-sort index positions.
- *
- *  @return  psIntArray*: Pointer to psIntArray of sorted indices.
- */
 
 psIntArray *psSortIndex(
@@ -177 +168 @@
     
     if(outArray == NULL) {
-        printf("NULL output array n");
+        psError(__func__, " : Line %d - Null output array\n", __LINE__);
         return outArray;
     }
     
     if(inArray == NULL) {
-        printf("NULL input array\n");
+        psError(__func__, " : Line %d - Null input array\n", __LINE__);
         return outArray;
     }
@@ -193 +184 @@
 
     if(inN != outN) {
-        printf("Input and output array sizes are not equal");
+        psError(__func__, " : Line %d - Input and output array sizes are not equal: in=%d out=%d\n", __LINE__,
+                inN, outN);
         return outArray;
     }