Merge pull request #21 from ekg/wm_string

dynamic wavelet matrix

Author: nicolaprezza

.gitignore

@@ -4,3 +4,4 @@ CMakeLists.txt~
 debug.cpp~
 gap_bv_benchmark.txt
 README.md~
+*~

CMakeLists.txt

@@ -53,6 +53,7 @@ add_executable(h0_lz77 h0_lz77.cpp)
 add_executable(rle_bwt rle_bwt.cpp)
 add_executable(cw-bwt cw-bwt.cpp)
 add_executable(benchmark benchmark.cpp)
+add_executable(wm_string wm_string.cpp)
 
 add_dependencies(debug hopscotch_map)
 add_dependencies(rle_lz77_v1 hopscotch_map)
@@ -61,4 +62,5 @@ add_dependencies(h0_lz77 hopscotch_map)
 add_dependencies(rle_bwt hopscotch_map)
 add_dependencies(cw-bwt hopscotch_map)
 add_dependencies(benchmark hopscotch_map)
+add_dependencies(wm_string hopscotch_map)
 

include/dynamic.hpp

@@ -23,6 +23,7 @@
 #include <internal/hacked_vector.hpp>
 #include <internal/lciv.hpp>
 #include <internal/wt_string.hpp>
+#include <internal/wm_string.hpp>
 #include <internal/fm_index.hpp>
 
 namespace dyn{
@@ -57,6 +58,11 @@ typedef succinct_bitvector<spsi<packed_bit_vector,8192,16>> suc_bv;
  */
 typedef wt_string<suc_bv> wt_str;
 
+/*
+ * succinct/compressed dynamic string implemented with a wavelet matrix.
+ */
+typedef wm_string<succinct_bitvector<spsi<packed_bit_vector,256,16>>> wm_str;
+
 /*
  * run-length encoded (RLE) string. This string uses 1 sparse bitvector
  * for all runs, one dynamic string for run heads, and sigma sparse bitvectors (one per character)