X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=mgclustercommand.h;h=008bd222a0a91869e14895738ea852b383c0395f;hp=889586ae305ac47bdb0f2d15880507aa68655dff;hb=a8e2df1b96a57f5f29576b08361b86a96a8eff4f;hpb=e98d569d630c30d1ac3608eb6337bcec4765a724

diff --git a/mgclustercommand.h b/mgclustercommand.h
index 889586a..008bd22 100644
--- a/mgclustercommand.h
+++ b/mgclustercommand.h
@@ -12,12 +12,12 @@
 
 #include "command.hpp"
 #include "readblast.h"
-#include "sparsematrix.hpp"
 #include "nameassignment.hpp"
 #include "cluster.hpp"
 #include "hcluster.h"
 #include "rabundvector.hpp"
 #include "sabundvector.hpp"
+#include "counttable.h"
 
 /**********************************************************************/
 
@@ -31,8 +31,9 @@ public:
 	vector<string> setParameters();
 	string getCommandName()			{ return "mgcluster";	}
 	string getCommandCategory()		{ return "Clustering";	}
-	string getOutputFileNameTag(string, string);
+	
 	string getHelpString();	
+    string getOutputPattern(string);	
 	string getCitation() { return "Schloss PD, Handelsman J (2008). A statistical toolbox for metagenomics. BMC Bioinformatics 9: 34. \nhttp://www.mothur.org/wiki/Mgcluster"; }
 	string getDescription()		{ return "cluster your sequences into OTUs using a blast file"; }
 
@@ -46,11 +47,13 @@ private:
 	Cluster* cluster;
 	HCluster* hcluster;
 	ListVector* list;
+    CountTable* ct;
 	ListVector oldList;
+    RAbundVector rav;
 	vector<seqDist> overlapMatrix;
 	vector<string> outputNames;
 	
-	string blastfile, method, namefile, overlapFile, distFile, outputDir;
+	string blastfile, method, namefile, countfile, overlapFile, distFile, outputDir;
 	ofstream sabundFile, rabundFile, listFile;
 	double cutoff;
 	float penalty;
@@ -61,7 +64,7 @@ private:
 	ListVector* mergeOPFs(map<string, int>, float);
 	void sortHclusterFiles(string, string);
 	vector<seqDist> getSeqs(ifstream&);
-    RAbundVector createRabund(ListVector, map<string, int>);
+    void createRabund(CountTable*&, ListVector*&, RAbundVector*&);
 
 };