]> git.donarmstrong.com Git - mothur.git/blobdiff - distancecommand.cpp
added pairwise.seqs
[mothur.git] / distancecommand.cpp
index 58302ddfbbc9e07de80747544217e79937c387ba..f09aa997a506076b99584228c2b2272a6530a6fc 100644 (file)
 #include "onegapignore.h"
 
 //**********************************************************************************************************************
-
+vector<string> DistanceCommand::getValidParameters(){  
+       try {
+               string Array[] =  {"fasta","oldfasta","column", "output", "calc", "countends", "cutoff", "processors", "outputdir","inputdir","compress"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DistanceCommand", "getValidParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+DistanceCommand::DistanceCommand(){    
+       try {
+               //initialize outputTypes
+               vector<string> tempOutNames;
+               outputTypes["phylip"] = tempOutNames;
+               outputTypes["column"] = tempOutNames;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DistanceCommand", "DistanceCommand");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> DistanceCommand::getRequiredParameters(){       
+       try {
+               string Array[] =  {"fasta"};
+               vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "ChopSeqsCommand", "getRequiredParameters");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
+vector<string> DistanceCommand::getRequiredFiles(){    
+       try {
+               vector<string> myArray;
+               return myArray;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DistanceCommand", "getRequiredFiles");
+               exit(1);
+       }
+}
+//**********************************************************************************************************************
 DistanceCommand::DistanceCommand(string option) {
        try {
                abort = false;
@@ -26,13 +73,14 @@ DistanceCommand::DistanceCommand(string option) {
                
                else {
                        //valid paramters for this command
-                       string Array[] =  {"fasta", "output", "calc", "countends", "cutoff", "processors", "outputdir","inputdir"};
+                       string Array[] =  {"fasta","oldfasta","column", "output", "calc", "countends", "cutoff", "processors", "outputdir","inputdir","compress"};
+
                        vector<string> myArray (Array, Array+(sizeof(Array)/sizeof(string)));
                        
                        OptionParser parser(option);
                        map<string, string> parameters = parser.getParameters();
                        
-                       ValidParameters validParameter;
+                       ValidParameters validParameter("dist.seqs");
                        map<string, string>::iterator it2;
                
                        //check to make sure all parameters are valid for command
@@ -40,6 +88,11 @@ DistanceCommand::DistanceCommand(string option) {
                                if (validParameter.isValidParameter(it2->first, myArray, it2->second) != true) {  abort = true;  }
                        }
                        
+                       //initialize outputTypes
+                       vector<string> tempOutNames;
+                       outputTypes["phylip"] = tempOutNames;
+                       outputTypes["column"] = tempOutNames;
+               
                        //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 = "";          }
@@ -48,10 +101,26 @@ DistanceCommand::DistanceCommand(string option) {
                                it2 = parameters.find("fasta");
                                //user has given a template file
                                if(it2 != parameters.end()){ 
-                                       path = hasPath(it2->second);
+                                       path = m->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;           }
                                }
+                               
+                               it2 = parameters.find("oldfasta");
+                               //user has given a template file
+                               if(it2 != parameters.end()){ 
+                                       path = m->hasPath(it2->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["oldfasta"] = inputDir + it2->second;                }
+                               }
+                               
+                               it2 = parameters.find("column");
+                               //user has given a template file
+                               if(it2 != parameters.end()){ 
+                                       path = m->hasPath(it2->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["column"] = inputDir + it2->second;          }
+                               }
                        }
 
                        //check for required parameters
@@ -60,15 +129,23 @@ DistanceCommand::DistanceCommand(string option) {
                        else if (fastafile == "not open") { abort = true; }     
                        else{
                                ifstream inFASTA;
-                               openInputFile(fastafile, inFASTA);
+                               m->openInputFile(fastafile, inFASTA);
                                alignDB = SequenceDB(inFASTA); 
                                inFASTA.close();
                        }
                        
+                       oldfastafile = validParameter.validFile(parameters, "oldfasta", true);
+                       if (oldfastafile == "not found") { oldfastafile = ""; }
+                       else if (oldfastafile == "not open") { abort = true; }  
+                       
+                       column = validParameter.validFile(parameters, "column", true);
+                       if (column == "not found") { column = ""; }
+                       else if (column == "not open") { abort = true; }        
+                       
                        //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  
+                               outputDir += m->hasPath(fastafile); //if user entered a file with a path then preserve it       
                        }
 
                        //check for optional parameter and set defaults
@@ -78,7 +155,7 @@ DistanceCommand::DistanceCommand(string option) {
                        else { 
                                 if (calc == "default")  {  calc = "onegap";  }
                        }
-                       splitAtDash(calc, Estimators);
+                       m->splitAtDash(calc, Estimators);
 
                        string temp;
                        temp = validParameter.validFile(parameters, "countends", false);        if(temp == "not found"){        temp = "T";     }
@@ -90,13 +167,20 @@ DistanceCommand::DistanceCommand(string option) {
                        temp = validParameter.validFile(parameters, "processors", false);       if(temp == "not found"){        temp = "1"; }
                        convert(temp, processors); 
                        
+                       temp = validParameter.validFile(parameters, "compress", false);         if(temp == "not found"){  temp = "F"; }
+                       convert(temp, compress);
+
                        output = validParameter.validFile(parameters, "output", false);         if(output == "not found"){      output = "column"; }
                        
+                       if (((column != "") && (oldfastafile == "")) || ((column == "") && (oldfastafile != ""))) { m->mothurOut("If you provide column or oldfasta, you must provide both."); m->mothurOutEndLine(); abort=true; }
+                       
+                       if ((column != "") && (oldfastafile != "") && (output != "column")) { m->mothurOut("You have provided column and oldfasta, indicating you want to append distances to your column file. Your output must be in column format to do so."); m->mothurOutEndLine(); abort=true; }
+                       
                        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) {
+                       if (m->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();      }
@@ -138,13 +222,15 @@ DistanceCommand::~DistanceCommand(){
 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 dist.seqs command parameters are fasta, oldfasta, column, calc, countends, output, compress, cutoff and processors.  \n");
                m->mothurOut("The fasta parameter is required.\n");
+               m->mothurOut("The oldfasta and column parameters allow you to append the distances calculated to the column file.\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 compress parameter allows you to indicate that you want the resulting distance file compressed.  The default is false.\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");
@@ -164,22 +250,39 @@ int DistanceCommand::execute(){
                
                int startTime = time(NULL);
                
+               //save number of new sequence
+               numNewFasta = alignDB.getNumSeqs();
+               
+               //sanity check the oldfasta and column file as well as add oldfasta sequences to alignDB
+               if ((oldfastafile != "") && (column != ""))  {  if (!(sanityCheck())) { return 0; }  }
+               
+               if (m->control_pressed) { return 0; }
+               
                int numSeqs = alignDB.getNumSeqs();
                cutoff += 0.005;
                
                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());
+                       outputFile = outputDir + m->getRootName(m->getSimpleName(fastafile)) + "phylip.dist";
+                       remove(outputFile.c_str()); outputTypes["phylip"].push_back(outputFile);
                        
                        //output numSeqs to phylip formatted dist file
                }else if (output == "column") { //user wants column format
-                       outputFile = outputDir + getRootName(getSimpleName(fastafile)) + "dist";
+                       outputFile = outputDir + m->getRootName(m->getSimpleName(fastafile)) + "dist";
+                       outputTypes["column"].push_back(outputFile);
+                       
+                       //so we don't accidentally overwrite
+                       if (outputFile == column) { 
+                               string tempcolumn = column + ".old"; 
+                               rename(column.c_str(), tempcolumn.c_str());
+                       }
+                       
                        remove(outputFile.c_str());
                }else { //assume square
-                       outputFile = outputDir + getRootName(getSimpleName(fastafile)) + "square.dist";
+                       outputFile = outputDir + m->getRootName(m->getSimpleName(fastafile)) + "square.dist";
                        remove(outputFile.c_str());
+                       outputTypes["phylip"].push_back(outputFile);
                }
                
 
@@ -193,44 +296,53 @@ int DistanceCommand::execute(){
                MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are
                
                //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);
+               if (output != "square") {
+                       start = int (sqrt(float(pid)/float(processors)) * numSeqs);
+                       end = int (sqrt(float(pid+1)/float(processors)) * numSeqs);
+               }else{
+                       start = int ((float(pid)/float(processors)) * numSeqs);
+                       end = int ((float(pid+1)/float(processors)) * numSeqs);
+               }
                
-               if (output != "lt") {
+               if (output == "column") {
                        MPI_File outMPI;
                        int amode=MPI_MODE_CREATE|MPI_MODE_WRONLY; 
 
-                       char* filename = new char[outputFile.length()];\r
-                       memcpy(filename, outputFile.c_str(), outputFile.length());
+                       //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;
+                       //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; }
+                               driverMPI(start, end, outMPI, cutoff); 
+                               
+                               if (m->control_pressed) { outputTypes.clear(); 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; }
+                                       if (m->control_pressed) { outputTypes.clear();  MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
                                        
-                                       char buf[4];
-                                       MPI_Recv(buf, 4, MPI_CHAR, i, tag, MPI_COMM_WORLD, &status); 
+                                       char buf[5];
+                                       MPI_Recv(buf, 5, MPI_CHAR, i, tag, MPI_COMM_WORLD, &status); 
                                }
                        }else { //you are a child process
                                //do your part
-                               driverMPI(start, end, outMPI, cutoff);
+                               driverMPI(start, end, outMPI, cutoff); 
                                
-                               if (m->control_pressed) { MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
+                               if (m->control_pressed) { outputTypes.clear();  MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
                        
-                               char buf[4];
+                               char buf[5];
                                strcpy(buf, "done"); 
                                //tell parent you are done.
-                               MPI_Send(buf, 4, MPI_CHAR, 0, tag, MPI_COMM_WORLD);
+                               MPI_Send(buf, 5, MPI_CHAR, 0, tag, MPI_COMM_WORLD);
                        }
                        
                        MPI_File_close(&outMPI);
@@ -240,40 +352,44 @@ int DistanceCommand::execute(){
                        
                                //do your part
                                string outputMyPart;
-                               long mySize;
-                               driverMPI(start, end, outputFile, mySize);
+                               unsigned long int mySize;
+                               
+                               if (output != "square"){ driverMPI(start, end, outputFile, mySize); }
+                               else { driverMPI(start, end, outputFile, mySize, output); }
        
-                               if (m->control_pressed) {  delete distCalculator;  return 0; }
+                               if (m->control_pressed) {  outputTypes.clear();  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()];\r
-                               memcpy(filename, outputFile.c_str(), outputFile.length());
-                       
+                               //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;
+                               //delete filename;
 
                                //wait on chidren
                                for(int b = 1; b < processors; b++) { 
-                                       long fileSize;
+                                       unsigned long int fileSize;
                                        
-                                       if (m->control_pressed) { MPI_File_close(&outMPI);  delete distCalculator;  return 0; }
+                                       if (m->control_pressed) { outputTypes.clear();  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()];\r
+                                       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) { //read 1000 characters at a time
-                                               //send freqs
+                                       while (count < fileSize) { 
                                                char buf2[1];
                                                MPI_File_read(inMPI, buf2, 1, MPI_CHAR, &status);
                                                MPI_File_write(outMPI, buf2, 1, MPI_CHAR, &status);
@@ -286,8 +402,9 @@ int DistanceCommand::execute(){
                                MPI_File_close(&outMPI);
                        }else { //you are a child process
                                //do your part
-                               long size;
-                               driverMPI(start, end, (outputFile + toString(pid) + ".temp"), size);
+                               unsigned long int size;
+                               if (output != "square"){ driverMPI(start, end, (outputFile + toString(pid) + ".temp"), size); }
+                               else { driverMPI(start, end, (outputFile + toString(pid) + ".temp"), size, output); }
                                
                                if (m->control_pressed) { delete distCalculator;  return 0; }
                        
@@ -295,18 +412,25 @@ int DistanceCommand::execute(){
                                MPI_Send(&size, 1, MPI_LONG, 0, tag, MPI_COMM_WORLD);
                        }
                }
+               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);
+                       if (output != "square") {  driver(0, numSeqs, outputFile, cutoff); }
+                       else { driver(0, numSeqs, outputFile, "square");  }
                }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);
+                               if (output != "square") {
+                                       lines[i]->start = int (sqrt(float(i)/float(processors)) * numSeqs);
+                                       lines[i]->end = int (sqrt(float(i+1)/float(processors)) * numSeqs);
+                               }else{
+                                       lines[i]->start = int ((float(i)/float(processors)) * numSeqs);
+                                       lines[i]->end = int ((float(i+1)/float(processors)) * numSeqs);
+                               }
                        }
 
                        createProcesses(outputFile); 
@@ -317,17 +441,18 @@ int DistanceCommand::execute(){
                        
                        //append and remove temp files
                        for (; it != processIDS.end(); it++) {
-                               appendFiles((outputFile + toString(it->second) + ".temp"), outputFile);
+                               m->appendFiles((outputFile + toString(it->second) + ".temp"), outputFile);
                                remove((outputFile + toString(it->second) + ".temp").c_str());
                        }
                }
        #else
-               ifstream inFASTA;
-               driver(0, numSeqs, outputFile, cutoff);
+               //ifstream inFASTA;
+               if (output != "square") {  driver(0, numSeqs, outputFile, cutoff); }
+               else { driver(0, numSeqs, outputFile, "square");  }
        #endif
        
 #endif
-               if (m->control_pressed) { delete distCalculator; remove(outputFile.c_str()); return 0; }
+               if (m->control_pressed) { outputTypes.clear();  delete distCalculator; remove(outputFile.c_str()); return 0; }
                
                #ifdef USE_MPI
                        MPI_Comm_rank(MPI_COMM_WORLD, &pid); 
@@ -335,13 +460,42 @@ int DistanceCommand::execute(){
                        if (pid == 0) { //only one process should output to screen
                #endif
                
-               if (output == "square") {  convertMatrix(outputFile); }
+               //if (output == "square") {  convertMatrix(outputFile); }
+               
+               ifstream fileHandle;
+               fileHandle.open(outputFile.c_str());
+               if(fileHandle) {
+                       m->gobble(fileHandle);
+                       if (fileHandle.eof()) { m->mothurOut(outputFile + " is blank. This can result if there are no distances below your cutoff.");  m->mothurOutEndLine(); }
+               }
+               
+               //append the old column file to the new one
+               if ((oldfastafile != "") && (column != ""))  {
+                       //we had to rename the column file so we didnt overwrite above, but we want to keep old name
+                       if (outputFile == column) { 
+                               string tempcolumn = column + ".old";
+                               m->appendFiles(tempcolumn, outputFile);
+                               remove(tempcolumn.c_str());
+                       }else{
+                               m->appendFiles(outputFile, column);
+                               remove(outputFile.c_str());
+                               outputFile = column;
+                       }
+                       
+                       if (outputDir != "") { 
+                               string newOutputName = outputDir + m->getSimpleName(outputFile);
+                               rename(outputFile.c_str(), newOutputName.c_str());
+                               remove(outputFile.c_str());
+                               outputFile = newOutputName;
+                       }
+               }
+
                
                #ifdef USE_MPI
                        }
                #endif
                
-               if (m->control_pressed) { delete distCalculator; remove(outputFile.c_str()); return 0; }
+               if (m->control_pressed) { outputTypes.clear();  delete distCalculator; remove(outputFile.c_str()); return 0; }
                
                delete distCalculator;
                
@@ -350,6 +504,15 @@ int DistanceCommand::execute(){
                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();
+
+
+               if (m->isTrue(compress)) {
+                       m->mothurOut("Compressing..."); m->mothurOutEndLine();
+                       m->mothurOut("(Replacing " + outputFile + " with " + outputFile + ".gz)"); m->mothurOutEndLine();
+                       system(("gzip -v " + outputFile).c_str());
+                       outputNames.push_back(outputFile + ".gz");
+               }else { outputNames.push_back(outputFile); }
+
                return 0;
                
        }
@@ -373,7 +536,8 @@ void DistanceCommand::createProcesses(string filename) {
                                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);
+                               if (output != "square") {  driver(lines[process]->start, lines[process]->end, filename + toString(getpid()) + ".temp", cutoff); }
+                               else { driver(lines[process]->start, lines[process]->end, filename + toString(getpid()) + ".temp", "square"); }
                                exit(0);
                        }else { m->mothurOut("unable to spawn the necessary processes."); m->mothurOutEndLine(); exit(0); }
                }
@@ -417,6 +581,10 @@ int DistanceCommand::driver(int startLine, int endLine, string dFileName, float
                                
                                if (m->control_pressed) { outFile.close(); return 0;  }
                                
+                               //if there was a column file given and we are appending, we don't want to calculate the distances that are already in the column file
+                               //the alignDB contains the new sequences and then the old, so if i an oldsequence and j is an old sequence then break out of this loop
+                               if ((i >= numNewFasta) && (j >= numNewFasta)) { break; }
+                               
                                distCalculator->calcDist(alignDB.get(i), alignDB.get(j));
                                double dist = distCalculator->getDist();
                                
@@ -424,12 +592,6 @@ int DistanceCommand::driver(int startLine, int endLine, string dFileName, float
                                        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; }
@@ -450,6 +612,56 @@ int DistanceCommand::driver(int startLine, int endLine, string dFileName, float
                exit(1);
        }
 }
+/**************************************************************************************************/
+/////// need to fix to work with calcs and sequencedb
+int DistanceCommand::driver(int startLine, int endLine, string dFileName, string square){
+       try {
+
+               int startTime = time(NULL);
+               
+               //column file
+               ofstream outFile(dFileName.c_str(), ios::trunc);
+               outFile.setf(ios::fixed, ios::showpoint);
+               outFile << setprecision(4);
+               
+               if(startLine == 0){     outFile << alignDB.getNumSeqs() << endl;        }
+               
+               for(int i=startLine;i<endLine;i++){
+                               
+                       string name = alignDB.get(i).getName();
+                       //pad with spaces to make compatible
+                       if (name.length() < 10) { while (name.length() < 10) {  name += " ";  } }
+                               
+                       outFile << name << '\t';        
+                       
+                       for(int j=0;j<alignDB.getNumSeqs();j++){
+                               
+                               if (m->control_pressed) { outFile.close(); return 0;  }
+                               
+                               distCalculator->calcDist(alignDB.get(i), alignDB.get(j));
+                               double dist = distCalculator->getDist();
+                               
+                               outFile << dist << '\t'; 
+                       }
+                       
+                       outFile << endl; 
+                       
+                       if(i % 100 == 0){
+                               m->mothurOut(toString(i) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine();
+                       }
+                       
+               }
+               m->mothurOut(toString(endLine-1) + "\t" + toString(time(NULL) - startTime)); m->mothurOutEndLine();
+               
+               outFile.close();
+               
+               return 1;
+       }
+       catch(exception& e) {
+               m->errorOut(e, "DistanceCommand", "driver");
+               exit(1);
+       }
+}
 #ifdef USE_MPI
 /**************************************************************************************************/
 /////// need to fix to work with calcs and sequencedb
@@ -466,16 +678,15 @@ int DistanceCommand::driverMPI(int startLine, int endLine, MPI_File& outMPI, flo
                                
                                if (m->control_pressed) {  return 0;  }
                                
+                               //if there was a column file given and we are appending, we don't want to calculate the distances that are already in the column file
+                               //the alignDB contains the new sequences and then the old, so if i an oldsequence and j is an old sequence then break out of this loop
+                               if ((i >= numNewFasta) && (j >= numNewFasta)) { break; }
+                               
                                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');
+                                        outputString += (alignDB.get(i).getName() + ' ' + alignDB.get(j).getName() + ' ' + toString(dist) + '\n'); 
                                }
                        }
                        
@@ -488,7 +699,7 @@ int DistanceCommand::driverMPI(int startLine, int endLine, MPI_File& outMPI, flo
                        //send results to parent
                        int length = outputString.length();
 
-                       char* buf = new char[length];\r
+                       char* buf = new char[length];
                        memcpy(buf, outputString.c_str(), length);
                        
                        MPI_File_write_shared(outMPI, buf, length, MPI_CHAR, &status);
@@ -508,34 +719,37 @@ int DistanceCommand::driverMPI(int startLine, int endLine, MPI_File& outMPI, flo
 }
 /**************************************************************************************************/
 /////// need to fix to work with calcs and sequencedb
-int DistanceCommand::driverMPI(int startLine, int endLine, string file, long& size){
+int DistanceCommand::driverMPI(int startLine, int endLine, string file, unsigned long int& size){
        try {
                MPI_Status status;
                
                MPI_File outMPI;
                int amode=MPI_MODE_CREATE|MPI_MODE_WRONLY; 
 
-               char* filename = new char[file.length()];\r
-               memcpy(filename, file.c_str(), file.length());
+               //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;
+               //delete filename;
 
                int startTime = time(NULL);
                
                string outputString = "";
                size = 0;
                
-               if((output == "lt") && startLine == 0){ outputString += toString(alignDB.getNumSeqs()) + "\n";  }
+               if(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";    
+                               
+                       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;  }
@@ -543,10 +757,10 @@ int DistanceCommand::driverMPI(int startLine, int endLine, string file, long& si
                                distCalculator->calcDist(alignDB.get(i), alignDB.get(j));
                                double dist = distCalculator->getDist();
                                
-                               if (output == "lt") {  outputString += toString(dist) + "\t"; }
+                               outputString += toString(dist) + "\t"; 
                        }
                        
-                       if (output == "lt") { outputString += "\n"; }
+                       outputString += "\n"; 
 
                
                        if(i % 100 == 0){
@@ -557,7 +771,7 @@ int DistanceCommand::driverMPI(int startLine, int endLine, string file, long& si
                        
                        //send results to parent
                        int length = outputString.length();
-                       char* buf = new char[length];\r
+                       char* buf = new char[length];
                        memcpy(buf, outputString.c_str(), length);
                        
                        MPI_File_write(outMPI, buf, length, MPI_CHAR, &status);
@@ -577,13 +791,87 @@ int DistanceCommand::driverMPI(int startLine, int endLine, string file, long& si
                exit(1);
        }
 }
-#endif
 /**************************************************************************************************/
+/////// need to fix to work with calcs and sequencedb
+int DistanceCommand::driverMPI(int startLine, int endLine, string file, unsigned long int& size, string square){
+       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(startLine == 0){     outputString += toString(alignDB.getNumSeqs()) + "\n";  }
+               
+               for(int i=startLine;i<endLine;i++){
+                               
+                       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<alignDB.getNumSeqs();j++){
+                               
+                               if (m->control_pressed) {  return 0;  }
+                               
+                               distCalculator->calcDist(alignDB.get(i), alignDB.get(j));
+                               double dist = distCalculator->getDist();
+                               
+                               outputString += toString(dist) + "\t"; 
+                       }
+                       
+                       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";
+               string outfile = m->getRootName(outputFile) + "sorted.dist.temp";
                
                //use the unix sort 
                #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
@@ -597,10 +885,10 @@ int DistanceCommand::convertMatrix(string outputFile) {
 
                //output to new file distance for each row and save positions in file where new row begins
                ifstream in;
-               openInputFile(outfile, in);
+               m->openInputFile(outfile, in);
                
                ofstream out;
-               openOutputFile(outputFile, out);
+               m->openOutputFile(outputFile, out);
                
                out.setf(ios::fixed, ios::floatfield); out.setf(ios::showpoint);
 
@@ -618,12 +906,12 @@ int DistanceCommand::convertMatrix(string outputFile) {
                rowDists[first] = 0.00; //distance to yourself is 0.0
                
                in.seekg(0);
-               //openInputFile(outfile, in);
+               //m->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);
+                       in >> first >> second >> dist; m->gobble(in);
                                
                        if (first != currentRow) {
                                //print out last row
@@ -666,12 +954,12 @@ int DistanceCommand::convertMatrix(string outputFile) {
                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";
+               string outfile = m->getRootName(outputFile) + "sorted.dist.temp";
                
                //use the unix sort 
                #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
@@ -685,10 +973,10 @@ int DistanceCommand::convertToLowerTriangle(string outputFile) {
 
                //output to new file distance for each row and save positions in file where new row begins
                ifstream in;
-               openInputFile(outfile, in);
+               m->openInputFile(outfile, in);
                
                ofstream out;
-               openOutputFile(outputFile, out);
+               m->openOutputFile(outputFile, out);
                
                out.setf(ios::fixed, ios::floatfield); out.setf(ios::showpoint);
 
@@ -708,12 +996,12 @@ int DistanceCommand::convertToLowerTriangle(string outputFile) {
                rowDists[first] = 0.00; //distance to yourself is 0.0
                
                in.seekg(0);
-               //openInputFile(outfile, in);
+               //m->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);
+                       in >> first >> second >> dist; m->gobble(in);
                                
                        if (first != currentRow) {
                                //print out last row
@@ -760,29 +1048,98 @@ int DistanceCommand::convertToLowerTriangle(string outputFile) {
                exit(1);
        }
 }
-/**************************************************************************************************
-void DistanceCommand::appendFiles(string temp, string filename) {
+/**************************************************************************************************/
+//its okay if the column file does not contain all the names in the fasta file, since some distance may have been above a cutoff,
+//but no sequences can be in the column file that are not in oldfasta. also, if a distance is above the cutoff given then remove it.
+//also check to make sure the 2 files have the same alignment length.
+bool DistanceCommand::sanityCheck() {
        try{
-               ofstream output;
-               ifstream input;
-       
-               //open output file in append mode
-               openOutputFileAppend(filename, output);
-               openInputFile(temp, input);
+               bool good = true;
+               
+               //make sure the 2 fasta files have the same alignment length
+               ifstream in;
+               m->openInputFile(fastafile, in);
+               int fastaAlignLength = 0;
+               if (in) { 
+                       Sequence tempIn(in);
+                       fastaAlignLength = tempIn.getAligned().length();
+               }
+               in.close();
+               
+               ifstream in2;
+               m->openInputFile(oldfastafile, in2);
+               int oldfastaAlignLength = 0;
+               if (in2) { 
+                       Sequence tempIn2(in2);
+                       oldfastaAlignLength = tempIn2.getAligned().length();
+               }
+               in2.close();
+               
+               if (fastaAlignLength != oldfastaAlignLength) { m->mothurOut("fasta files do not have the same alignment length."); m->mothurOutEndLine(); return false;  }
+               
+               //read fasta file and save names as well as adding them to the alignDB
+               set<string> namesOldFasta;
+               
+               ifstream inFasta;
+               m->openInputFile(oldfastafile, inFasta);
+               
+               while (!inFasta.eof()) {
+                       if (m->control_pressed) {  inFasta.close(); return good;  }
+               
+                       Sequence temp(inFasta);
+                       
+                       if (temp.getName() != "") {
+                               namesOldFasta.insert(temp.getName());  //save name
+                               alignDB.push_back(temp);  //add to DB
+                       }
+                       
+                       m->gobble(inFasta);
+               }
                
-               while(char c = input.get()){
-                       if(input.eof())         {       break;                  }
-                       else                            {       output << c;    }
+               inFasta.close();
+               
+               //read through the column file checking names and removing distances above the cutoff
+               ifstream inDist;
+               m->openInputFile(column, inDist);
+               
+               ofstream outDist;
+               string outputFile = column + ".temp";
+               m->openOutputFile(outputFile, outDist);
+               
+               string name1, name2;
+               float dist;
+               while (!inDist.eof()) {
+                       if (m->control_pressed) {  inDist.close(); outDist.close(); remove(outputFile.c_str()); return good;  }
+               
+                       inDist >> name1 >> name2 >> dist; m->gobble(inDist);
+                       
+                       //both names are in fasta file and distance is below cutoff
+                       if ((namesOldFasta.count(name1) == 0) || (namesOldFasta.count(name2) == 0)) {  good = false; break;  }
+                       else{
+                               if (dist <= cutoff) {
+                                       outDist << name1 << '\t' << name2 << '\t' << dist << endl;
+                               }
+                       }
+               }
+               
+               inDist.close();
+               outDist.close();
+               
+               if (good) {
+                       remove(column.c_str());
+                       rename(outputFile.c_str(), column.c_str());
+               }else{
+                       remove(outputFile.c_str()); //temp file is bad because file mismatch above
                }
                
-               input.close();
-               output.close();
        }
        catch(exception& e) {
-               m->errorOut(e, "DistanceCommand", "appendFiles");
+               m->errorOut(e, "DistanceCommand", "m->appendFiles");
                exit(1);
        }
 }
 /**************************************************************************************************/
 
 
+
+