X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=treemap.h;h=941ca9a8f79e4de463f99719d6ffd37fe7733961;hb=d53f63d7e0d9c3feeb8ded5a74e6c150fae50fe9;hp=d9617f5455e03f0f5fc702fffaf3516335351b15;hpb=58cf1d08fee8c64334979075fa57bcafb035a2ed;p=mothur.git

diff --git a/treemap.h b/treemap.h
index d9617f5..941ca9a 100644
--- a/treemap.h
+++ b/treemap.h
@@ -9,10 +9,7 @@
  *
  */
 
-#include <map>
-#include <string>
-#include <iostream>
-#include <fstream>
+#include "mothur.h"
 #include "utilities.hpp"
 
 /* This class is used by the read.tree command to build the tree container. */
@@ -26,6 +23,7 @@ struct GroupIndex {
 
 class TreeMap {
 public:
+	TreeMap() {};
 	TreeMap(string);
 	~TreeMap();
 	void readMap();
@@ -33,18 +31,24 @@ public:
 	int getNumSeqs();
 	void setIndex(string, int);  //sequencename, index
 	int getIndex(string);		//returns vector index of sequence
+	bool isValidGroup(string);  //return true if string is a valid group
 	string getGroup(string);
 	vector<string> namesOfGroups;
 	vector<string> namesOfSeqs;
+    map<string,int> seqsPerGroup;	//groupname, number of seqs in that group.
+	map<string, GroupIndex> treemap; //sequence name and <groupname, vector index>
 	void print(ostream&);
 	
+	
 private:
 	ifstream fileHandle;
 	string groupFileName;
 	int numGroups;
 	map<string, GroupIndex>::iterator it;
+	map<string, int>::iterator it2;
 	void setNamesOfGroups(string); 
-	map<string, GroupIndex> treemap; //sequence name and groupname
+	
+	
 };
 
 #endif