X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=classifyseqscommand.h;h=55546f2032af82f9934fb1af4b73891684904cd6;hp=59d9ee275800195255961639d77fb6c57d97f417;hb=ac03f1f6c27b5bfdf2cfb6d45c3667c3e0281f51;hpb=fe08eacea5a2d34cd4bd27e8451fd2872102a80a diff --git a/classifyseqscommand.h b/classifyseqscommand.h index 59d9ee2..55546f2 100644 --- a/classifyseqscommand.h +++ b/classifyseqscommand.h @@ -166,7 +166,7 @@ static DWORD WINAPI MyClassThreadFunction(LPVOID lpParam){ //make classify Classify* myclassify; string outputMethodTag = pDataArray->method + "."; - 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); } + if(pDataArray->method == "wang"){ 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 if(pDataArray->method == "zap"){ outputMethodTag = pDataArray->search + "_" + outputMethodTag; @@ -174,7 +174,7 @@ static DWORD WINAPI MyClassThreadFunction(LPVOID lpParam){ else { myclassify = new AlignTree(pDataArray->templateFileName, pDataArray->taxonomyFileName, pDataArray->cutoff); } } else { - pDataArray->m->mothurOut(pDataArray->search + " is not a valid method option. I will run the command using bayesian."); + pDataArray->m->mothurOut(pDataArray->method + " is not a valid method option. I will run the command using wang."); pDataArray->m->mothurOutEndLine(); myclassify = new Bayesian(pDataArray->taxonomyFileName, pDataArray->templateFileName, pDataArray->search, pDataArray->kmerSize, pDataArray->cutoff, pDataArray->iters, pDataArray->threadID, pDataArray->flip, pDataArray->writeShortcuts); }