projects
/
SXSI
/
TextCollection.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added TextStorage class
[SXSI/TextCollection.git]
/
dynFMI.h
diff --git
a/dynFMI.h
b/dynFMI.h
index
a57ee92
..
aad2d99
100644
(file)
--- a/
dynFMI.h
+++ b/
dynFMI.h
@@
-42,8
+42,6
@@
#include "bittree.h"
#include "bittree.h"
-#include "handle.h"
-#include "pos.h"
#if SAMPLE!=0
#include "ssatree.h"
#if SAMPLE!=0
#include "ssatree.h"
@@
-125,7
+123,7
@@
class DynFMI{
//n=length of str, del=delete text afterwards
//n=length of str, del=delete text afterwards
-
ulong
addText(uchar const * str, ulong n);
+
void
addText(uchar const * str, ulong n);
ulong addTextFromFile(char* filename, ulong n);
uchar* retrieveText(ulong text);
bool deleteText(ulong key);
ulong addTextFromFile(char* filename, ulong n);
uchar* retrieveText(ulong text);
bool deleteText(ulong key);
@@
-143,17
+141,18
@@
class DynFMI{
ulong getSize() {return root->bittree->getPositions();}
ulong getSize() {return root->bittree->getPositions();}
- ulong getCollectionSize(){ return pos->getSize();}
+ ulong getCollectionSize(){ return
numberOfTexts; }//
pos->getSize();}
uchar* getBWT();
std::ostream& getBWTStream(std::ostream& stream);
uchar operator[](ulong i);
void printDynFMIContent(std::ostream& stream);
uchar* getBWT();
std::ostream& getBWTStream(std::ostream& stream);
uchar operator[](ulong i);
void printDynFMIContent(std::ostream& stream);
- ulong* getKeys() {return handle->getKeys(); }
+ /*ulong* getKeys() {return handle->getKeys(); }
ulong getPos(ulong i)
ulong getPos(ulong i)
- { return handle->getPos(i); }
+ { return handle->getPos(i); }
*/
private:
private:
+ ulong numberOfTexts;
WaveletNode *root;
WaveletNode **leaves; // needed for construction and select
WaveletNode *root;
WaveletNode **leaves; // needed for construction and select
@@
-166,8
+165,8
@@
class DynFMI{
#endif
ulong iterate;
#endif
ulong iterate;
- Handle *handle;
- Pos *pos;
+
//
Handle *handle;
+
//
Pos *pos;
#if SAMPLE!=0
SampledSATree *sampledSATree;
#endif
#if SAMPLE!=0
SampledSATree *sampledSATree;
#endif