update suffix_tree

Author: xtaci

include/suffix_tree.h

@@ -17,6 +17,7 @@
  ******************************************************************************/
 
 #include <string>
+//#include <tr1/unordered_map>
 #include <limits>
 #include <map>
 #include <vector>
@@ -31,12 +32,13 @@ using std::cout;
 using std::endl;
 using std::out_of_range;
 using std::ostream;
+//typedef tr1::unordered_map map;
 
 // TODO: upgrade it to process trace. Rule: char-->elem  string-->elem_list
 class SuffixTree {
 	public:
 		// active point is initialized as (root, None, 0), remainder initialized as 1
-		SuffixTree(string str):test_str(str), pos(0), root(test_str), active_point(&root, 0, 0), remainder(0), ls() {}
+		SuffixTree(string str):test_str(str), root(test_str), active_point(&root, 0, 0), remainder(0), pos(0), ls() {}
 		int construct(void);
 
 		// return -1 if no such sub exist, return the beginning postion of this substring in thr original string if it exist
@@ -54,7 +56,6 @@ class SuffixTree {
 				int edge_len = -1;
 				bool flag = true;
 
-
 				while (flag) {
 					if (edge == NULL) {
 						edge = node->find_edge(*result);	
@@ -96,27 +97,25 @@ class SuffixTree {
 
 		struct Edge{
 			// the begin and end pos of this edge, note that INT_MAX stands for #(the changing end pos of this entire string)
-			int begin, end;
+			unsigned int begin, end;
 			// Is there a better way to find test_str?
 			string& test_node_str;
 
 			Node * endpoint;
 
-			Edge(int b, int e, string& str):
-				test_node_str(str) {
+			Edge(unsigned int b, unsigned int e, string& str): test_node_str(str) {
 				begin = b;
 				end = e;
 				endpoint = NULL;
 				//std::cout << "Edge initialized" << std::endl;
 			}
 
-			void change_edge(int b, int e) {
+			void change_edge(unsigned int b, unsigned int e) {
 				begin = b;
 				end = e;
 			}
 
 			int length(void) {
-
 				if (end > test_node_str.size())
 					return test_node_str.size() - begin;
 				else
@@ -128,7 +127,7 @@ class SuffixTree {
 				return me.begin < other.begin;
 			}
 
-			char operator[](int i) {
+			char operator[](unsigned int i) {
 				i += begin;
 				if (i > end)
 					throw out_of_range("Edge [] out of range.");
@@ -137,12 +136,12 @@ class SuffixTree {
 			}
 
 			friend ostream& operator<<(ostream& os, Edge& edge) {
-				int end = edge.test_node_str.size()-1;
+				unsigned int end = edge.test_node_str.size()-1;
 				if (end >= edge.end)
 					end = edge.end;
 
 				char c;
-				for (int i=edge.begin; i<=end; i++) {
+				for (unsigned int i=edge.begin; i<=end; i++) {
 					c = edge.test_node_str[i];
 					os << c;
 				}
@@ -167,8 +166,10 @@ class SuffixTree {
 
 			friend class LinkState;
 
-			Node(string& str) : 
-				test_node_str(str), suffix_link(NULL) { edges.clear(); findedges.clear(); }
+			Node(string& str) : test_node_str(str), suffix_link(NULL) { 
+				edges.clear(); 
+				findedges.clear(); 
+			}
 
 			void add_edge(Edge* edge) { 
 				if (edge->endpoint == NULL)
@@ -195,8 +196,7 @@ class SuffixTree {
 			}
 
 			// find edge by the first char
-			Edge* find_edge(char c)
-			{
+			Edge* find_edge(char c) {
 				//cout << "finding edge";
 				map<char, Edge*>::iterator iter = findedges.find(c);
 				//cout << "founded?" << endl;
@@ -228,14 +228,14 @@ class SuffixTree {
 		};
 		//typedef struct Node Node;
 
-		class ActivePoint{
+		class ActivePoint {
 			public:
 				Node* active_node;
 				char active_edge;
 				int active_length;
 
-				ActivePoint(Node* node, char edge, int length): 
-					active_node(node), active_edge(edge), active_length(length) { std::cout << "ActivePoint initialized" << std::endl; }
+				ActivePoint(Node* node, char edge, int length): active_node(node), 
+				active_edge(edge), active_length(length) { std::cout << "ActivePoint initialized" << std::endl; }
 		};
 
 		Node root;
@@ -253,7 +253,7 @@ class SuffixTree {
 		// how many suffixes is to be inserted?
 		int remainder;
 		// how many characters inserted?
-		int pos;
+		unsigned int pos;
 		char get_ele(int i) { return test_str[i]; }
 		// insert a char from pos to suffix tree
 		int insert();