X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=bittree.h;h=8427e90395d9a14ad1e63143c1138bfc7f7e9eee;hb=5d74bc076c9d15d607d183c16ff8468ea961a0f9;hp=5344f74caa730dfb75629526df8575cc8a8837ec;hpb=7d27a4450ed429e3b63e9d3ba7217a28cbbf9a31;p=SXSI%2FTextCollection.git

diff --git a/bittree.h b/bittree.h
index 5344f74..8427e90 100644
--- a/bittree.h
+++ b/bittree.h
@@ -39,7 +39,7 @@
 #include <cstdio>
 
 #include "rbtree.h"
-
+#include "Tools.h"
 
 #ifndef uchar
 #define uchar unsigned char
@@ -49,11 +49,8 @@
 #endif
 
 
-#ifndef LOGN
-#define LOGN 64
-#endif
 
-const int logn = LOGN;
+const int logn = (W * 2);
 
 //upperBound = 2 * logn;
 //lowerBound = logn / 2;
@@ -73,7 +70,7 @@ class BVNode : public RBNode
 	ulong subTreePositions; //number of positions stored in the subtree rooted at this node
 	ulong subTreeRank;      //number of bits set in the subtree rooted at this node
 
-        std::bitset<2*logn> *block; // 4 bytes
+        std::bitset<2*logn> *block; // 4 words
 	
 
 	BVNode()