X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=libcds%2Fsrc%2Fstatic_sequence%2Fstatic_sequence.h;h=594a7485a4a09485731a8831469cc13fab326043;hb=f32808a35be7a1e62830a5972473178014fa44e5;hp=cf8a1e002d1cd951e99b3a6b62122fb4f29fa8bf;hpb=a9846746dc7a55764591fcc273fd48c6049df962;p=SXSI%2FXMLTree.git

diff --git a/libcds/src/static_sequence/static_sequence.h b/libcds/src/static_sequence/static_sequence.h
index cf8a1e0..594a748 100644
--- a/libcds/src/static_sequence/static_sequence.h
+++ b/libcds/src/static_sequence/static_sequence.h
@@ -25,13 +25,15 @@
 
 #include <basics.h>
 #include <iostream>
-
+#include <vector>
+using std::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;
+//using namespace std;
 
 /** Base class for static sequences, contains many abstract functions, so this can't
  *  be instantiated. 
@@ -46,13 +48,47 @@ 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;
+	virtual uint select_next(uint c, uint i);
 
   /** 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 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();
@@ -65,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);
@@ -79,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 */