improvements...

[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 f8f3bb5..4fa5da4 100644 (file)
--- a/libcds/src/static_sequence/static_sequence.h
+++ b/libcds/src/static_sequence/static_sequence.h
@@ -25,11 +25,13 @@
 
 #include <basics.h>
 #include <iostream>
+#include <vector>
 
 #define WVTREE_HDR 2
 #define GMR_CHUNK_HDR 3
 #define GMR_HDR 4
 #define WVTREE_NOPTRS_HDR 5
+#define BS_HDR 6
 
 using namespace std;
 
@@ -55,6 +57,7 @@ public:
   /** 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;
+       virtual uint select_next(uint c, uint i);
 
   /** Returns the i-th element */
   virtual uint access(uint i)=0;
@@ -63,7 +66,29 @@ public:
       //assert(0); // Implemented only in static_sequence_wvtree
       return -1;
   }
-      
+
+  // Returns all elements from interval [i, j] such that 
+  // their value is in [min, max].
+  virtual vector<int> access(uint i, uint j, uint min, uint max)
+  {
+      //assert(0); // Implemented only in static_sequence_wvtree
+      return vector<int>();
+  }
+
+  // Returns all elements from interval [i, j] 
+  virtual vector<int> accessAll(uint i, uint j)
+  {
+      //assert(0); // Implemented only in static_sequence_wvtree
+      return vector<int>();
+  }
+
+  // Counts the number of elements in interval [i,j] such that
+  // their values are in [min,max]
+  virtual uint count(uint i, uint j, uint min, uint max)
+  {
+      //assert(0); // Implemented only in static_sequence_wvtree
+      return 0;
+  }
 
   /** Returns the length of the sequence */
   virtual uint length();
@@ -76,6 +101,8 @@ public:
 
   /** 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);
@@ -90,5 +117,6 @@ protected:
 #include <static_sequence_gmr_chunk.h>
 #include <static_sequence_wvtree_noptrs.h>
 #include <static_sequence_gmr.h>
+#include <static_sequence_bs.h>
 
 #endif  /* _STATIC_SEQUENCE_H */