X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getoturepcommand.h;h=390632975afc85aac5b714c7194c81e74d58e16e;hb=e8e13c129ba8184ec5932a090773f353f3ae3406;hp=5af0340b4b920a4fab3decc79bd2b3b4237f85ef;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96;p=mothur.git

diff --git a/getoturepcommand.h b/getoturepcommand.h
index 5af0340..3906329 100644
--- a/getoturepcommand.h
+++ b/getoturepcommand.h
@@ -18,8 +18,8 @@
 #include "groupmap.h"
 #include "readmatrix.hpp"
 #include "formatmatrix.h"
+#include "counttable.h"
 
-typedef list<PCell>::iterator MatData;
 typedef map<int, float> SeqMap;
 
 struct repStruct {
@@ -61,10 +61,11 @@ private:
 	ReadMatrix* readMatrix;
 	FormatMatrix* formatMatrix;
 	NameAssignment* nameMap;
-	string filename, fastafile, listfile, namefile, groupfile, label, sorted, phylipfile, columnfile, distFile, format, outputDir, groups;
+    CountTable ct;
+	string filename, fastafile, listfile, namefile, groupfile, label, sorted, phylipfile, countfile, columnfile, distFile, format, outputDir, groups;
 	ofstream out;
 	ifstream in, inNames, inRow;
-	bool abort, allLines, groupError, large, weighted;
+	bool abort, allLines, groupError, large, weighted, hasGroups;
 	set<string> labels; //holds labels to be used
 	map<string, int> nameToIndex;  //maps sequence name to index in sparsematrix
 	map<string, string> nameFileMap;
@@ -80,9 +81,10 @@ private:
 	void readNamesFile(bool);
 	int process(ListVector*);
 	SeqMap getMap(int);
-	string findRep(vector<string>); 	// returns the name of the "representative" sequence of given bin or subset of a bin, for groups
+	string findRep(vector<string>, string); 	// returns the name of the "representative" sequence of given bin or subset of a bin, for groups
 	int processNames(string, string);
 	int processFastaNames(string, string);
+    int readDist();
 };
 
 #endif