Fixes, and new rank/select ds

[SXSI/XMLTree.git] / XMLTree.cpp

diff --git a/XMLTree.cpp b/XMLTree.cpp
index 9057e31..2a1ca71 100644 (file)
--- a/XMLTree.cpp
+++ b/XMLTree.cpp
@@ -1053,11 +1053,12 @@ int XMLTree::CloseDocument()
     //static_bitsequence_builder * bmb = new static_bitsequence_builder_brw32(20);\r
     //static_permutation_builder * pmb = new static_permutation_builder_mrrr(PERM_SAMPLE, bmb);\r
     //static_sequence_builder * ssb = new static_sequence_builder_gmr_chunk(bmb, pmb);\r
-               static_bitsequence_builder * bmb = new static_bitsequence_builder_brw32(20);\r
+               static_bitsequence_builder * bmb = new static_bitsequence_builder_sdarray();\r
                alphabet_mapper *am = new alphabet_mapper_none();\r
-               wt_coder * wc = new wt_coder_huff((uint*)tags_aux,npar,am);\r
-               Tags = new static_sequence_wvtree((uint*)tags_aux,npar,wc ,bmb, am);\r
+               //wt_coder * wc = new wt_coder_huff((uint*)tags_aux,npar,am);\r
+               //Tags = new static_sequence_wvtree((uint*)tags_aux,npar,wc ,bmb, am);\r
     //Tags = new static_sequence_gmr((uint *) tags_aux, (uint) npar,ntagsize, bmb, ssb);\r
+               Tags = new static_sequence_bs((uint*)tags_aux,npar,am,bmb);\r
                \r
                cout << "Tags test: " << Tags->test((uint*)tags_aux,npar) << endl;\r
 \r