Changeset 1228 for trunk/psLib/src/collections/psList.c

Timestamp:

Jul 15, 2004, 12:18:02 PM (22 years ago)

Author:

desonia

Message:

extracted the vector of pointers functionality to a new object, psArray.

File:

• trunk/psLib/src/collections/psList.c (modified) (9 diffs)

trunk/psLib/src/collections/psList.c

@@ -6 +6 @@
  *  @author Robert Daniel DeSonia, MHPCC
  *
- *  @version $Revision: 1.10 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-08 01:05:00 $
+ *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-15 22:18:02 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -401 +401 @@
  * Convert a psList to/from a psVoidPtrArray
  */
-psVector* psListToVector(psList* restrict list)
+psArray* psListToArray(psList* restrict list)
 {
     psListElem* ptr;
     unsigned int n;
-    psVector* restrict arr;
+    psArray* restrict arr;
 
     if (list == NULL) {
@@ -412 +412 @@
 
     if (list->size > 0) {
-        arr = psVectorAlloc(list->size, PS_TYPE_PTR);
-    } else {
-        arr = psVectorAlloc(1, PS_TYPE_PTR);
+        arr = psArrayAlloc(list->size);
+    } else {
+        arr = psArrayAlloc(1);
     }
 
@@ -422 +422 @@
     n = list->size;
     for (int i = 0; i < n; i++) {
-        arr->data.PTR[i] = psMemIncrRefCounter(ptr->data);
+        arr->data[i] = psMemIncrRefCounter(ptr->data);
         ptr = ptr->next;
     }
@@ -429 +429 @@
 }
 
-psList* psVectorToList(psVector* arr)
+psList* psArrayToList(psArray* arr)
 {
     unsigned int n;
@@ -435 +435 @@
 
     if (arr == NULL) {
-        return NULL;
-    }
-
-    if (arr->type.type != PS_TYPE_PTR) {
-        psError(__func__,"Can not convert a non pointer-vector to a linked list.");
         return NULL;
     }
@@ -446 +441 @@
     n = arr->n;
     for (int i = 0; i < n; i++) {
-        psListAdd(list,arr->data.PTR[i],PS_LIST_TAIL);
+        psListAdd(list,arr->data[i],PS_LIST_TAIL);
     }
 
@@ -455 +450 @@
 psList* psListSort(psList* list, psComparePtrFcn compare)
 {
-    psVector* vector;
+    psArray* arr;
     if (list == NULL) {
         return NULL;
@@ -461 +456 @@
 
     // convert to indexable vector for use by qsort.
-    vector = psListToVector(list);
+    arr = psListToArray(list);
     psFree(list);
 
-    qsort(vector->data.V, vector->n, sizeof(void*),
-          (int(*)(const void *, const void *))compare);
+    arr = psArraySort(arr,compare);
 
     // convert back to linked list
-    list = psVectorToList(vector);
-    psFree(vector);
+    list = psArrayToList(arr);
+    psFree(arr);
 
     return list;