X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=libcds%2Fsrc%2Fstatic_sequence%2Fwt_node_internal.cpp;h=4e6871a802ddf7bad3f2ec02900376490cb574b1;hb=95f2dabec7cabe4002865e5f9d12651e6e32229a;hp=d39ea4b126be3f11cd79adc1b2363ad6e1a82cb4;hpb=816fe5fd2e5c2ef306227c6870a45b026b923f2e;p=SXSI%2FXMLTree.git

diff --git a/libcds/src/static_sequence/wt_node_internal.cpp b/libcds/src/static_sequence/wt_node_internal.cpp
index d39ea4b..4e6871a 100644
--- a/libcds/src/static_sequence/wt_node_internal.cpp
+++ b/libcds/src/static_sequence/wt_node_internal.cpp
@@ -138,6 +138,95 @@ wt_node_internal::wt_node_internal(uchar * symbols, uint n, uint l, wt_coder * c
 	delete [] right;
 }
 
+wt_node_internal::wt_node_internal(uchar * symbols, uint n, uint l, wt_coder * c, static_bitsequence_builder * bmb, uint left, uint *done) {
+	uint * ibitmap = new uint[n/W+1];
+	for(uint i=0;i<n/W+1;i++)
+		ibitmap[i]=0;
+	for(uint i=0;i<n;i++) 
+		if(c->is_set((uint)symbols[i + left],l))
+			bitset(ibitmap,i);
+	bitmap = bmb->build(ibitmap, n);
+        delete [] ibitmap;
+
+	uint count_right = bitmap->rank1(n-1);
+	uint count_left = n-count_right;
+/*	uchar * leftarr = new uchar[count_left+1];
+	uchar * rightarr = new uchar[count_right+1];
+	count_right = count_left = 0;
+	for(uint i=0;i<n;i++) {
+		if(bitmap->access(i)) {
+			rightarr[count_right++]=symbols[i+left];
+		}
+		else {
+			leftarr[count_left++]=symbols[i+left];
+		}
+                }
+*/
+
+        for (uint i=0;i<n;i++)
+            set_field(done, 1, i+left, 0);
+
+        for (uint i = 0; i < n; ) 
+        {
+            uint j = i;
+            uchar swap = symbols[j+left];
+            while (!get_field(done, 1, j+left)) { // swapping
+                ulong k = j; 
+                if (!c->is_set(swap,l)) 
+                    j = bitmap->rank0(k)-1;
+                else 
+                    j = count_left + bitmap->rank1(k)-1;
+                uchar temp = symbols[j+left];
+                symbols[j+left] = swap;
+                swap = temp;
+                set_field(done,1,k+left,1);
+            }
+
+            while (get_field(done,1,i+left))
+                   ++i;
+        }
+
+        // checking
+        /*       for (uint i=0;i<n;i++)
+            if (!bitget(done,i+left)) 
+                std::cout << "not swapped: " << i << "\n";
+               for (uint i=0;i<count_left;i++)
+            if (leftarr[i] != symbols[i+left]) //c->is_set(symbols[i+left], l)) 
+            {    
+                std::cout << symbols[i+left] << " != " << leftarr[i] << " lev = " << l << "\n";
+                exit(0);
+            }
+        for (uint i=count_left;i<n;i++)
+            if (rightarr[i-count_left] != symbols[i+left]) //!c->is_set(symbols[i+left],l)) 
+                std::cout << symbols[i+left] << " != " << rightarr[i-count_left] <<  " lev = " << l <<  "\n";    
+        */
+	bool match_left = true, match_right = true;
+        for (uint i=1; i < count_left; i++)
+            if (symbols[i+left] != symbols[i+left-1])
+                match_left = false;
+        for (uint i=count_left + 1; i < n; i++)
+            if (symbols[i+left] != symbols[i+left-1])
+                match_right = false;
+
+
+	if(count_left>0) {
+		if(match_left/* && c->done(left[0],l+1)*/)
+                    left_child = new wt_node_leaf((uint)symbols[left], count_left);
+		else
+                    left_child = new wt_node_internal(symbols, count_left, l+1, c, bmb, left, done);
+	} else {
+		left_child = NULL;
+	}
+	if(count_right>0) {
+		if(match_right/* && c->done(right[0],l+1)*/)
+                    right_child = new wt_node_leaf((uint)symbols[left+count_left], count_right);
+		else 
+                    right_child = new wt_node_internal(symbols, count_right, l+1, c, bmb, left+count_left, done);
+	} else {
+		right_child = NULL;
+	}
+}
+
 
 wt_node_internal::wt_node_internal() { }
 
@@ -161,39 +250,12 @@ uint wt_node_internal::rank(uint symbol, uint pos, uint l, wt_coder * c) {
 
 // return value is rank of symbol (less or equal to the given symbol) that has rank > 0, 
 // the parameter symbol is updated accordinly
-uint wt_node_internal::rankLessThan(uint &symbol, uint pos, uint l, wt_coder * c) 
-{
-    bool is_set = c->is_set(symbol,l);
-    using std::cout;
-    using std::endl;
-//    cout << "l = " << l << ", symbol = " << (uchar)symbol << ", rank0 = " << bitmap->rank0(pos) << ", rank1 = " << bitmap->rank1(pos) << endl;
-
-    uint result = -1;
-    if(!is_set) {
-        if(left_child==NULL) return -1;
-        uint rank = bitmap->rank0(pos);
-        if(rank != 0)
-            result = left_child->rankLessThan(symbol,rank-1,l+1,c);
-        return result;
-    }
-
-    uint rank = bitmap->rank1(pos);
-    if (rank != 0 && right_child != NULL)
-        result = right_child->rankLessThan(symbol, rank-1,l+1,c);
-
-//    cout << "recursion to leftchild at l = " << l << ", symbol = " << (uchar)symbol << ", rank0 = " << bitmap->rank0(pos) << ", rank1 = " << bitmap->rank1(pos) << endl;
-    // check left child for symbols <= givenSymbol
-    if (result != (uint)-1 || left_child == NULL)
-        return result;
-    return left_child->rankLessThan(symbol, bitmap->rank0(pos)-1);
-}
-
 uint wt_node_internal::rankLessThan(uint &symbol, uint pos) 
 {
     uint result = -1;
     using std::cout;
     using std::endl;
-//    cout << "pos = " << pos << ", symbol = " << (uchar)symbol << endl;
+//    cout << "pos = " << pos << ", symbol = " << symbol << endl;
     
     if (pos == (uint)-1)
         return (uint)-1;
@@ -340,7 +402,7 @@ void wt_node_internal::access(vector<int> &result, uint i, uint j)
     }
 }
 
-
+// Count
 uint wt_node_internal::access(uint i, uint j, uint min, uint max, uint l, uint pivot)
 {
     uint count = 0;