X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=libcds%2Fsrc%2Fstatic_sequence%2Fwt_node_leaf.cpp;h=02bc9cc313ab04027ce76f1212a49d2572d0992f;hb=a01a06472c8dcf1c58a8d87e6b93eb709b921d0e;hp=e3b7c195c60fd2477dbe94ab658393c32d258e5b;hpb=450ba3c9c74665094fb8f6821d6cc92d2bf23011;p=SXSI%2FXMLTree.git

diff --git a/libcds/src/static_sequence/wt_node_leaf.cpp b/libcds/src/static_sequence/wt_node_leaf.cpp
index e3b7c19..02bc9cc 100644
--- 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;
 }