patches

[SXSI/XMLTree.git] / libcds / src / static_sequence / static_sequence.h

diff --git a/libcds/src/static_sequence/static_sequence.h b/libcds/src/static_sequence/static_sequence.h
index 0baf721..e3b72dc 100644 (file)
--- a/libcds/src/static_sequence/static_sequence.h
+++ b/libcds/src/static_sequence/static_sequence.h
@@ -27,6 +27,9 @@
 #include <iostream>
 
 #define WVTREE_HDR 2
+#define GMR_CHUNK_HDR 3
+#define GMR_HDR 4
+#define WVTREE_NOPTRS_HDR 5
 
 using namespace std;
 
@@ -43,25 +46,38 @@ public:
 
   /** Returns the number of occurrences of c until position i */
   virtual uint rank(uint c, uint i)=0;
-
+  virtual uint rankLessThan(uint &i, uint j)
+  {
+      //assert(0); // Implemented only in static_sequence_wvtree
+      return -1;
+  }
+  
   /** Returns the position of the i-th c 
    * @return (uint)-1 if i=0, len if i exceeds the number of cs */
   virtual uint select(uint c, uint i)=0;
 
   /** Returns the i-th element */
   virtual uint access(uint i)=0;
+  virtual uint access(uint i, uint &rank)
+  {
+      //assert(0); // Implemented only in static_sequence_wvtree
+      return -1;
+  }
+      
 
   /** Returns the length of the sequence */
   virtual uint length();
 
   /** Returns how many cs are in the sequence */
-  virtual uint count(uint c)=0;
+  virtual uint count(uint c);
 
   /** Returns the size of the structure in bytes */
   virtual uint size()=0;
 
   /** Stores the bitmap given a file pointer, return 0 in case of success */
   virtual uint save(FILE * fp)=0;
+
+       virtual bool test(uint * seq, uint n);
   
   /** Reads a bitmap determining the type */
   static static_sequence * load(FILE * fp);
@@ -73,5 +89,8 @@ protected:
 };
 
 #include <static_sequence_wvtree.h>
+#include <static_sequence_gmr_chunk.h>
+#include <static_sequence_wvtree_noptrs.h>
+#include <static_sequence_gmr.h>
 
 #endif  /* _STATIC_SEQUENCE_H */