Changeset 1111

Timestamp:

Jun 28, 2004, 10:36:37 AM (22 years ago)

Author:

desonia

Message:

added pslistSort and cooresponding compare functions.

Location:

trunk/psLib/src

Files:

• collections/Makefile (modified) (2 diffs)
• collections/psCompare.c (added)
• collections/psCompare.h (added)
• collections/psList.c (modified) (3 diffs)
• collections/psList.d (modified) (1 diff)
• collections/psList.h (modified) (3 diffs)
• math/psCompare.c (added)
• math/psCompare.h (added)
• sysUtils/psHash.d (modified) (1 diff)
• types/psList.c (modified) (3 diffs)
• types/psList.h (modified) (3 diffs)

trunk/psLib/src/collections/Makefile

@@ -3 +3 @@
 ##  Makefile:   collections
 ##
-##  $Revision: 1.21 $  $Name: not supported by cvs2svn $
-##  $Date: 2004-06-18 23:36:27 $
+##  $Revision: 1.22 $  $Name: not supported by cvs2svn $
+##  $Date: 2004-06-28 20:36:37 $
 ##
 ##  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -35 +35 @@
            psImage.o \
            psList.o \
-           psScalar.o
+           psScalar.o \
+           psCompare.o
 
 # Define PHONY target "all" which will make all the necessary items

trunk/psLib/src/collections/psList.c

@@ -1 +1 @@
 /** @file psList.c
  *  @brief Support for doubly linked lists
- *  @ingroup DataContainers
+ *  @ingroup LinkedList
  *
  *  @author Robert Lupton, Princeton University
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-28 20:36:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -426 +426 @@
     arr->n = list->size;
 
-
     ptr = list->head;
     n = list->size;
@@ -459 +458 @@
     return list;
 }
+
+
+psList* psListSort(psList* list, psCompareFcn compare)
+{
+    psVector* vector;
+    if (list == NULL) {
+        return NULL;
+    }
+
+    // convert to indexable vector for use by qsort.
+    vector = psListToVector(list);
+    psFree(list);
+
+    qsort(vector->data.V, vector->n, sizeof(void*),
+          (int(*)(const void *, const void *))compare);
+
+    // convert back to linked list
+    list = psVectorToList(vector);
+
+    return list;
+}

trunk/psLib/src/collections/psList.d

@@ -1 +1 @@
 psList.o psList.d : psList.c ../sysUtils/psError.h ../sysUtils/psAbort.h \
-  ../sysUtils/psMemory.h psList.h psVector.h psType.h \
+  ../sysUtils/psMemory.h psList.h psCompare.h psVector.h psType.h \
   ../sysUtils/psTrace.h ../sysUtils/psLogMsg.h

trunk/psLib/src/collections/psList.h

@@ -10 +10 @@
  *  @ingroup LinkedList
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-28 20:36:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 #include <pthread.h>                   // we need a mutex to make this stuff thread safe.
 
+#include "psCompare.h"
 #include "psVector.h"
 
@@ -181 +182 @@
 );
 
+psList* psListSort(psList* list, psCompareFcn compare);
+
 /// @} End of DataGroup Functions
 
 #endif
+

trunk/psLib/src/sysUtils/psHash.d

@@ -1 +1 @@
 psHash.o psHash.d : psHash.c psHash.h ../collections/psList.h \
-  ../collections/psVector.h ../collections/psType.h psMemory.h psString.h \
-  psTrace.h psAbort.h
+  ../collections/psCompare.h ../collections/psVector.h \
+  ../collections/psType.h psMemory.h psString.h psTrace.h psAbort.h

trunk/psLib/src/types/psList.c

@@ -1 +1 @@
 /** @file psList.c
  *  @brief Support for doubly linked lists
- *  @ingroup DataContainers
+ *  @ingroup LinkedList
  *
  *  @author Robert Lupton, Princeton University
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.8 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-28 20:36:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -426 +426 @@
     arr->n = list->size;
 
-
     ptr = list->head;
     n = list->size;
@@ -459 +458 @@
     return list;
 }
+
+
+psList* psListSort(psList* list, psCompareFcn compare)
+{
+    psVector* vector;
+    if (list == NULL) {
+        return NULL;
+    }
+
+    // convert to indexable vector for use by qsort.
+    vector = psListToVector(list);
+    psFree(list);
+
+    qsort(vector->data.V, vector->n, sizeof(void*),
+          (int(*)(const void *, const void *))compare);
+
+    // convert back to linked list
+    list = psVectorToList(vector);
+
+    return list;
+}

trunk/psLib/src/types/psList.h

@@ -10 +10 @@
  *  @ingroup LinkedList
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-06-23 23:00:15 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-06-28 20:36:37 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -18 +18 @@
 #include <pthread.h>                   // we need a mutex to make this stuff thread safe.
 
+#include "psCompare.h"
 #include "psVector.h"
 
@@ -181 +182 @@
 );
 
+psList* psListSort(psList* list, psCompareFcn compare);
+
 /// @} End of DataGroup Functions
 
 #endif
+