added dups parameter to chimera.uchime. working on make.contigs command.

[mothur.git] / chimerauchimecommand.h

diff --git a/chimerauchimecommand.h b/chimerauchimecommand.h
index 67c77f24f4597838f959224ceaf6bab4467ce5df..a5b42751dfd74ea3eb1fc3dc4ccf9bfa5bb9822b 100644 (file)
--- a/chimerauchimecommand.h
+++ b/chimerauchimecommand.h
@@ -47,7 +47,7 @@ private:
        int driver(string, string, string, string, int&);
        int createProcesses(string, string, string, string, int&);
                
-       bool abort, useAbskew, chimealns, useMinH, useMindiv, useXn, useDn, useXa, useChunks, useMinchunk, useIdsmoothwindow, useMinsmoothid, useMaxp, skipgaps, skipgaps2, useMinlen, useMaxlen, ucl, useQueryfract, hasCount, hasName;
+       bool abort, useAbskew, chimealns, useMinH, useMindiv, useXn, useDn, useXa, useChunks, useMinchunk, useIdsmoothwindow, useMinsmoothid, useMaxp, skipgaps, skipgaps2, useMinlen, useMaxlen, ucl, useQueryfract, hasCount, hasName, dups;
        string fastafile, groupfile, templatefile, outputDir, namefile, countfile, abskew, minh, mindiv, xn, dn, xa, chunks, minchunk, idsmoothwindow, minsmoothid, maxp, minlen, maxlen, queryfract, uchimeLocation;
        int processors;
        
@@ -190,7 +190,7 @@ static DWORD WINAPI MyUchimeThreadFunction(LPVOID lpParam){
             if (pDataArray->hasCount) { 
                 error = cparser->getSeqs(pDataArray->groups[i], pDataArray->filename, true); if ((error == 1) || pDataArray->m->control_pressed) {  delete cparser; return 0; }
             }else {
-               error = cparser->getSeqs(pDataArray->groups[i], pDataArray->filename, true); if ((error == 1) || pDataArray->m->control_pressed) {  delete parser; return 0; } 
+               error = parser->getSeqs(pDataArray->groups[i], pDataArray->filename, true); if ((error == 1) || pDataArray->m->control_pressed) {  delete parser; return 0; } 
             }
                        
                        //int numSeqs = driver((outputFName + groups[i]), filename, (accnos+ groups[i]), (alns+ groups[i]), numChimeras);
@@ -530,15 +530,15 @@ static DWORD WINAPI MyUchimeSeqsThreadFunction(LPVOID lpParam){
         //prepFile(filename, outputFileName);
         /******************************************/
         ifstream in23;
-        m->openInputFile((filename.substr(1, filename.length()-2)), in23);
+        pDataArray->m->openInputFile((filename.substr(1, filename.length()-2)), in23);
         
         ofstream out23;
-        m->openOutputFile(outputFileName, out23);
+        pDataArray->m->openOutputFile(outputFileName, out23);
         
         while (!in23.eof()) {
-            if (m->control_pressed) { break;  }
+            if (pDataArray->m->control_pressed) { break;  }
             
-            Sequence seq(in23); m->gobble(in23);
+            Sequence seq(in23); pDataArray->m->gobble(in23);
             
             if (seq.getName() != "") { seq.printSequence(out23); }
         }
@@ -758,6 +758,8 @@ static DWORD WINAPI MyUchimeSeqsThreadFunction(LPVOID lpParam){
                for (int j = 0; j < cPara.size(); j++) {  uchimeParameters[j] = cPara[j];  commandString += toString(cPara[j]) + " "; } 
                //int numArgs = cPara.size();
                
+        commandString = "\"" + commandString + "\"";
+        
                //uchime_main(numArgs, uchimeParameters); 
                //cout << "commandString = " << commandString << endl;
         if (pDataArray->m->debug) { pDataArray->m->mothurOut("[DEBUG]: uchime command = " + commandString + ".\n"); }