X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=classifyseqscommand.h;h=6d11d9236778028e326c6f4fdd4925dd6430fd50;hb=035f86272c776e1cccaa47021e26782e49cd41e7;hp=4965642e7f77f0d8638bceb177bd79788c8e39ad;hpb=49d2b7459c5027557564b21e9487dadafbbbdc96;p=mothur.git

diff --git a/classifyseqscommand.h b/classifyseqscommand.h
index 4965642..6d11d92 100644
--- a/classifyseqscommand.h
+++ b/classifyseqscommand.h
@@ -62,6 +62,7 @@ private:
 	vector<linePair*> lines;
 	vector<string> fastaFileNames;
 	vector<string> namefileNames;
+    vector<string> countfileNames;
 	vector<string> groupfileNames;
 	vector<string> outputNames;
 	map<string, vector<string> > nameMap;
@@ -70,10 +71,10 @@ private:
 	Classify* classify;
 	ReferenceDB* rdb;
 	
-	string fastaFileName, templateFileName, distanceFileName, namefile, search, method, taxonomyFileName, outputDir, groupfile;
+	string fastaFileName, templateFileName, countfile, distanceFileName, namefile, search, method, taxonomyFileName, outputDir, groupfile;
 	int processors, kmerSize, numWanted, cutoff, iters;
 	float match, misMatch, gapOpen, gapExtend;
-	bool abort, probs, save, flip;
+	bool abort, probs, save, flip, hasName, hasCount, writeShortcuts;
 	
 	int driver(linePair*, string, string, string, string);
 	int createProcesses(string, string, string, string); 
@@ -99,10 +100,10 @@ struct classifyData {
 	MothurOut* m;
 	float match, misMatch, gapOpen, gapExtend;
 	int count, kmerSize, threadID, cutoff, iters, numWanted;
-	bool probs, flip;
+	bool probs, flip, writeShortcuts;
 	 
 	classifyData(){}
-	classifyData(string acc, bool p, string me, string te, string tx, string a, string r, string f, string se, int ks, int i, int numW, MothurOut* mout, unsigned long long st, unsigned long long en, float ma, float misMa, float gapO, float gapE, int cut, int tid, bool fli) {
+	classifyData(string acc, bool p, string me, string te, string tx, string a, string r, string f, string se, int ks, int i, int numW, MothurOut* mout, unsigned long long st, unsigned long long en, float ma, float misMa, float gapO, float gapE, int cut, int tid, bool fli, bool wsh) {
 		accnos = acc;
 		taxonomyFileName = tx;
 		templateFileName = te;
@@ -126,6 +127,7 @@ struct classifyData {
 		probs = p;
 		count = 0;
 		flip = fli;
+        writeShortcuts = wsh;
 	}
 };
 
@@ -162,12 +164,12 @@ static DWORD WINAPI MyClassThreadFunction(LPVOID lpParam){
 		
 		//make classify
 		Classify* myclassify;
-		if(pDataArray->method == "bayesian"){	myclassify = new Bayesian(pDataArray->taxonomyFileName, pDataArray->templateFileName, pDataArray->search, pDataArray->kmerSize, pDataArray->cutoff, pDataArray->iters, pDataArray->threadID, pDataArray->flip);		}
+		if(pDataArray->method == "bayesian"){	myclassify = new Bayesian(pDataArray->taxonomyFileName, pDataArray->templateFileName, pDataArray->search, pDataArray->kmerSize, pDataArray->cutoff, pDataArray->iters, pDataArray->threadID, pDataArray->flip, pDataArray->writeShortcuts);		}
 		else if(pDataArray->method == "knn"){	myclassify = new Knn(pDataArray->taxonomyFileName, pDataArray->templateFileName, pDataArray->search, pDataArray->kmerSize, pDataArray->gapOpen, pDataArray->gapExtend, pDataArray->match, pDataArray->misMatch, pDataArray->numWanted, pDataArray->threadID);				}
 		else {
 			pDataArray->m->mothurOut(pDataArray->search + " is not a valid method option. I will run the command using bayesian.");
 			pDataArray->m->mothurOutEndLine();
-			myclassify = new Bayesian(pDataArray->taxonomyFileName, pDataArray->templateFileName, pDataArray->search, pDataArray->kmerSize, pDataArray->cutoff, pDataArray->iters, pDataArray->threadID, pDataArray->flip);	
+			myclassify = new Bayesian(pDataArray->taxonomyFileName, pDataArray->templateFileName, pDataArray->search, pDataArray->kmerSize, pDataArray->cutoff, pDataArray->iters, pDataArray->threadID, pDataArray->flip, pDataArray->writeShortcuts);	
 		}
 		
 		if (pDataArray->m->control_pressed) { delete myclassify; return 0; }