changed reading of name file to use buffered reads. note the splitAtWhiteSpace functi...

[mothur.git] / aligncommand.cpp

diff --git a/aligncommand.cpp b/aligncommand.cpp
index f03a9017d4867f1d8634a0ef72a25f1590bf13b6..75466f95b242ae08a71a88a40efec3a8fd230c86 100644 (file)
--- a/aligncommand.cpp
+++ b/aligncommand.cpp
@@ -422,7 +422,7 @@ int AlignCommand::execute(){
 #else
 
                        vector<unsigned long long> positions; 
-               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                        positions = m->divideFile(candidateFileNames[s], processors);
                        for (int i = 0; i < (positions.size()-1); i++) {        lines.push_back(new linePair(positions[i], positions[(i+1)]));  }
                #else
@@ -430,7 +430,8 @@ int AlignCommand::execute(){
                                lines.push_back(new linePair(0, 1000));
                        }else {
                                positions = m->setFilePosFasta(candidateFileNames[s], numFastaSeqs); 
-                               
+                               if (positions.size() < processors) { processors = positions.size(); }
+                
                                //figure out how many sequences you have to process
                                int numSeqsPerProcessor = numFastaSeqs / processors;
                                for (int i = 0; i < processors; i++) {
@@ -617,7 +618,7 @@ int AlignCommand::driver(linePair* filePos, string alignFName, string reportFNam
                        }
                        delete candidateSeq;
                        
-                       #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+                       #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                                unsigned long long pos = inFASTA.tellg();
                                if ((pos == -1) || (pos >= filePos->end)) { break; }
                        #else
@@ -826,7 +827,7 @@ int AlignCommand::createProcesses(string alignFileName, string reportFileName, s
        try {
                int num = 0;
                processIDS.resize(0);
-#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux) || (__linux__) || (__unix__) || (__unix)
                int process = 1;
                
                //loop through and create all the processes you want
@@ -874,7 +875,7 @@ int AlignCommand::createProcesses(string alignFileName, string reportFileName, s
                        if (!in.eof()) { int tempNum = 0; in >> tempNum; num += tempNum; }
                        in.close(); m->mothurRemove(tempFile);
                        
-                       appendAlignFiles((alignFileName + toString(processIDS[i]) + ".temp"), alignFileName);
+                       m->appendFiles((alignFileName + toString(processIDS[i]) + ".temp"), alignFileName);
                        m->mothurRemove((alignFileName + toString(processIDS[i]) + ".temp"));
                        
                        appendReportFiles((reportFileName + toString(processIDS[i]) + ".temp"), reportFileName);
@@ -891,7 +892,7 @@ int AlignCommand::createProcesses(string alignFileName, string reportFileName, s
                        rename(nonBlankAccnosFiles[0].c_str(), accnosFName.c_str());
                        
                        for (int h=1; h < nonBlankAccnosFiles.size(); h++) {
-                               appendAlignFiles(nonBlankAccnosFiles[h], accnosFName);
+                               m->appendFiles(nonBlankAccnosFiles[h], accnosFName);
                                m->mothurRemove(nonBlankAccnosFiles[h]);
                        }
                }else { //recreate the accnosfile if needed
@@ -956,7 +957,7 @@ int AlignCommand::createProcesses(string alignFileName, string reportFileName, s
                else { m->mothurRemove(accnosFName); } //remove so other files can be renamed to it
                
                for (int i = 1; i < processors; i++) {
-                       appendAlignFiles((alignFileName + toString(i) + ".temp"), alignFileName);
+                       m->appendFiles((alignFileName + toString(i) + ".temp"), alignFileName);
                        m->mothurRemove((alignFileName + toString(i) + ".temp"));
                        
                        appendReportFiles((reportFileName + toString(i) + ".temp"), reportFileName);
@@ -972,7 +973,7 @@ int AlignCommand::createProcesses(string alignFileName, string reportFileName, s
                        rename(nonBlankAccnosFiles[0].c_str(), accnosFName.c_str());
                        
                        for (int h=1; h < nonBlankAccnosFiles.size(); h++) {
-                               appendAlignFiles(nonBlankAccnosFiles[h], accnosFName);
+                               m->appendFiles(nonBlankAccnosFiles[h], accnosFName);
                                m->mothurRemove(nonBlankAccnosFiles[h]);
                        }
                }else { //recreate the accnosfile if needed
@@ -989,29 +990,6 @@ int AlignCommand::createProcesses(string alignFileName, string reportFileName, s
                exit(1);
        }
 }
-/**************************************************************************************************/
-
-void AlignCommand::appendAlignFiles(string temp, string filename) {
-       try{
-               
-               ofstream output;
-               ifstream input;
-               m->openOutputFileAppend(filename, output);
-               m->openInputFile(temp, input);
-               
-               while(char c = input.get()){
-                       if(input.eof())         {       break;                  }
-                       else                            {       output << c;    }
-               }
-               
-               input.close();
-               output.close();
-       }
-       catch(exception& e) {
-               m->errorOut(e, "AlignCommand", "appendAlignFiles");
-               exit(1);
-       }
-}
 //**********************************************************************************************************************
 
 void AlignCommand::appendReportFiles(string temp, string filename) {
@@ -1024,10 +1002,11 @@ void AlignCommand::appendReportFiles(string temp, string filename) {
 
                while (!input.eof())    {       char c = input.get(); if (c == 10 || c == 13){  break;  }       } // get header line
                                
-               while(char c = input.get()){
-                       if(input.eof())         {       break;                  }
-                       else                            {       output << c;    }
-               }
+        char buffer[4096];        
+        while (!input.eof()) {
+            input.read(buffer, 4096);
+            output.write(buffer, input.gcount());
+        }
                
                input.close();
                output.close();