Changeset 1233 for trunk/psLib/src/dataManip

Timestamp:

Jul 15, 2004, 1:52:34 PM (22 years ago)

Author:

desonia

Message:

Changed psSort and psSortIndex to psVectorSort and psVectorSortIndex as well as added support for all non-complex datatypes.

Location:

trunk/psLib/src/dataManip

Files:

• psFunctions.c (modified) (2 diffs)
• psFunctions.d (modified) (1 diff)
• psMinimize.c (modified) (2 diffs)
• psMinimize.d (modified) (1 diff)
• psStats.c (modified) (3 diffs)
• psStats.d (modified) (1 diff)

trunk/psLib/src/dataManip/psFunctions.c

@@ -7 +7 @@
  *  polynomials.  It also contains a Gaussian functions.
  *
- *  @version $Revision: 1.14 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.15 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-15 23:52:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -28 +28 @@
 #include "psAbort.h"
 #include "psFunctions.h"
-#include "psSort.h"
 
 #include "float.h"

trunk/psLib/src/dataManip/psFunctions.d

@@ -1 +1 @@
 psFunctions.o psFunctions.d : psFunctions.c ../sysUtils/psMemory.h \
   ../collections/psVector.h ../collections/psType.h ../sysUtils/psTrace.h \
-  ../sysUtils/psError.h ../sysUtils/psAbort.h psFunctions.h \
-  ../collections/psSort.h
+  ../sysUtils/psError.h ../sysUtils/psAbort.h psFunctions.h

trunk/psLib/src/dataManip/psMinimize.c

@@ -9 +9 @@
  *  @author George Gusciora, MHPCC
  *
- *  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-08 20:50:46 $
+ *  @version $Revision: 1.23 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-15 23:52:34 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -38 +38 @@
 #include "psAbort.h"
 #include "psFunctions.h"
-#include "psSort.h"
 #include "psMinimize.h"
 #include "psMatrix.h"

trunk/psLib/src/dataManip/psMinimize.d

@@ -2 +2 @@
   ../collections/psVector.h ../collections/psType.h \
   ../collections/psImage.h ../sysUtils/psTrace.h ../sysUtils/psError.h \
-  ../sysUtils/psAbort.h psFunctions.h ../collections/psSort.h \
-  psMinimize.h psMatrix.h
+  ../sysUtils/psAbort.h psFunctions.h psMinimize.h psMatrix.h

trunk/psLib/src/dataManip/psStats.c

@@ -12 +12 @@
 #include "psAbort.h"
 #include "psStats.h"
-#include "psSort.h"
 
 #include "float.h"
@@ -672 +671 @@
     }
     // Sort the temporary vectors.
-    psSort(sortedVector, unsortedVector);
+    psVectorSort(sortedVector, unsortedVector);
 
     // Calculate the median exactly.
@@ -828 +827 @@
 
     // Sort the temporary vectors.
-    psSort(sortedVector, unsortedVector);
+    psVectorSort(sortedVector, unsortedVector);
 
     // Calculate the quartile points exactly.

trunk/psLib/src/dataManip/psStats.d

@@ -1 +1 @@
 psStats.o psStats.d : psStats.c ../sysUtils/psMemory.h ../collections/psVector.h \
   ../collections/psType.h ../sysUtils/psTrace.h ../sysUtils/psError.h \
-  ../sysUtils/psAbort.h psStats.h ../collections/psSort.h
+  ../sysUtils/psAbort.h psStats.h