changes while testing

[mothur.git] / distancecommand.h

diff --git a/distancecommand.h b/distancecommand.h
index ddce0449d5498d48914f95d9ff64900b12837ccf..2f53232b5943d835e8c27adf7374a5e3a8ce168f 100644 (file)
--- a/distancecommand.h
+++ b/distancecommand.h
@@ -33,7 +33,7 @@ struct distanceData {
        vector<string> Estimators;
        MothurOut* m;
        string output;
-       int numNewFasta;
+       int numNewFasta, count;
        string countends;
        
        distanceData(){}
@@ -86,7 +86,7 @@ static DWORD WINAPI MyDistThreadFunction(LPVOID lpParam){
                ofstream outFile(pDataArray->dFileName.c_str(), ios::trunc);
                outFile.setf(ios::fixed, ios::showpoint);
                outFile << setprecision(4);
-               
+               pDataArray->count = 0;
                
                if (pDataArray->output != "square") { 
                        if((pDataArray->output == "lt") && (pDataArray->startLine == 0)){       outFile << pDataArray->alignDB.getNumSeqs() << endl;    }
@@ -119,11 +119,10 @@ static DWORD WINAPI MyDistThreadFunction(LPVOID lpParam){
                                if (pDataArray->output == "lt") { outFile << endl; }
                                
                                if(i % 100 == 0){
-                                       pDataArray->m->mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); pDataArray->m->mothurOutEndLine();
-                               }
-                               
+                                       pDataArray->m->mothurOutJustToScreen(toString(i) + "\t" + toString(time(NULL) - startTime)+"\n");                               }
+                               pDataArray->count++;
                        }
-                       pDataArray->m->mothurOut(toString(pDataArray->endLine-1) + "\t" + toString(time(NULL) - startTime)); pDataArray->m->mothurOutEndLine();
+                       pDataArray->m->mothurOutJustToScreen(toString(pDataArray->count) + "\t" + toString(time(NULL) - startTime)+"\n");
                }else{
                        if(pDataArray->startLine == 0){ outFile << pDataArray->alignDB.getNumSeqs() << endl;    }
                        
@@ -148,11 +147,11 @@ static DWORD WINAPI MyDistThreadFunction(LPVOID lpParam){
                                outFile << endl; 
                                
                                if(i % 100 == 0){
-                                       pDataArray->m->mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); pDataArray->m->mothurOutEndLine();
+                                       pDataArray->m->mothurOutJustToScreen(toString(i) + "\t" + toString(time(NULL) - startTime)+"\n"); 
                                }
-                               
+                               pDataArray->count++;
                        }
-                       pDataArray->m->mothurOut(toString(pDataArray->endLine-1) + "\t" + toString(time(NULL) - startTime)); pDataArray->m->mothurOutEndLine();
+                       pDataArray->m->mothurOutJustToScreen(toString(pDataArray->count) + "\t" + toString(time(NULL) - startTime)+"\n"); 
                }
                
                outFile.close();