X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=indicatorcommand.h;h=1f46081dd464c32e599cf1d173d1eba60df3db46;hp=2c36c35f6f3025bb3f07760055512b2e0e257914;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96

diff --git a/indicatorcommand.h b/indicatorcommand.h
index 2c36c35..1f46081 100644
--- a/indicatorcommand.h
+++ b/indicatorcommand.h
@@ -12,7 +12,7 @@
 
 #include "command.hpp"
 #include "readtree.h"
-#include "treemap.h"
+#include "counttable.h"
 #include "sharedrabundvector.h"
 #include "sharedrabundfloatvector.h"
 #include "inputdata.h"
@@ -26,8 +26,9 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "indicator";				}
 	string getCommandCategory()		{ return "Hypothesis Testing";		}
-	string getOutputFileNameTag(string, string);
+	
 	string getHelpString();	
+    string getOutputPattern(string);	
 	string getCitation() { return "Dufrene M, Legendre P (1997). Species assemblages and indicator species: The need for a flexible asymmetrical approach. Ecol Monogr 67: 345-66.\n McCune B, Grace JB, Urban DL (2002). Analysis of ecological communities. MjM Software Design: Gleneden Beach, OR. \nLegendre P, Legendre L (1998). Numerical Ecology. Elsevier: New York. \nhttp://www.mothur.org/wiki/Indicator"; }
 	string getDescription()		{ return "calculate the indicator value for each OTU"; }
 
@@ -36,7 +37,7 @@ public:
 	
 private:
 	ReadTree* read;
-	TreeMap* treeMap;
+	CountTable* ct;
 	GroupMap* designMap;
 	string treefile, sharedfile, relabundfile, groups, label, inputFileName, outputDir, designfile;
 	bool abort;
@@ -50,13 +51,16 @@ private:
 	int GetIndicatorSpecies(Tree*&);
 	int GetIndicatorSpecies();
 	set<string> getDescendantList(Tree*&, int, map<int, set<string> >, map<int, set<int> >&);
-	vector<float> getValues(vector< vector<SharedRAbundVector*> >&, map< vector<int>, vector<int> >);
-	vector<float> getValues(vector< vector<SharedRAbundFloatVector*> >&, map< vector<int>, vector<int> >);
+	vector<float> getValues(vector< vector<SharedRAbundVector*> >&, vector<string>&, map< vector<int>, vector<int> >);
+	vector<float> getValues(vector< vector<SharedRAbundFloatVector*> >&, vector<string>&, map< vector<int>, vector<int> >);
+    
 	map<int, float> getDistToRoot(Tree*&);
 	map< vector<int>, vector<int> > randomizeGroupings(vector< vector<SharedRAbundVector*> >&, int);
 	map< vector<int>, vector<int> > randomizeGroupings(vector< vector<SharedRAbundFloatVector*> >&, int);
+    
 	vector<float> driver(vector< vector<SharedRAbundFloatVector*> >&, map< vector<int>, vector<int> >, int, vector<float>, int);
 	vector<float> driver(vector< vector<SharedRAbundVector*> >&, map< vector<int>, vector<int> >, int, vector<float>, int);
+    
 	vector<float> getPValues(vector< vector<SharedRAbundFloatVector*> >&, map< vector<int>, vector<int> >, int, vector<float>);
 	vector<float> getPValues(vector< vector<SharedRAbundVector*> >&, map< vector<int>, vector<int> >, int, vector<float>);