X-Git-Url: http://git.nguyen.vg/gitweb/?a=blobdiff_plain;f=dynFMI.h;h=aad2d99aa2c34e41190d31e02d80444cf2919e2a;hb=HEAD;hp=41ef992736d2e1b024417a743cc4872121976485;hpb=7d27a4450ed429e3b63e9d3ba7217a28cbbf9a31;p=SXSI%2FTextCollection.git

diff --git a/dynFMI.h b/dynFMI.h
index 41ef992..aad2d99 100644
--- a/dynFMI.h
+++ b/dynFMI.h
@@ -28,7 +28,7 @@
 #include <iostream>
 #include <cstdlib>
 #include <fstream>
-#include <math.h>
+#include <cmath>
 #include <bitset>
 
 #ifndef SAMPLE
@@ -42,8 +42,6 @@
 
 
 #include "bittree.h"
-#include "handle.h"
-#include "pos.h"
 
 #if SAMPLE!=0
 #include "ssatree.h"
@@ -125,7 +123,7 @@ class DynFMI{
 				
 		
 		//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);
@@ -143,17 +141,18 @@ class DynFMI{
 		
 
 		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);
-		ulong* getKeys() {return handle->getKeys(); }	
+		/*ulong* getKeys() {return handle->getKeys(); }	
 		ulong getPos(ulong i)
-                { return handle->getPos(i); }
+                { return handle->getPos(i); }*/
 		
 	private:
+                ulong numberOfTexts;
 		WaveletNode *root;
 		WaveletNode **leaves; // needed for construction and select
 		
@@ -166,8 +165,8 @@ class DynFMI{
 #endif		
 		ulong iterate;
 				
-		Handle *handle;
-		Pos *pos;
+                //Handle *handle;
+		//Pos *pos;
 #if SAMPLE!=0
 		SampledSATree *sampledSATree;
 #endif