Changeset 4457 for trunk/psLib/src/collections/psHash.c

Timestamp:

Jul 5, 2005, 5:04:35 PM (21 years ago)

Author:

drobbin

Message:

made changes based on revisions in psLib SDRS rev. 15

File:

• trunk/psLib/src/collections/psHash.c (modified) (8 diffs)

trunk/psLib/src/collections/psHash.c

@@ -12 +12 @@
 *  @author GLG, MHPCC
 *
-*  @version $Revision: 1.21 $ $Name: not supported by cvs2svn $
-*  @date $Date: 2005-06-25 02:02:05 $
+*  @version $Revision: 1.22 $ $Name: not supported by cvs2svn $
+*  @date $Date: 2005-07-06 03:04:35 $
 *
 *  Copyright 2004-2005 Maui High Performance Computing Center, University of Hawaii
@@ -57 +57 @@
     // Loop through every bucket in the hash table.  If that bucket is not
     // NULL, then add the bucket's key to the linked list.
-    for (i = 0; i < hash->nbucket; i++) {
+    for (i = 0; i < hash->n; i++) {
         if (hash->buckets[i] != NULL) {
             // Since a bucket contains a linked list of keys/data, we must
@@ -128 +128 @@
 
 /******************************************************************************
-psHashAlloc(nbucket): this procedure creates a new hash table with the
+psHashAlloc(n): this procedure creates a new hash table with the
 specified number of buckets.
 Inputs:
-    nbucket: initial number of buckets
+    n: initial number of buckets
 Return:
     The new hash table.
@@ -146 +146 @@
     // Allocate memory for the buckets.
     table->buckets = psAlloc(nalloc * sizeof(psHashBucket* ));
-    table->nbucket = nalloc;
+    table->n = nalloc;
 
     psTrace("utils.hash", 1, "Creating %d-element hash table\n", nalloc);
@@ -179 +179 @@
     // Loop through each bucket in the hash table.  If that bucket is not
     // NULL, then free the bucket via a function call to hashBucketFree();
-    for (i = 0; i < table->nbucket; i++) {
+    for (i = 0; i < table->n; i++) {
 
         // A bucket is composed of a linked list of buckets.
@@ -238 +238 @@
     // hash = (hash << 1) ^ key[i];
     // }
-    // hash &= (table->nbucket - 1);
+    // hash &= (table->n - 1);
 
     // This hash algorithm is from Sedgewick.  NOTE: must reread to ensure that
@@ -244 +244 @@
     tmpchar = (char *)key;
     for (hash = 0; *tmpchar != '\0'; tmpchar++) {
-        hash = (64 * hash + *tmpchar) % (table->nbucket);
+        hash = (64 * hash + *tmpchar) % (table->n);
     }
 
     // NOTE: This should not be necessary, but for now, I'm checking bounds
     // anyway.
-    if ((hash < 0) || (hash >= table->nbucket)) {
+    if ((hash < 0) || (hash >= table->n)) {
         psError(PS_ERR_UNKNOWN, true,
                 "Internal hash function out of range (%d)", hash);
@@ -409 +409 @@
     // psArray we need to allocate.
     int nElements = 0;
-    int nbucket = hash->nbucket;
+    int nbucket = hash->n;
     for (int i = 0; i < nbucket; i++) {
         psHashBucket* tmpBucket = hash->buckets[i];