From: nvalimak <nvalimak@3cdefd35-fc62-479d-8e8d-bae585ffb9ca>
Date: Fri, 9 Jan 2009 13:39:04 +0000 (+0000)
Subject: Reduced functionality to save space
X-Git-Url: http://git.nguyen.vg/gitweb/?a=commitdiff_plain;h=3576506a7373aa33aea8d043c333e252fa31565a;hp=eb8c4383c94d465b888974afdab370ca013bbe01;p=SXSI%2FTextCollection.git

Reduced functionality to save space

git-svn-id: svn+ssh://idea.nguyen.vg/svn/sxsi/trunk/TextCollection@52 3cdefd35-fc62-479d-8e8d-bae585ffb9ca
---

diff --git a/dynFMI.h b/dynFMI.h
index a57ee92..aad2d99 100644
--- a/dynFMI.h
+++ b/dynFMI.h
@@ -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