Changeset 14267

Timestamp:

Jul 17, 2007, 10:32:02 AM (19 years ago)

Author:

Paul Price

Message:

Adding function to sort vectors in-place.

Location:

trunk/psLib/src/mathtypes

Files:

• psVector.c (modified) (5 diffs)
• psVector.h (modified) (2 diffs)

trunk/psLib/src/mathtypes/psVector.c

@@ -10 +10 @@
 *  @author Joshua Hoblitt, University of Hawaii
 *
-*  @version $Revision: 1.96 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2007-03-14 00:39:51 $
+*  @version $Revision: 1.97 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2007-07-17 20:32:02 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -347 +347 @@
 case PS_TYPE_##NAME: { \
     ps##NAME temp; \
-    ps##NAME *value = outVector->data.NAME; \
+    ps##NAME *value = vector->data.NAME; \
     for (;;) { \
         if (l > 0) { \
@@ -356 +356 @@
             if (--ir == 0) { \
                 value[0] = temp; \
-                return outVector; \
+                return true; \
             } \
         } \
@@ -376 +376 @@
 break;
 
-psVector* psVectorSort(psVector* outVector,
-                       const psVector* inVector)
-{
-    if (!inVector) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                _("psVectorSort can not sort a NULL psVector."));
-        psFree(outVector);
-        return NULL;
-    }
-
-    outVector = psVectorCopy(outVector, inVector, inVector->type.type);
-    if (outVector == NULL) {
-        psError(PS_ERR_BAD_PARAMETER_NULL, true,
-                "Error in psVectorSort:  psVectorCopy returned NULL vector!\n");
-        return NULL;
-    }
-    long N = outVector->n;                    // Number of elements
+bool psVectorSortInPlace(const psVector *vector)
+{
+    PS_ASSERT_VECTOR_NON_NULL(vector, false);
+
+    long N = vector->n;                    // Number of elements
     if (N < 2) {
-        return outVector;
+        return true;
     }
     long l = N >> 1;
     long ir = N - 1;
-    switch (outVector->type.type) {
+    switch (vector->type.type) {
         PSVECTOR_SORT_CASE(U8);
         PSVECTOR_SORT_CASE(U16);
@@ -412 +400 @@
         psError(PS_ERR_BAD_PARAMETER_TYPE, true,
                 _("Input psVector is an unsupported type (0x%x)."),
-                inVector->type.type);
+                vector->type.type);
+        return false;
+    }
+    return true;
+}
+
+psVector* psVectorSort(psVector* outVector,
+                       const psVector* inVector)
+{
+    if (!inVector) {
+        psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                _("psVectorSort can not sort a NULL psVector."));
         psFree(outVector);
         return NULL;
     }
+
+    if (outVector != inVector) {
+        outVector = psVectorCopy(outVector, inVector, inVector->type.type);
+        if (!outVector) {
+            psError(PS_ERR_BAD_PARAMETER_NULL, true,
+                    "Error in psVectorSort:  psVectorCopy returned NULL vector!\n");
+            return NULL;
+        }
+    }
+
+    if (!psVectorSortInPlace(outVector)) {
+        psFree(outVector);
+        return NULL;
+    }
+
     return outVector;
 }

trunk/psLib/src/mathtypes/psVector.h

@@ -10 +10 @@
  * @author Joshua Hoblitt, University of Hawaii
  *
- * @version $Revision: 1.67 $ $Name: not supported by cvs2svn $
- * @date $Date: 2007-03-14 00:39:51 $
+ * @version $Revision: 1.68 $ $Name: not supported by cvs2svn $
+ * @date $Date: 2007-07-17 20:32:02 $
  * Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
  */
@@ -222 +222 @@
 #endif // ifdef DOXYGEN
 
+/** Sort a vector in-place
+ *
+ * Sorts in ascending order
+ *
+ * @return  bool           Success or failure
+ */
+bool psVectorSortInPlace(const psVector *vector ///< Vector to sort
+    );
 
 /** Sort an array of floats.