]> git.donarmstrong.com Git - mothur.git/blobdiff - distancecommand.cpp
some bug fixes
[mothur.git] / distancecommand.cpp
index 7d1f6a0308b5358b2ef39ef70579d866fafca6da..05ed87cb960c5c61fff158384723ff9d3b2a1e3a 100644 (file)
 
 //**********************************************************************************************************************
 
-DistanceCommand::DistanceCommand(){
+DistanceCommand::DistanceCommand(string option) {
        try {
-               globaldata = GlobalData::getInstance();
-               validCalculator = new ValidCalculators();
-               ends = globaldata->getEnds();
-               convert(globaldata->getProcessors(), processors);
-               convert(globaldata->getCutOff(), cutoff);
-               
-               int i;
-               if (ends != "T") {
-                       for (i=0; i<globaldata->Estimators.size(); i++) {
-                               if (validCalculator->isValidCalculator("distance", globaldata->Estimators[i]) == true) { 
-                                       if (globaldata->Estimators[i] == "nogaps") { 
-                                               distCalculator = new ignoreGaps();
-                                       }else if (globaldata->Estimators[i] == "eachgap") { 
-                                               distCalculator = new eachGapDist();     
-                                       }else if (globaldata->Estimators[i] == "onegap") {
-                                               distCalculator = new oneGapDist();                                      }
+               abort = false;
+               Estimators.clear();
+                               
+               //allow user to run help
+               if(option == "help") { help(); abort = true; }
+               
+               else {
+                       //valid paramters for this command
+                       string Array[] =  {"fasta", "output", "calc", "countends", "cutoff", "processors", "outputdir","inputdir"};
+                       vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+                       
+                       OptionParser parser(option);
+                       map<string, string> parameters = parser.getParameters();
+                       
+                       ValidParameters validParameter("dist.seqs");
+                       map<string, string>::iterator it2;
+               
+                       //check to make sure all parameters are valid for command
+                       for (it2 = parameters.begin(); it2 != parameters.end(); it2++) { 
+                               if (validParameter.isValidParameter(it2->first, myArray, it2->second) != true) {  abort = true;  }
+                       }
+                       
+                       //if the user changes the input directory command factory will send this info to us in the output parameter 
+                       string inputDir = validParameter.validFile(parameters, "inputdir", false);              
+                       if (inputDir == "not found"){   inputDir = "";          }
+                       else {
+                               string path;
+                               it2 = parameters.find("fasta");
+                               //user has given a template file
+                               if(it2 != parameters.end()){ 
+                                       path = hasPath(it2->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["fasta"] = inputDir + it2->second;           }
                                }
                        }
-               }else {
-                       for (i=0; i<globaldata->Estimators.size(); i++) {
-                               if (validCalculator->isValidCalculator("distance", globaldata->Estimators[i]) == true) { 
-                                       if (globaldata->Estimators[i] == "nogaps") { 
-                                               distCalculator = new ignoreGaps();      
-                                       }else if (globaldata->Estimators[i] == "eachgap") { 
-                                               distCalculator = new eachGapIgnoreTermGapDist();
-                                       }else if (globaldata->Estimators[i] == "onegap") { 
-                                               distCalculator = new oneGapIgnoreTermGapDist(); 
+
+                       //check for required parameters
+                       fastafile = validParameter.validFile(parameters, "fasta", true);
+                       if (fastafile == "not found") { m->mothurOut("fasta is a required parameter for the dist.seqs command."); m->mothurOutEndLine(); abort = true; }
+                       else if (fastafile == "not open") { abort = true; }     
+                       else{
+                               ifstream inFASTA;
+                               openInputFile(fastafile, inFASTA);
+                               alignDB = SequenceDB(inFASTA); 
+                               inFASTA.close();
+                       }
+                       
+                       //if the user changes the output directory command factory will send this info to us in the output parameter 
+                       outputDir = validParameter.validFile(parameters, "outputdir", false);           if (outputDir == "not found"){  
+                               outputDir = ""; 
+                               outputDir += hasPath(fastafile); //if user entered a file with a path then preserve it  
+                       }
+
+                       //check for optional parameter and set defaults
+                       // ...at some point should added some additional type checking...
+                       calc = validParameter.validFile(parameters, "calc", false);                     
+                       if (calc == "not found") { calc = "onegap";  }
+                       else { 
+                                if (calc == "default")  {  calc = "onegap";  }
+                       }
+                       splitAtDash(calc, Estimators);
+
+                       string temp;
+                       temp = validParameter.validFile(parameters, "countends", false);        if(temp == "not found"){        temp = "T";     }
+                       convert(temp, countends); 
+                       
+                       temp = validParameter.validFile(parameters, "cutoff", false);           if(temp == "not found"){        temp = "1.0"; }
+                       convert(temp, cutoff); 
+                       
+                       temp = validParameter.validFile(parameters, "processors", false);       if(temp == "not found"){        temp = "1"; }
+                       convert(temp, processors); 
+                       
+                       output = validParameter.validFile(parameters, "output", false);         if(output == "not found"){      output = "column"; }
+                       
+                       if ((output != "column") && (output != "lt") && (output != "square")) { m->mothurOut(output + " is not a valid output form. Options are column, lt and square. I will use column."); m->mothurOutEndLine(); output = "column"; }
+                       
+                       ValidCalculators validCalculator;
+                       
+                       if (isTrue(countends) == true) {
+                               for (int i=0; i<Estimators.size(); i++) {
+                                       if (validCalculator.isValidCalculator("distance", Estimators[i]) == true) { 
+                                               if (Estimators[i] == "nogaps")                  {       distCalculator = new ignoreGaps();      }
+                                               else if (Estimators[i] == "eachgap")    {       distCalculator = new eachGapDist();     }
+                                               else if (Estimators[i] == "onegap")             {       distCalculator = new oneGapDist();      }
+                                       }
+                               }
+                       }else {
+                               for (int i=0; i<Estimators.size(); i++) {
+                                       if (validCalculator.isValidCalculator("distance", Estimators[i]) == true) { 
+                                               if (Estimators[i] == "nogaps")          {       distCalculator = new ignoreGaps();                                      }
+                                               else if (Estimators[i] == "eachgap"){   distCalculator = new eachGapIgnoreTermGapDist();        }
+                                               else if (Estimators[i] == "onegap")     {       distCalculator = new oneGapIgnoreTermGapDist();         }
                                        }
                                }
                        }
+
                }
                                
-               //reset calc for next command
-               globaldata->setCalc("");
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function DistanceCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "DistanceCommand", "DistanceCommand");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the DistanceCommand class function DistanceCommand. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+}
+
+//**********************************************************************************************************************
+
+DistanceCommand::~DistanceCommand(){
+       
+       for(int i=0;i<lines.size();i++){
+               delete lines[i];
+       }
+       
+}
+       
+//**********************************************************************************************************************
+
+void DistanceCommand::help(){
+       try {
+               m->mothurOut("The dist.seqs command reads a file containing sequences and creates a distance file.\n");
+               m->mothurOut("The dist.seqs command parameters are fasta, calc, countends, output, cutoff and processors.  \n");
+               m->mothurOut("The fasta parameter is required.\n");
+               m->mothurOut("The calc parameter allows you to specify the method of calculating the distances.  Your options are: nogaps, onegap or eachgap. The default is onegap.\n");
+               m->mothurOut("The countends parameter allows you to specify whether to include terminal gaps in distance.  Your options are: T or F. The default is T.\n");
+               m->mothurOut("The cutoff parameter allows you to specify maximum distance to keep. The default is 1.0.\n");
+               m->mothurOut("The output parameter allows you to specify format of your distance matrix. Options are column, lt, and square. The default is column.\n");
+               m->mothurOut("The processors parameter allows you to specify number of processors to use.  The default is 1.\n");
+               m->mothurOut("The dist.seqs command should be in the following format: \n");
+               m->mothurOut("dist.seqs(fasta=yourFastaFile, calc=yourCalc, countends=yourEnds, cutoff= yourCutOff, processors=yourProcessors) \n");
+               m->mothurOut("Example dist.seqs(fasta=amazon.fasta, calc=eachgap, countends=F, cutoff= 2.0, processors=3).\n");
+               m->mothurOut("Note: No spaces between parameter labels (i.e. calc), '=' and parameters (i.e.yourCalc).\n\n");
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DistanceCommand", "help");
                exit(1);
-       }       
+       }
 }
 //**********************************************************************************************************************
 
 int DistanceCommand::execute(){
        try {
                
-               //read file
-               string filename = globaldata->inputFileName;
+               if (abort == true) { return 0; }
                
-               if(globaldata->getFastaFile() != "") {
-                       readSeqs =  new ReadFasta(filename); }
-               else if(globaldata->getNexusFile() != "") {
-                       readSeqs = new ReadNexus(filename); }
-               else if(globaldata->getClustalFile() != "") {
-                       readSeqs = new ReadClustal(filename); }
-               else if(globaldata->getPhylipFile() != "") {
-                       readSeqs = new ReadPhylip(filename); }
-                       
-               readSeqs->read();
-               seqDB = readSeqs->getDB();
-       
-               int numSeqs = seqDB->getNumSeqs();
+               int startTime = time(NULL);
+               
+               int numSeqs = alignDB.getNumSeqs();
+               cutoff += 0.005;
                
-               string distFile = getRootName(globaldata->getFastaFile()) + "dist";
+               string outputFile;
+                               
+               if (output == "lt") { //does the user want lower triangle phylip formatted file 
+                       outputFile = outputDir + getRootName(getSimpleName(fastafile)) + "phylip.dist";
+                       remove(outputFile.c_str());
+                       
+                       //output numSeqs to phylip formatted dist file
+               }else if (output == "column") { //user wants column format
+                       outputFile = outputDir + getRootName(getSimpleName(fastafile)) + "dist";
+                       remove(outputFile.c_str());
+               }else { //assume square
+                       outputFile = outputDir + getRootName(getSimpleName(fastafile)) + "square.dist";
+                       remove(outputFile.c_str());
+               }
                
-               remove(distFile.c_str());
+
+#ifdef USE_MPI
                
-               //#     if defined (_WIN32)
-                       //figure out how to implement the fork and wait commands in windows
-               //      driver(distCalculator, seqDB, 0, numSeqs, distFile, cutoff);
-               //#     endif
+               int pid, start, end; 
+               int tag = 2001;
+                               
+               MPI_Status status; 
+               MPI_Comm_size(MPI_COMM_WORLD, &processors); //set processors to the number of mpi processes running
+               MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are
                
-               #       if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
-                       if(processors == 1){
-                               driver(distCalculator, seqDB, 0, numSeqs, distFile, cutoff);    
-                       }       
-                       else if(processors == 2){
+               //each process gets where it should start and stop in the file
+               start = int (sqrt(float(pid)/float(processors)) * numSeqs);
+               end = int (sqrt(float(pid+1)/float(processors)) * numSeqs);
                
-                               int pid = fork();
-                               if(pid > 0){
-                                       driver(distCalculator, seqDB, 0, (numSeqs/sqrt(2)), distFile + "tempa", cutoff);        
-                                       appendFiles((distFile+"tempa"), distFile);
-                                       remove((distFile + "tempa").c_str());   
-                               }
-                               else{
-                                       driver(distCalculator, seqDB, (numSeqs/sqrt(2)), numSeqs, distFile + "tempb", cutoff);  
-                                       appendFiles((distFile+"tempb"), distFile);
-                                       remove((distFile + "tempb").c_str());   
-                               }
-                               wait(NULL);
+               if (output != "lt") {
+                       MPI_File outMPI;
+                       int amode=MPI_MODE_CREATE|MPI_MODE_WRONLY; 
 
-                       }
-                       else if(processors == 3){
-                               int pid1 = fork();
-                               if(pid1 > 0){
-                                       int pid2 = fork();
-                                       if(pid2 > 0){
-                                               driver(distCalculator, seqDB, 0, sqrt(3) * numSeqs / 3, distFile + "tempa", cutoff);
-                                               appendFiles(distFile+"tempa", distFile);
-                                               remove((distFile + "tempa").c_str());   
-                                       }
-                                       else{
-                                               driver(distCalculator, seqDB, sqrt(3) * numSeqs / 3, sqrt(6) * numSeqs / 3, distFile + "tempb", cutoff);        
-                                               appendFiles(distFile+"tempb", distFile);
-                                               remove((distFile + "tempb").c_str());                           
-                                       }
-                                       wait(NULL);
-                               }
-                               else{
-                                       driver(distCalculator, seqDB, sqrt(6) * numSeqs / 3, numSeqs, distFile + "tempc", cutoff);      
-                                       appendFiles(distFile+"tempc", distFile);
-                                       remove((distFile + "tempc").c_str());                   
+                       //char* filename = new char[outputFile.length()];
+                       //memcpy(filename, outputFile.c_str(), outputFile.length());
+                       
+                       char filename[1024];
+                       strcpy(filename, outputFile.c_str());
+                       
+                       MPI_File_open(MPI_COMM_WORLD, filename, amode, MPI_INFO_NULL, &outMPI);
+                       //delete filename;
+
+                       if (pid == 0) { //you are the root process 
+                       
+                               //do your part
+                               string outputMyPart;
+                               driverMPI(start, end, outMPI, cutoff);
+                               
+                               if (m->control_pressed) { MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
+                       
+                               //wait on chidren
+                               for(int i = 1; i < processors; i++) { 
+                                       if (m->control_pressed) { MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
+                                       
+                                       char buf[4];
+                                       MPI_Recv(buf, 4, MPI_CHAR, i, tag, MPI_COMM_WORLD, &status); 
                                }
-                               wait(NULL);
+                       }else { //you are a child process
+                               //do your part
+                               driverMPI(start, end, outMPI, cutoff);
+                               
+                               if (m->control_pressed) { MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
+                       
+                               char buf[4];
+                               strcpy(buf, "done"); 
+                               //tell parent you are done.
+                               MPI_Send(buf, 4, MPI_CHAR, 0, tag, MPI_COMM_WORLD);
                        }
-                       else if(processors == 4){
-                               int pid1 = fork();
-                               if(pid1 > 0){
-                                       int pid2 = fork();
-                                       if(pid2 > 0){
-                                               driver(distCalculator, seqDB, 0, numSeqs / 2, distFile + "tempa", cutoff);      
-                                               appendFiles(distFile+"tempa", distFile);
-                                               remove((distFile + "tempa").c_str());                   
-                                       }
-                                       else{
-                                               driver(distCalculator, seqDB, numSeqs / 2, (numSeqs/sqrt(2)), distFile + "tempb", cutoff);      
-                                               appendFiles(distFile+"tempb", distFile);
-                                               remove((distFile + "tempb").c_str());                           
-                                       }
-                                       wait(NULL);
-                               }
-                               else{
-                                       int pid3 = fork();
-                                       if(pid3 > 0){
-                                               driver(distCalculator, seqDB, (numSeqs/sqrt(2)), (sqrt(3) * numSeqs / 2), distFile + "tempc", cutoff);  
-                                               appendFiles(distFile+"tempc", distFile);
-                                               remove((distFile + "tempc").c_str());                           
-                                       }
-                                       else{
-                                               driver(distCalculator, seqDB, (sqrt(3) * numSeqs / 2), numSeqs, distFile + "tempd", cutoff);    
-                                               appendFiles(distFile+"tempd", distFile);
-                                               remove((distFile + "tempd").c_str());                           
+                       
+                       MPI_File_close(&outMPI);
+                       
+               }else { //lower triangle format
+                       if (pid == 0) { //you are the root process 
+                       
+                               //do your part
+                               string outputMyPart;
+                               long mySize;
+                               driverMPI(start, end, outputFile, mySize);
+       
+                               if (m->control_pressed) {  delete distCalculator;  return 0; }
+                               
+                               int amode=MPI_MODE_APPEND|MPI_MODE_WRONLY|MPI_MODE_CREATE; //
+                               MPI_File outMPI;
+                               MPI_File inMPI;
+
+                               //char* filename = new char[outputFile.length()];
+                               //memcpy(filename, outputFile.c_str(), outputFile.length());
+                               
+                               char filename[1024];
+                               strcpy(filename, outputFile.c_str());
+
+                               MPI_File_open(MPI_COMM_SELF, filename, amode, MPI_INFO_NULL, &outMPI);
+                               //delete filename;
+
+                               //wait on chidren
+                               for(int b = 1; b < processors; b++) { 
+                                       long fileSize;
+                                       
+                                       if (m->control_pressed) { MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
+                                       
+                                       MPI_Recv(&fileSize, 1, MPI_LONG, b, tag, MPI_COMM_WORLD, &status); 
+                                       
+                                       string outTemp = outputFile + toString(b) + ".temp";
+
+                                       char* buf = new char[outTemp.length()];
+                                       memcpy(buf, outTemp.c_str(), outTemp.length());
+                                       
+                                       MPI_File_open(MPI_COMM_SELF, buf, MPI_MODE_DELETE_ON_CLOSE|MPI_MODE_RDONLY, MPI_INFO_NULL, &inMPI);
+                                       delete buf;
+
+                                       int count = 0;
+                                       while (count < fileSize) { 
+                                               char buf2[1];
+                                               MPI_File_read(inMPI, buf2, 1, MPI_CHAR, &status);
+                                               MPI_File_write(outMPI, buf2, 1, MPI_CHAR, &status);
+                                               count += 1;
                                        }
-                                       wait(NULL);
+                                       
+                                       MPI_File_close(&inMPI); //deleted on close
                                }
-                               wait(NULL);
+                               
+                               MPI_File_close(&outMPI);
+                       }else { //you are a child process
+                               //do your part
+                               long size;
+                               driverMPI(start, end, (outputFile + toString(pid) + ".temp"), size);
+                               
+                               if (m->control_pressed) { delete distCalculator;  return 0; }
+                       
+                               //tell parent you are done.
+                               MPI_Send(&size, 1, MPI_LONG, 0, tag, MPI_COMM_WORLD);
                        }
-                       wait(NULL);
-               #       else
-                       driver(distCalculator, seqDB, 0, numSeqs, distFile, cutoff);
-               #       endif
+               }
+               MPI_Barrier(MPI_COMM_WORLD); //make everyone wait - just in case
+#else          
+                               
+       #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+               //if you don't need to fork anything
+               if(processors == 1){
+                       driver(0, numSeqs, outputFile, cutoff);
+               }else{ //you have multiple processors
+                       
+                       for (int i = 0; i < processors; i++) {
+                               lines.push_back(new linePair());
+                               lines[i]->start = int (sqrt(float(i)/float(processors)) * numSeqs);
+                               lines[i]->end = int (sqrt(float(i+1)/float(processors)) * numSeqs);
+                       }
+
+                       createProcesses(outputFile); 
+               
+                       map<int, int>::iterator it = processIDS.begin();
+                       rename((outputFile + toString(it->second) + ".temp").c_str(), outputFile.c_str());
+                       it++;
+                       
+                       //append and remove temp files
+                       for (; it != processIDS.end(); it++) {
+                               appendFiles((outputFile + toString(it->second) + ".temp"), outputFile);
+                               remove((outputFile + toString(it->second) + ".temp").c_str());
+                       }
+               }
+       #else
+               ifstream inFASTA;
+               driver(0, numSeqs, outputFile, cutoff);
+       #endif
        
+#endif
+               if (m->control_pressed) { delete distCalculator; remove(outputFile.c_str()); return 0; }
+               
+               #ifdef USE_MPI
+                       MPI_Comm_rank(MPI_COMM_WORLD, &pid); 
+                                       
+                       if (pid == 0) { //only one process should output to screen
+               #endif
+               
+               if (output == "square") {  convertMatrix(outputFile); }
+               
+               ifstream fileHandle;
+               fileHandle.open(outputFile.c_str());
+               if(fileHandle) {
+                       gobble(fileHandle);
+                       if (fileHandle.eof()) { m->mothurOut(outputFile + " is blank. This can result if there are no distances below your cutoff.");  m->mothurOutEndLine(); }
+               }
+
+               
+               #ifdef USE_MPI
+                       }
+               #endif
+               
+               if (m->control_pressed) { delete distCalculator; remove(outputFile.c_str()); return 0; }
+               
                delete distCalculator;
-       
+               
+               m->mothurOutEndLine();
+               m->mothurOut("Output File Name: "); m->mothurOutEndLine();
+               m->mothurOut(outputFile); m->mothurOutEndLine();
+               m->mothurOutEndLine();
+               m->mothurOut("It took " + toString(time(NULL) - startTime) + " to calculate the distances for " + toString(numSeqs) + " sequences."); m->mothurOutEndLine();
                return 0;
-
+               
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function execute. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "DistanceCommand", "execute");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the DistanceCommand class function execute. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+}
+/**************************************************************************************************/
+void DistanceCommand::createProcesses(string filename) {
+       try {
+#if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+               int process = 0;
+               processIDS.clear();
+               
+               //loop through and create all the processes you want
+               while (process != processors) {
+                       int pid = fork();
+                       
+                       if (pid > 0) {
+                               processIDS[lines[process]->end] = pid;  //create map from line number to pid so you can append files in correct order later
+                               process++;
+                       }else if (pid == 0){
+                               driver(lines[process]->start, lines[process]->end, filename + toString(getpid()) + ".temp", cutoff);
+                               exit(0);
+                       }else { m->mothurOut("unable to spawn the necessary processes."); m->mothurOutEndLine(); exit(0); }
+               }
+       
+               //force parent to wait until all the processes are done
+               for (map<int, int>::iterator it = processIDS.begin(); it != processIDS.end(); it++) { 
+                       int temp = it->second;
+                       wait(&temp);
+               }
+#endif
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DistanceCommand", "createProcesses");
                exit(1);
-       }       
+       }
 }
 
 /**************************************************************************************************/
 /////// need to fix to work with calcs and sequencedb
-int DistanceCommand::driver(Dist* distCalculator, SequenceDB* align, int startLine, int endLine, string dFileName, float cutoff){
+int DistanceCommand::driver(int startLine, int endLine, string dFileName, float cutoff){
        try {
+
                int startTime = time(NULL);
-       
-               ofstream distFile(dFileName.c_str(), ios::trunc);
-               distFile.setf(ios::fixed, ios::showpoint);
-               distFile << setprecision(4);
-       
-               for(int i=startLine;i<endLine;i++){
                
+               //column file
+               ofstream outFile(dFileName.c_str(), ios::trunc);
+               outFile.setf(ios::fixed, ios::showpoint);
+               outFile << setprecision(4);
+               
+               if((output == "lt") && startLine == 0){ outFile << alignDB.getNumSeqs() << endl;        }
+               
+               for(int i=startLine;i<endLine;i++){
+                       if(output == "lt")      {       
+                               string name = alignDB.get(i).getName();
+                               if (name.length() < 10) { //pad with spaces to make compatible
+                                       while (name.length() < 10) {  name += " ";  }
+                               }
+                               outFile << name << '\t';        
+                       }
                        for(int j=0;j<i;j++){
-//cout << "unaligned" << endl;
-//cout << align->get(i).getUnaligned() << "  " << align->get(j).getUnaligned() << endl;
-//cout << "aligned" << endl;
-//cout << align->get(i).getAligned() << "  " << align->get(j).getAligned() << endl;
-                               distCalculator->calcDist(align->get(i), align->get(j));
+                               
+                               if (m->control_pressed) { outFile.close(); return 0;  }
+                               
+                               distCalculator->calcDist(alignDB.get(i), alignDB.get(j));
                                double dist = distCalculator->getDist();
-
+                               
                                if(dist <= cutoff){
-                                       distFile << align->get(i).getName() << ' ' << align->get(j).getName() << ' ' << dist << endl;
+                                       if (output == "column") { outFile << alignDB.get(i).getName() << ' ' << alignDB.get(j).getName() << ' ' << dist << endl; }
                                }
-                       
+                               if (output == "lt") {  outFile << dist << '\t'; }
+                               
+                               if (output == "square") { //make a square column you can convert to square phylip
+                                       outFile << alignDB.get(i).getName() << '\t' << alignDB.get(j).getName() << '\t' << dist << endl;
+                                       outFile << alignDB.get(j).getName() << '\t' << alignDB.get(i).getName() << '\t' << dist << endl;
+                               }
+
                        }
+                       
+                       if (output == "lt") { outFile << endl; }
+                       
                        if(i % 100 == 0){
-                               cout << i << '\t' << time(NULL) - startTime << endl;
+                               m->mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine();
                        }
-               
+                       
                }
-               cout << endLine-1 << '\t' << time(NULL) - startTime << endl;
-       
+               m->mothurOut(toString(endLine-1) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine();
+               
+               outFile.close();
+               
                return 1;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function driver. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "DistanceCommand", "driver");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the DistanceCommand class function driver. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+}
+#ifdef USE_MPI
+/**************************************************************************************************/
+/////// need to fix to work with calcs and sequencedb
+int DistanceCommand::driverMPI(int startLine, int endLine, MPI_File& outMPI, float cutoff){
+       try {
+               MPI_Status status;
+               int startTime = time(NULL);
+               
+               string outputString = "";
+               
+               for(int i=startLine;i<endLine;i++){
+       
+                       for(int j=0;j<i;j++){
+                               
+                               if (m->control_pressed) {  return 0;  }
+                               
+                               distCalculator->calcDist(alignDB.get(i), alignDB.get(j));
+                               double dist = distCalculator->getDist();
+                               
+                               if(dist <= cutoff){
+                                       if (output == "column") { outputString += (alignDB.get(i).getName() + ' ' + alignDB.get(j).getName() + ' ' + toString(dist) + '\n'); }
+                               }
+                               
+                               if (output == "square") { //make a square column you can convert to square phylip
+                                       outputString += (alignDB.get(i).getName() + ' ' + alignDB.get(j).getName() + ' ' + toString(dist) + '\n');
+                                       outputString += (alignDB.get(j).getName() + ' ' + alignDB.get(i).getName() + ' ' + toString(dist) + '\n');
+                               }
+                       }
+                       
+                       if(i % 100 == 0){
+                               //m->mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine();
+                               cout << i << '\t' << (time(NULL) - startTime) << endl;
+                       }
+                       
+                        
+                       //send results to parent
+                       int length = outputString.length();
+
+                       char* buf = new char[length];
+                       memcpy(buf, outputString.c_str(), length);
+                       
+                       MPI_File_write_shared(outMPI, buf, length, MPI_CHAR, &status);
+                       outputString = "";
+                       delete buf;
+                       
+               }
+               
+               //m->mothurOut(toString(endLine-1) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine();
+               cout << (endLine-1) << '\t' << (time(NULL) - startTime) << endl;                
+               return 1;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DistanceCommand", "driverMPI");
                exit(1);
-       }       
+       }
+}
+/**************************************************************************************************/
+/////// need to fix to work with calcs and sequencedb
+int DistanceCommand::driverMPI(int startLine, int endLine, string file, long& size){
+       try {
+               MPI_Status status;
+               
+               MPI_File outMPI;
+               int amode=MPI_MODE_CREATE|MPI_MODE_WRONLY; 
+
+               //char* filename = new char[file.length()];
+               //memcpy(filename, file.c_str(), file.length());
+               
+               char filename[1024];
+               strcpy(filename, file.c_str());
 
+               MPI_File_open(MPI_COMM_SELF, filename, amode, MPI_INFO_NULL, &outMPI);
+               //delete filename;
+
+               int startTime = time(NULL);
+               
+               string outputString = "";
+               size = 0;
+               
+               if((output == "lt") && startLine == 0){ outputString += toString(alignDB.getNumSeqs()) + "\n";  }
+               
+               for(int i=startLine;i<endLine;i++){
+                       if(output == "lt")      {       
+                               string name = alignDB.get(i).getName();
+                               if (name.length() < 10) { //pad with spaces to make compatible
+                                       while (name.length() < 10) {  name += " ";  }
+                               }
+                               outputString += name + "\t";    
+                       }
+                       for(int j=0;j<i;j++){
+                               
+                               if (m->control_pressed) {  return 0;  }
+                               
+                               distCalculator->calcDist(alignDB.get(i), alignDB.get(j));
+                               double dist = distCalculator->getDist();
+                               
+                               if (output == "lt") {  outputString += toString(dist) + "\t"; }
+                       }
+                       
+                       if (output == "lt") { outputString += "\n"; }
+
+               
+                       if(i % 100 == 0){
+                               //m->mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine();
+                               cout << i << '\t' << (time(NULL) - startTime) << endl;
+                       }
+                       
+                       
+                       //send results to parent
+                       int length = outputString.length();
+                       char* buf = new char[length];
+                       memcpy(buf, outputString.c_str(), length);
+                       
+                       MPI_File_write(outMPI, buf, length, MPI_CHAR, &status);
+                       size += outputString.length();
+                       outputString = "";
+                       delete buf;
+               }
+               
+               //m->mothurOut(toString(endLine-1) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine();
+               cout << (endLine-1) << '\t' << (time(NULL) - startTime) << endl;
+               MPI_File_close(&outMPI);
+               
+               return 1;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DistanceCommand", "driverMPI");
+               exit(1);
+       }
 }
+#endif
+/**************************************************************************************************/
+int DistanceCommand::convertMatrix(string outputFile) {
+       try{
+
+               //sort file by first column so the distances for each row are together
+               string outfile = getRootName(outputFile) + "sorted.dist.temp";
+               
+               //use the unix sort 
+               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+                       string command = "sort -n " + outputFile + " -o " + outfile;
+                       system(command.c_str());
+               #else //sort using windows sort
+                       string command = "sort " + outputFile + " /O " + outfile;
+                       system(command.c_str());
+               #endif
+               
 
+               //output to new file distance for each row and save positions in file where new row begins
+               ifstream in;
+               openInputFile(outfile, in);
+               
+               ofstream out;
+               openOutputFile(outputFile, out);
+               
+               out.setf(ios::fixed, ios::floatfield); out.setf(ios::showpoint);
+
+               out << alignDB.getNumSeqs() << endl;
+               
+               //get first currentRow
+               string first, currentRow, second;
+               float dist;
+               map<string, float> rowDists; //take advantage of the fact that maps are already sorted by key 
+               map<string, float>::iterator it;
+               
+               in >> first;
+               currentRow = first;
+               
+               rowDists[first] = 0.00; //distance to yourself is 0.0
+               
+               in.seekg(0);
+               //openInputFile(outfile, in);
+               
+               while(!in.eof()) {
+                       if (m->control_pressed) { in.close(); remove(outfile.c_str()); out.close(); return 0; }
+                       
+                       in >> first >> second >> dist; gobble(in);
+                               
+                       if (first != currentRow) {
+                               //print out last row
+                               out << currentRow << '\t'; //print name
+
+                               //print dists
+                               for (it = rowDists.begin(); it != rowDists.end(); it++) {
+                                       out << it->second << '\t';
+                               }
+                               out << endl;
+                               
+                               //start new row
+                               currentRow = first;
+                               rowDists.clear();
+                               rowDists[first] = 0.00;
+                               rowDists[second] = dist;
+                       }else{
+                               rowDists[second] = dist;
+                       }
+               }
+               //print out last row
+               out << currentRow << '\t'; //print name
+                               
+               //print dists
+               for (it = rowDists.begin(); it != rowDists.end(); it++) {
+                       out << it->second << '\t';
+               }
+               out << endl;
+               
+               in.close();
+               out.close();
+               
+               remove(outfile.c_str());
+               
+               return 1;
+               
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DistanceCommand", "convertMatrix");
+               exit(1);
+       }
+}
 /**************************************************************************************************/
+int DistanceCommand::convertToLowerTriangle(string outputFile) {
+       try{
+
+               //sort file by first column so the distances for each row are together
+               string outfile = getRootName(outputFile) + "sorted.dist.temp";
+               
+               //use the unix sort 
+               #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
+                       string command = "sort -n " + outputFile + " -o " + outfile;
+                       system(command.c_str());
+               #else //sort using windows sort
+                       string command = "sort " + outputFile + " /O " + outfile;
+                       system(command.c_str());
+               #endif
+               
+
+               //output to new file distance for each row and save positions in file where new row begins
+               ifstream in;
+               openInputFile(outfile, in);
+               
+               ofstream out;
+               openOutputFile(outputFile, out);
+               
+               out.setf(ios::fixed, ios::floatfield); out.setf(ios::showpoint);
+
+               out << alignDB.getNumSeqs() << endl;
+               
+               //get first currentRow
+               string first, currentRow, second;
+               float dist;
+               int i, j;
+               i = 0; j = 0;
+               map<string, float> rowDists; //take advantage of the fact that maps are already sorted by key 
+               map<string, float>::iterator it;
+               
+               in >> first;
+               currentRow = first;
+               
+               rowDists[first] = 0.00; //distance to yourself is 0.0
+               
+               in.seekg(0);
+               //openInputFile(outfile, in);
+               
+               while(!in.eof()) {
+                       if (m->control_pressed) { in.close(); remove(outfile.c_str()); out.close(); return 0; }
+                       
+                       in >> first >> second >> dist; gobble(in);
+                               
+                       if (first != currentRow) {
+                               //print out last row
+                               out << currentRow << '\t'; //print name
+
+                               //print dists
+                               for (it = rowDists.begin(); it != rowDists.end(); it++) {
+                                       if (j >= i) { break; }
+                                       out << it->second << '\t';
+                                       j++;
+                               }
+                               out << endl;
+                               
+                               //start new row
+                               currentRow = first;
+                               rowDists.clear();
+                               rowDists[first] = 0.00;
+                               rowDists[second] = dist;
+                               j = 0;
+                               i++;
+                       }else{
+                               rowDists[second] = dist;
+                       }
+               }
+               //print out last row
+               out << currentRow << '\t'; //print name
+                               
+               //print dists
+               for (it = rowDists.begin(); it != rowDists.end(); it++) {
+                       out << it->second << '\t';
+               }
+               out << endl;
+               
+               in.close();
+               out.close();
+               
+               remove(outfile.c_str());
+               
+               return 1;
+               
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DistanceCommand", "convertToLowerTriangle");
+               exit(1);
+       }
+}
+/**************************************************************************************************
 void DistanceCommand::appendFiles(string temp, string filename) {
        try{
                ofstream output;
                ifstream input;
-               
+       
                //open output file in append mode
                openOutputFileAppend(filename, output);
-               
-               //open temp file for reading
                openInputFile(temp, input);
                
-               string line;
-               //read input file and write to output file
-               while(input.eof() != true) {
-                       getline(input, line); //getline removes the newline char
-                       if (line != "") {
-                               output << line << endl;   // Appending back newline char 
-                       }
-               }       
-                       
+               while(char c = input.get()){
+                       if(input.eof())         {       break;                  }
+                       else                            {       output << c;    }
+               }
+               
                input.close();
                output.close();
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the DistanceCommand class Function appendFiles. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               m->errorOut(e, "DistanceCommand", "appendFiles");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the DistanceCommand class function appendFiles. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
-/**************************************************************************************************/
\ No newline at end of file
+/**************************************************************************************************/
+
+