Added support for char arrays

[SXSI/XMLTree.git] / libcds / src / static_sequence / wt_node_leaf.cpp

diff --git a/libcds/src/static_sequence/wt_node_leaf.cpp b/libcds/src/static_sequence/wt_node_leaf.cpp
index e3b7c19..02bc9cc 100644 (file)
--- a/libcds/src/static_sequence/wt_node_leaf.cpp
+++ b/libcds/src/static_sequence/wt_node_leaf.cpp
@@ -31,20 +31,37 @@ wt_node_leaf::wt_node_leaf() {}
 wt_node_leaf::~wt_node_leaf() {}
 
 uint wt_node_leaf::rank(uint symbol, uint pos, uint l, wt_coder * c) {
-       assert(symbol==this->symbol);
+       if(symbol!=this->symbol) return 0;
        pos++;
-       assert(pos<=count);
        return pos;
 }
 
+uint wt_node_leaf::rankLessThan(uint &symbol, uint pos, uint l, wt_coder * c) {
+//    std::cout <<"this-symbol: " << (uchar)this->symbol << ", symbol = " << (uchar)symbol << ", pos = " << pos << std::endl;
+       if(symbol > this->symbol) return -1;
+        symbol = this->symbol;
+       pos++;
+       return pos;
+}
+
+uint wt_node_leaf::rankLessThan(uint &symbol, uint pos) {
+//    std::cout <<"this-symbol: " << (uchar)this->symbol << ", symbol = " << (uchar)symbol << ", pos = " << pos << std::endl;
+    if (pos == -1)
+        return -1;
+    symbol = this->symbol;
+    pos++;
+    return pos;
+}
+
 uint wt_node_leaf::select(uint symbol, uint pos, uint l, wt_coder * c) {
-       assert(symbol==this->symbol);
-       assert(pos<=count && pos>0);
+       if(symbol!=this->symbol) return (uint)-1;
+       if(pos==0 || pos>count) return (uint)-1;
        return pos;
 }
 
 uint wt_node_leaf::access(uint pos) {
-       assert(pos<count);
+//   std::cout <<"this-symbol: " << (uchar)this->symbol << ", pos = " << pos << std::endl;
+
        return symbol;
 }