X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=splitmatrix.h;h=4ff316073789b694916a75fae5d2081a813d96c7;hb=d0cceb86216f1174afa51582a51490294912b00e;hp=95fe0dcb94939bb8968a0980a517368cb0ef8b2b;hpb=2a7d1455e8cfe4f67a7173f3a7249762c5436217;p=mothur.git

diff --git a/splitmatrix.h b/splitmatrix.h
index 95fe0dc..4ff3160 100644
--- a/splitmatrix.h
+++ b/splitmatrix.h
@@ -19,7 +19,9 @@ class SplitMatrix  {
 	
 	public:
 
-		SplitMatrix(string, string, string, float, string, bool); //column formatted distance file, namesfile, cutoff, method
+		SplitMatrix(string, string, string, float, string, bool); //column formatted distance file, namesfile, cutoff, method, large
+		SplitMatrix(string, string, string, float, float, string, int, string); //fastafile, namefile, taxFile, taxcutoff, cutoff, method, processors, outputDir
+		
 		~SplitMatrix();
 		int split();
 		vector< map<string, string> > getDistanceFiles();  //returns map of distance files -> namefile sorted by distance file size
@@ -28,16 +30,19 @@ class SplitMatrix  {
 	private:
 		MothurOut* m;
 
-		string distFile, namefile, singleton, method, taxFile;
+		string distFile, namefile, singleton, method, taxFile, fastafile, outputDir;
 		vector< map< string, string> > dists;
-		float cutoff;
+		float cutoff, distCutoff;
 		bool large;
+		int processors;
 				
 		int splitDistance();
 		int splitClassify();
 		int splitDistanceLarge();
 		int splitDistanceRAM();
 		int splitNames(vector<set<string> >& groups);
+		int splitDistanceFileByTax(map<string, int>&, int);
+		int createDistanceFilesFromTax(map<string, int>&, int);
 };
 
 /******************************************************/