fixed phylo.diversity

[mothur.git] / treemap.h

diff --git a/treemap.h b/treemap.h
index 941ca9a8f79e4de463f99719d6ffd37fe7733961..bda6926c20ea79800e9f9cc8a06b87ce6f44c68c 100644 (file)
--- a/treemap.h
+++ b/treemap.h
@@ -10,7 +10,8 @@
  */
 
 #include "mothur.h"
-#include "utilities.hpp"
+#include "groupmap.h"
+#include "listvector.hpp"
 
 /* This class is used by the read.tree command to build the tree container. */
 
@@ -19,11 +20,12 @@ struct GroupIndex {
        int             vectorIndex;
 };
 
-
+class GroupMap;
+class ListVector;
 
 class TreeMap {
 public:
-       TreeMap() {};
+       TreeMap() { m = MothurOut::getInstance(); }
        TreeMap(string);
        ~TreeMap();
        void readMap();
@@ -32,13 +34,15 @@ public:
        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
+       void removeSeq(string);  //removes a sequence, this is to accomadate trees that do not contain all the seqs in your groupfile
        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&);
-       
+       void makeSim(GroupMap*);  //takes groupmap info and fills treemap for use by tree.shared command.
+       void makeSim(ListVector*);  //takes listvector info and fills treemap for use by tree.shared command.   
        
 private:
        ifstream fileHandle;
@@ -47,6 +51,7 @@ private:
        map<string, GroupIndex>::iterator it;
        map<string, int>::iterator it2;
        void setNamesOfGroups(string); 
+       MothurOut* m;
        
        
 };