Merge branch 'master' of ssh://plrg.eecs.uci.edu/home/git/constraint_compiler

[satune.git] / src / Collections / corestructs.h

diff --git a/src/Collections/corestructs.h b/src/Collections/corestructs.h
index 1e808cb6166b63052a75dd2211f099d987f19717..5e8a7de935b8f1e3818ed156efc9d03c7cb150f0 100644 (file)
--- a/src/Collections/corestructs.h
+++ b/src/Collections/corestructs.h
@@ -4,7 +4,38 @@
 #include "cppvector.h"
 #include "hashset.h"
 
-typedef Hashset<Boolean *, uintptr_t, 4> HashsetBoolean;
-typedef SetIterator<Boolean *, uintptr_t, 4> SetIteratorBoolean;
+//How much should we shift pointers when computing hash functions
+//5 appears to be the minimum value for Ubuntu 64-bit
+
+#define PTRSHIFT 5
+
+class BooleanEdge {
+ public:
+ BooleanEdge() : b(NULL) {}
+ BooleanEdge(Boolean * _b) : b(_b) {}
+       BooleanEdge negate() {return BooleanEdge((Boolean *)(((uintptr_t) b) ^ 1));}
+       bool operator==(BooleanEdge e) { return b==e.b;}
+       bool operator!=(BooleanEdge e) { return b!=e.b;}
+       bool isNegated() { return ((uintptr_t) b) & 1; }
+       Boolean * getBoolean() {return (Boolean *)(((uintptr_t)b) & ~((uintptr_t) 1));}
+       Boolean * getRaw() {return b;}
+       Boolean * operator->() {return getBoolean();}
+       operator bool() const {return b != NULL;}
+ private:
+       Boolean *b;
+};
+
+inline bool boolEdgeEquals(BooleanEdge b1, BooleanEdge b2) {
+       return b1==b2;
+}
+
+inline unsigned int boolEdgeHash(BooleanEdge b) {
+       return (unsigned int) (((uintptr_t)b.getRaw())>>PTRSHIFT);
+}
+                                                                       
+typedef Hashset<BooleanEdge, uintptr_t, PTRSHIFT, & boolEdgeHash, & boolEdgeEquals> HashsetBooleanEdge;
+typedef Hashset<Order *, uintptr_t, PTRSHIFT> HashsetOrder;
+typedef SetIterator<BooleanEdge, uintptr_t, PTRSHIFT, & boolEdgeHash, & boolEdgeEquals> SetIteratorBooleanEdge;
+typedef SetIterator<Order *, uintptr_t, PTRSHIFT> SetIteratorOrder;
 
 #endif