Changeset 1172 for trunk/psLib/src/collections/psBitSet.c

Timestamp:

Jul 1, 2004, 11:48:11 AM (22 years ago)

Author:

harman

Message:

Incorporated Ifa's bugs, comments, and additions

File:

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

trunk/psLib/src/collections/psBitSet.c

@@ -10 +10 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.11 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2004-07-01 00:57:31 $
+ *  @version $Revision: 1.12 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2004-07-01 21:48:11 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii
@@ -86 +86 @@
 
     if(n <= 0) {
-        psError(__func__, " : Line %d - Allocation size must be > 0: size = %d\n", __LINE__, n);
+        psError(__func__, " : Line %d - Allocation size must be > 0: size = %d", __LINE__, n);
         return 0;
     }
@@ -113 +113 @@
 {
     if(inBitSet == NULL) {
-        psError(__func__, " : Line %d - Null psBitSet for inBitSet argument\n", __LINE__);
+        psError(__func__, " : Line %d - Null psBitSet for inBitSet argument", __LINE__);
         return;
     }
@@ -124 +124 @@
 
     if(inBitSet == NULL) {
-        psError(__func__, " : Line %d - Null psBitSet for inBitSet argument\n", __LINE__);
+        psError(__func__, " : Line %d - Null psBitSet for inBitSet argument", __LINE__);
         return inBitSet;
     } else if(bit < 0) {
-        psError(__func__, " : Line %d - Bit position too small: %d\n", __LINE__, bit);
+        psError(__func__, " : Line %d - Bit position too small: %d", __LINE__, bit);
         return inBitSet;
     } else if(bit > inBitSet->n*8-1) {
-        psError(__func__, " : Line %d - Bit position too large: %d\n", __LINE__, bit);
+        psError(__func__, " : Line %d - Bit position too large: %d", __LINE__, bit);
         return inBitSet;
     }
@@ -146 +146 @@
 
     if(inBitSet == NULL) {
-        psError(__func__, " : Line %d - Null psBitSet for inBitSet argument\n", __LINE__);
+        psError(__func__, " : Line %d - Null psBitSet for inBitSet argument", __LINE__);
         return 0;
     } else if(bit < 0) {
-        psError(__func__, " : Line %d - Bit position too small: %d\n", __LINE__, bit);
+        psError(__func__, " : Line %d - Bit position too small: %d", __LINE__, bit);
         return 0;
     } else if(bit > inBitSet->n*8-1) {
-        psError(__func__, " : Line %d - Bit position too large: %d\n", __LINE__, bit);
+        psError(__func__, " : Line %d - Bit position too large: %d", __LINE__, bit);
         return 0;
     }
@@ -175 +175 @@
     char *inBits2 = NULL;
 
-    if(outBitSet == NULL) {
-        psError(__func__, " : Line %d - Null psBitSet for outBitSet argument\n", __LINE__);
-        return outBitSet;
-    }
-
     if(inBitSet1 == NULL) {
-        psError(__func__, " : Line %d - Null psBitSet for inBitSet1 argument\n", __LINE__);
+        psError(__func__, " : Line %d - Null psBitSet for inBitSet1 argument", __LINE__);
         return outBitSet;
     }
@@ -191 +186 @@
 
     if(inBitSet2 == NULL) {
-        psError(__func__, " : Line %d - Null psBitSet for inBitSet2 argument\n", __LINE__);
-        return outBitSet;
+        psError(__func__, " : Line %d - Null psBitSet for inBitSet2 argument", __LINE__);
+        return outBitSet;
+    }
+
+    if(outBitSet == NULL) {
+        outBitSet = psBitSetAlloc(inBitSet1->n*8);
     }
 
     if(inBitSet1->n != inBitSet2->n || outBitSet->n != inBitSet1->n) {
-        psError(__func__, " : Line %d - psBitSet sizes not the same\n", __LINE__);
+        psError(__func__, " : Line %d - psBitSet sizes not the same", __LINE__);
         return outBitSet;
     }
@@ -223 +222 @@
         break;
     default:
-        psError(__func__, " : Line %d - Invalid psBitMask binary operation: %s\n", __LINE__, operator);
+        psError(__func__, " : Line %d - Invalid psBitMask binary operation: %s", __LINE__, operator);
+    }
+
+    return outBitSet;
+}
+
+psBitSet* psBitSetNot(psBitSet *outBitSet, const psBitSet *restrict inBitSet)
+{
+    int i = 0;
+    int n = 0;
+    char *outBits = NULL;
+    char *inBits = NULL;
+
+    if(inBitSet == NULL) {
+        psError(__func__, " : Line %d - Null psBitSet for inBitSet argument", __LINE__);
+        return outBitSet;
+    }
+
+    n = inBitSet->n;
+    if(n == 0) {
+        psError(__func__, " : Line %d - No elements in inBitSet", __LINE__);
+        return outBitSet;
+    }
+
+    if(outBitSet == NULL) {
+        outBitSet = psBitSetAlloc(n*8);
+    }
+
+    if(inBitSet->n != outBitSet->n) {
+        psError(__func__, " : Line %d - psBitSet sizes not the same", __LINE__);
+        return outBitSet;
+    }
+
+    outBits = outBitSet->bits;
+    inBits = inBitSet->bits;
+
+    for(i=0; i<n; i++) {
+        outBits[i] = ~inBits[i];
     }