X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=normalizesharedcommand.h;h=4b6f7fd9e93f4912bf648f2c826ab0a09b15910c;hb=e7ae6e6b27c45b5691c19f423ec56faae8e2f255;hp=22158bd6d5ff136d0df81d0304b476ec580b8b7a;hpb=8bc3e5b38c2317a1715f53be22fa96455868c281;p=mothur.git

diff --git a/normalizesharedcommand.h b/normalizesharedcommand.h
index 22158bd..4b6f7fd 100644
--- a/normalizesharedcommand.h
+++ b/normalizesharedcommand.h
@@ -12,39 +12,42 @@
  
 #include "command.hpp"
 #include "inputdata.h"
-#include "readotu.h"
 #include "sharedrabundvector.h"
 
-class GlobalData;
-
 class NormalizeSharedCommand : public Command {
 
 public:
 	NormalizeSharedCommand(string);
 	NormalizeSharedCommand();
-	~NormalizeSharedCommand();
-	vector<string> getRequiredParameters();
-	vector<string> getValidParameters();
-	vector<string> getRequiredFiles();
-	map<string, vector<string> > getOutputFiles() { return outputTypes; }
-	int execute();
-	void help();
+	~NormalizeSharedCommand() {}
+	
+	vector<string> setParameters();
+	string getCommandName()			{ return "normalize.shared";		}
+	string getCommandCategory()		{ return "OTU-Based Approaches";	}
+	string getHelpString();	
+	string getCitation() { return "http://www.mothur.org/wiki/Normalize.shared"; }
+	string getDescription()		{ return "normalize samples in a shared or relabund file"; }
+
+	
+	int execute(); 
+	void help() { m->mothurOut(getHelpString()); }	
+	
 	
 private:
-	GlobalData* globaldata;
-	ReadOTUFile* read;
 	InputData* input;
 	vector<SharedRAbundVector*> lookup;
+	vector<SharedRAbundFloatVector*> lookupFloat;
 	
-	bool abort, allLines, pickedGroups;
+	bool abort, allLines, pickedGroups, makeRelabund;
 	set<string> labels; //holds labels to be used
-	string groups, label, outputDir, method;
+	string groups, label, outputDir, method, sharedfile, relabundfile, format, inputfile;
 	int norm;
 	vector<string> Groups, outputNames;
-	map<string, vector<string> > outputTypes;
-	
-	int normalize(vector<SharedRAbundVector*>&, ofstream&);
-	int eliminateZeroOTUS(vector<SharedRAbundVector*>& thislookup);
+		
+	int normalize(vector<SharedRAbundVector*>&);
+	int normalize(vector<SharedRAbundFloatVector*>&);
+	int eliminateZeroOTUS(vector<SharedRAbundVector*>&);
+	int eliminateZeroOTUS(vector<SharedRAbundFloatVector*>&);
 
 };