Quick fix for WT construction space

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/XMLTree@227 3cdefd35-fc62-479d-8e8d-bae585ffb9ca

diff --git a/libcds/src/static_sequence/static_sequence_wvtree.cpp b/libcds/src/static_sequence/static_sequence_wvtree.cpp
index d5713ce..e86da89 100644 (file)
--- a/libcds/src/static_sequence/static_sequence_wvtree.cpp
+++ b/libcds/src/static_sequence/static_sequence_wvtree.cpp
@@ -40,9 +40,10 @@ static_sequence_wvtree::static_sequence_wvtree(uchar * symbols, uint n, wt_coder
        am->use();
   this->c=c;
        c->use();
-       root = new wt_node_internal(symbols, n, 0, c, bmb);
-  for(uint i=0;i<n;i++) 
-    symbols[i] = (uchar)am->unmap((uint)symbols[i]);  
+       root = new wt_node_internal(symbols, n, 0, c, bmb); 
+        symbols = 0; // Already deleted!
+//  for(uint i=0;i<n;i++) 
+//    symbols[i] = (uchar)am->unmap((uint)symbols[i]);  
 }
 
 static_sequence_wvtree::static_sequence_wvtree() {}

diff --git a/libcds/src/static_sequence/wt_node_internal.cpp b/libcds/src/static_sequence/wt_node_internal.cpp
index 9dc87a2..f5312db 100644 (file)
--- a/libcds/src/static_sequence/wt_node_internal.cpp
+++ b/libcds/src/static_sequence/wt_node_internal.cpp
@@ -70,6 +70,7 @@ wt_node_internal::wt_node_internal(uint * symbols, uint n, uint l, wt_coder * c,
        delete [] right;
 }
 
+// Deletes symbols array!
 wt_node_internal::wt_node_internal(uchar * symbols, uint n, uint l, wt_coder * c, static_bitsequence_builder * bmb) {
        uint * ibitmap = new uint[n/W+1];
        for(uint i=0;i<n/W+1;i++)
@@ -99,24 +100,42 @@ wt_node_internal::wt_node_internal(uchar * symbols, uint n, uint l, wt_coder * c
                                        match_left = false;
                }
        }
+
+        delete [] symbols; 
+        symbols = 0;
+
        if(count_left>0) {
                if(match_left/* && c->done(left[0],l+1)*/)
-                       left_child = new wt_node_leaf((uint)left[0], count_left);
+                {
+                    left_child = new wt_node_leaf((uint)left[0], count_left);
+                    delete [] left;
+                    left = 0;
+                }
                else
-                       left_child = new wt_node_internal(left, count_left, l+1, c, bmb);
+                {
+                    left_child = new wt_node_internal(left, count_left, l+1, c, bmb);
+                    left = 0; // Already deleted
+                }
        } else {
                left_child = NULL;
        }
        if(count_right>0) {
                if(match_right/* && c->done(right[0],l+1)*/)
-                       right_child = new wt_node_leaf((uint)right[0], count_right);
-               else
-                       right_child = new wt_node_internal(right, count_right, l+1, c, bmb);
+                {
+                    right_child = new wt_node_leaf((uint)right[0], count_right);
+                    delete [] right;
+                    right = 0;
+                }
+               else 
+                {
+                    right_child = new wt_node_internal(right, count_right, l+1, c, bmb);
+                    right = 0; // Already deleted
+                }
        } else {
                right_child = NULL;
        }
-       delete [] left;
-       delete [] right;
+//     delete [] left; // already deleted
+//     delete [] right;
 }