]> git.donarmstrong.com Git - mothur.git/blobdiff - clustersplitcommand.cpp
update .gitignore
[mothur.git] / clustersplitcommand.cpp
index 09c2da84c64b2d0558ede1bf5bde35b1ddfc43cd..546d633d4fb9c4fa61460c5d8ac87814fce5f660 100644 (file)
 //**********************************************************************************************************************
 vector<string> ClusterSplitCommand::setParameters(){   
        try {
-               CommandParameter ptaxonomy("taxonomy", "InputTypes", "", "", "none", "none", "FastaTaxName",false,false); parameters.push_back(ptaxonomy);
-               CommandParameter pphylip("phylip", "InputTypes", "", "", "PhylipColumnFasta", "PhylipColumnFasta", "none",false,false); parameters.push_back(pphylip);
-               CommandParameter pfasta("fasta", "InputTypes", "", "", "PhylipColumnFasta", "PhylipColumnFasta", "FastaTaxName",false,false); parameters.push_back(pfasta);
-               CommandParameter pname("name", "InputTypes", "", "", "NameCount", "none", "ColumnName-FastaTaxName",false,false); parameters.push_back(pname);
-        CommandParameter pcount("count", "InputTypes", "", "", "NameCount", "none", "",false,false); parameters.push_back(pcount);
-               CommandParameter pcolumn("column", "InputTypes", "", "", "PhylipColumnFasta", "PhylipColumnFasta", "ColumnName",false,false); parameters.push_back(pcolumn);
-               CommandParameter ptaxlevel("taxlevel", "Number", "", "3", "", "", "",false,false); parameters.push_back(ptaxlevel);
-               CommandParameter psplitmethod("splitmethod", "Multiple", "classify-fasta-distance", "distance", "", "", "",false,false); parameters.push_back(psplitmethod);
-               CommandParameter plarge("large", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(plarge);
-               CommandParameter pshowabund("showabund", "Boolean", "", "T", "", "", "",false,false); parameters.push_back(pshowabund);
-               CommandParameter ptiming("timing", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(ptiming);
-               CommandParameter pprocessors("processors", "Number", "", "1", "", "", "",false,false); parameters.push_back(pprocessors);
-               CommandParameter pcutoff("cutoff", "Number", "", "0.25", "", "", "",false,false); parameters.push_back(pcutoff);
-               CommandParameter pprecision("precision", "Number", "", "100", "", "", "",false,false); parameters.push_back(pprecision);
-               CommandParameter pmethod("method", "Multiple", "furthest-nearest-average-weighted", "average", "", "", "",false,false); parameters.push_back(pmethod);
-               CommandParameter phard("hard", "Boolean", "", "T", "", "", "",false,false); parameters.push_back(phard);
-        CommandParameter pclassic("classic", "Boolean", "", "F", "", "", "",false,false); parameters.push_back(pclassic);
-               CommandParameter pinputdir("inputdir", "String", "", "", "", "", "",false,false); parameters.push_back(pinputdir);
-               CommandParameter poutputdir("outputdir", "String", "", "", "", "", "",false,false); parameters.push_back(poutputdir);
+        CommandParameter pfile("file", "InputTypes", "", "", "PhylipColumnFasta", "PhylipColumnFasta", "none","",false,false,true); parameters.push_back(pfile);
+               CommandParameter ptaxonomy("taxonomy", "InputTypes", "", "", "none", "none", "FastaTaxName","",false,false,true); parameters.push_back(ptaxonomy);
+               CommandParameter pphylip("phylip", "InputTypes", "", "", "PhylipColumnFasta", "PhylipColumnFasta", "none","list",false,false,true); parameters.push_back(pphylip);
+               CommandParameter pfasta("fasta", "InputTypes", "", "", "PhylipColumnFasta", "PhylipColumnFasta", "FastaTaxName","list",false,false,true); parameters.push_back(pfasta);
+               CommandParameter pname("name", "InputTypes", "", "", "NameCount", "none", "ColumnName-FastaTaxName","rabund-sabund",false,false,true); parameters.push_back(pname);
+        CommandParameter pcount("count", "InputTypes", "", "", "NameCount", "none", "","",false,false,true); parameters.push_back(pcount);
+               CommandParameter pcolumn("column", "InputTypes", "", "", "PhylipColumnFasta", "PhylipColumnFasta", "ColumnName","list",false,false,true); parameters.push_back(pcolumn);
+               CommandParameter ptaxlevel("taxlevel", "Number", "", "3", "", "", "","",false,false,true); parameters.push_back(ptaxlevel);
+               CommandParameter psplitmethod("splitmethod", "Multiple", "classify-fasta-distance", "distance", "", "", "","",false,false,true); parameters.push_back(psplitmethod);
+               CommandParameter plarge("large", "Boolean", "", "F", "", "", "","",false,false); parameters.push_back(plarge);
+               CommandParameter pshowabund("showabund", "Boolean", "", "T", "", "", "","",false,false); parameters.push_back(pshowabund);
+        CommandParameter pcluster("cluster", "Boolean", "", "T", "", "", "","",false,false); parameters.push_back(pcluster);
+               CommandParameter ptiming("timing", "Boolean", "", "F", "", "", "","",false,false); parameters.push_back(ptiming);
+               CommandParameter pprocessors("processors", "Number", "", "1", "", "", "","",false,false,true); parameters.push_back(pprocessors);
+               CommandParameter pcutoff("cutoff", "Number", "", "0.25", "", "", "","",false,false,true); parameters.push_back(pcutoff);
+               CommandParameter pprecision("precision", "Number", "", "100", "", "", "","",false,false); parameters.push_back(pprecision);
+               CommandParameter pmethod("method", "Multiple", "furthest-nearest-average-weighted", "average", "", "", "","",false,false); parameters.push_back(pmethod);
+               CommandParameter phard("hard", "Boolean", "", "T", "", "", "","",false,false); parameters.push_back(phard);
+        CommandParameter pclassic("classic", "Boolean", "", "F", "", "", "","",false,false); parameters.push_back(pclassic);
+               CommandParameter pinputdir("inputdir", "String", "", "", "", "", "","",false,false); parameters.push_back(pinputdir);
+               CommandParameter poutputdir("outputdir", "String", "", "", "", "", "","",false,false); parameters.push_back(poutputdir);
                        
                vector<string> myArray;
                for (int i = 0; i < parameters.size(); i++) {   myArray.push_back(parameters[i].name);          }
@@ -46,20 +48,22 @@ vector<string> ClusterSplitCommand::setParameters(){
 string ClusterSplitCommand::getHelpString(){   
        try {
                string helpString = "";
-               helpString += "The cluster.split command parameter options are fasta, phylip, column, name, count, cutoff, precision, method, splitmethod, taxonomy, taxlevel, showabund, timing, hard, large, processors. Fasta or Phylip or column and name are required.\n";
+               helpString += "The cluster.split command parameter options are file, fasta, phylip, column, name, count, cutoff, precision, method, splitmethod, taxonomy, taxlevel, showabund, timing, hard, large, cluster, processors. Fasta or Phylip or column and name are required.\n";
                helpString += "The cluster.split command can split your files in 3 ways. Splitting by distance file, by classification, or by classification also using a fasta file. \n";
                helpString += "For the distance file method, you need only provide your distance file and mothur will split the file into distinct groups. \n";
                helpString += "For the classification method, you need to provide your distance file and taxonomy file, and set the splitmethod to classify.  \n";
                helpString += "You will also need to set the taxlevel you want to split by. mothur will split the sequences into distinct taxonomy groups, and split the distance file based on those groups. \n";
                helpString += "For the classification method using a fasta file, you need to provide your fasta file, names file and taxonomy file.  \n";
                helpString += "You will also need to set the taxlevel you want to split by. mothur will split the sequence into distinct taxonomy groups, and create distance files for each grouping. \n";
+        helpString += "The file option allows you to enter your file containing your list of column and names/count files as well as the singleton file.  This file is mothur generated, when you run cluster.split() with the cluster=f parameter.  This can be helpful when you have a large dataset that you may be able to use all your processors for the splitting step, but have to reduce them for the cluster step due to RAM constraints. For example: cluster.split(fasta=yourFasta, taxonomy=yourTax, count=yourCount, taxlevel=3, cluster=f, processors=8) then cluster.split(file=yourFile, processors=4).  This allows your to maximize your processors during the splitting step.  Also, if you are unsure if the cluster step will have RAM issue with multiple processors, you can avoid running the first part of the command multiple times.\n";
                helpString += "The phylip and column parameter allow you to enter your distance file. \n";
                helpString += "The fasta parameter allows you to enter your aligned fasta file. \n";
                helpString += "The name parameter allows you to enter your name file. \n";
         helpString += "The count parameter allows you to enter your count file. \n A count or name file is required if your distance file is in column format";
+        helpString += "The cluster parameter allows you to indicate whether you want to run the clustering or just split the distance matrix, default=t";
                helpString += "The cutoff parameter allow you to set the distance you want to cluster to, default is 0.25. \n";
                helpString += "The precision parameter allows you specify the precision of the precision of the distances outputted, default=100, meaning 2 decimal places. \n";
-               helpString += "The method allows you to specify what clustering algorythm you want to use, default=average, option furthest, nearest, or average. \n";
+               helpString += "The method allows you to specify what clustering algorithm you want to use, default=average, option furthest, nearest, or average. \n";
                helpString += "The splitmethod parameter allows you to specify how you want to split your distance file before you cluster, default=distance, options distance, classify or fasta. \n";
                helpString += "The taxonomy parameter allows you to enter the taxonomy file for your sequences, this is only valid if you are using splitmethod=classify. Be sure your taxonomy file does not include the probability scores. \n";
                helpString += "The taxlevel parameter allows you to specify the taxonomy level you want to use to split the distance file, default=3, meaning use the first taxon in each list. \n";
@@ -79,27 +83,23 @@ string ClusterSplitCommand::getHelpString(){
        }
 }
 //**********************************************************************************************************************
-string ClusterSplitCommand::getOutputFileNameTag(string type, string inputName=""){    
-       try {
-        string outputFileName = "";
-               map<string, vector<string> >::iterator it;
+string ClusterSplitCommand::getOutputPattern(string type) {
+    try {
+        string pattern = "";
         
-        //is this a type this command creates
-        it = outputTypes.find(type);
-        if (it == outputTypes.end()) {  m->mothurOut("[ERROR]: this command doesn't create a " + type + " output file.\n"); }
-        else {
-            if (type == "list") {  outputFileName =  "list"; }
-            else if (type == "rabund") {  outputFileName =  "rabund"; }
-            else if (type == "sabund") {  outputFileName =  "sabund"; }
-            else if (type == "column") {  outputFileName =  "dist"; }
-            else { m->mothurOut("[ERROR]: No definition for type " + type + " output file tag.\n"); m->control_pressed = true;  }
-        }
-        return outputFileName;
-       }
-       catch(exception& e) {
-               m->errorOut(e, "ClusterSplitCommand", "getOutputFileNameTag");
-               exit(1);
-       }
+        if (type == "list") {  pattern = "[filename],[clustertag],list-[filename],[clustertag],[tag2],list"; } 
+        else if (type == "rabund") {  pattern = "[filename],[clustertag],rabund"; } 
+        else if (type == "sabund") {  pattern = "[filename],[clustertag],sabund"; }
+        else if (type == "column") {  pattern = "[filename],dist"; }
+        else if (type == "file")   {  pattern = "[filename],file"; }
+        else { m->mothurOut("[ERROR]: No definition for type " + type + " output pattern.\n"); m->control_pressed = true;  }
+        
+        return pattern;
+    }
+    catch(exception& e) {
+        m->errorOut(e, "ClusterSplitCommand", "getOutputPattern");
+        exit(1);
+    }
 }
 //**********************************************************************************************************************
 ClusterSplitCommand::ClusterSplitCommand(){    
@@ -111,6 +111,7 @@ ClusterSplitCommand::ClusterSplitCommand(){
                outputTypes["rabund"] = tempOutNames;
                outputTypes["sabund"] = tempOutNames;
                outputTypes["column"] = tempOutNames;
+        outputTypes["file"] = tempOutNames;
        }
        catch(exception& e) {
                m->errorOut(e, "ClusterSplitCommand", "ClusterSplitCommand");
@@ -150,6 +151,7 @@ ClusterSplitCommand::ClusterSplitCommand(string option)  {
                        outputTypes["rabund"] = tempOutNames;
                        outputTypes["sabund"] = tempOutNames;
                        outputTypes["column"] = tempOutNames;
+            outputTypes["file"] = tempOutNames;
                        
                        //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 = "";         }
@@ -206,12 +208,25 @@ ClusterSplitCommand::ClusterSplitCommand(string option)  {
                                        //if the user has not given a path then, add inputdir. else leave path alone.
                                        if (path == "") {       parameters["count"] = inputDir + it->second;            }
                                }
+                
+                it = parameters.find("file");
+                               //user has given a template file
+                               if(it != parameters.end()){
+                                       path = m->hasPath(it->second);
+                                       //if the user has not given a path then, add inputdir. else leave path alone.
+                                       if (path == "") {       parameters["file"] = inputDir + it->second;             }
+                               }
                        }
                        
                        //check for required parameters
-                       phylipfile = validParameter.validFile(parameters, "phylip", true);
+                       file = validParameter.validFile(parameters, "file", true);
+                       if (file == "not open") { file = ""; abort = true; }
+                       else if (file == "not found") { file = ""; }
+            else { distfile = file; }
+            
+            phylipfile = validParameter.validFile(parameters, "phylip", true);
                        if (phylipfile == "not open") { abort = true; }
-                       else if (phylipfile == "not found") { phylipfile = ""; }        
+                       else if (phylipfile == "not found") { phylipfile = ""; }
                        else {  distfile = phylipfile;  format = "phylip";      m->setPhylipFile(phylipfile); }
                        
                        columnfile = validParameter.validFile(parameters, "column", true);
@@ -239,7 +254,7 @@ ClusterSplitCommand::ClusterSplitCommand(string option)  {
                        else if (taxFile == "not found") { taxFile = ""; }
                        else {  m->setTaxonomyFile(taxFile); if (splitmethod != "fasta") { splitmethod = "classify"; } }
                        
-                       if ((phylipfile == "") && (columnfile == "") && (fastafile == "")) { 
+                       if ((phylipfile == "") && (columnfile == "") && (fastafile == "") && (file == "")) {
                                //is there are current file available for either of these?
                                //give priority to column, then phylip, then fasta
                                columnfile = m->getColumnFile(); 
@@ -251,13 +266,13 @@ ClusterSplitCommand::ClusterSplitCommand(string option)  {
                                                fastafile = m->getFastaFile(); 
                                                if (fastafile != "") {  m->mothurOut("Using " + fastafile + " as input file for the fasta parameter."); m->mothurOutEndLine(); }
                                                else { 
-                                                       m->mothurOut("No valid current files. When executing a cluster.split command you must enter a phylip or a column or fastafile."); m->mothurOutEndLine(); 
+                                                       m->mothurOut("No valid current files. When executing a cluster.split command you must enter a file, phylip or a column or fastafile."); m->mothurOutEndLine();
                                                        abort = true; 
                                                }
                                        }
                                }
                        }
-                       else if ((phylipfile != "") && (columnfile != "") && (fastafile != "")) { m->mothurOut("When executing a cluster.split command you must enter ONLY ONE of the following: fasta, phylip or column."); m->mothurOutEndLine(); abort = true; }
+                       else if ((phylipfile != "") && (columnfile != "") && (fastafile != "") && (file != "")) { m->mothurOut("When executing a cluster.split command you must enter ONLY ONE of the following: file, fasta, phylip or column."); m->mothurOutEndLine(); abort = true; }
             
             if ((countfile != "") && (namefile != "")) { m->mothurOut("When executing a cluster.split command you must enter ONLY ONE of the following: count or name."); m->mothurOutEndLine(); abort = true; }
             
@@ -350,6 +365,9 @@ ClusterSplitCommand::ClusterSplitCommand(string option)  {
 
                        showabund = validParameter.validFile(parameters, "showabund", false);
                        if (showabund == "not found") { showabund = "T"; }
+            
+            temp = validParameter.validFile(parameters, "cluster", false);  if (temp == "not found") { temp = "T"; }
+            runCluster = m->isTrue(temp);
 
                        timing = validParameter.validFile(parameters, "timing", false);
                        if (timing == "not found") { timing = "F"; }
@@ -368,86 +386,104 @@ int ClusterSplitCommand::execute(){
        try {
        
                if (abort == true) { if (calledHelp) { return 0; }  return 2;   }
-               
-               time_t estart;
-               vector<string> listFileNames;
-               set<string> labels;
-               string singletonName = "";
-               double saveCutoff = cutoff;
+        
+        time_t estart;
+        vector<string> listFileNames;
+        vector< map<string, string> > distName;
+        set<string> labels;
+        string singletonName = "";
+        
+        double saveCutoff = cutoff;
 
-               //****************** file prep work ******************************//
-               #ifdef USE_MPI
+        if (file != "") {  deleteFiles = false; estart = time(NULL); singletonName = readFile(distName); }
+        else {
+                         
+            //****************** file prep work ******************************//
+#ifdef USE_MPI
                        int pid;
                        int tag = 2001;
-                       MPI_Status status; 
+                       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 (pid == 0) { //only process 0 converts and splits
-                       
-               #endif
-               
-               //if user gave a phylip file convert to column file
-               if (format == "phylip") {
-                       estart = time(NULL);
-                       m->mothurOut("Converting to column format..."); m->mothurOutEndLine();
-                       
-                       ReadCluster* convert = new ReadCluster(distfile, cutoff, outputDir, false);
-                       
-                       NameAssignment* nameMap = NULL;
-                       convert->setFormat("phylip");
-                       convert->read(nameMap);
-                       
-                       if (m->control_pressed) {  delete convert;  return 0;  }
-                       
-                       distfile = convert->getOutputFile();
-               
-                       //if no names file given with phylip file, create it
-                       ListVector* listToMakeNameFile =  convert->getListVector();
-                       if ((namefile == "") && (countfile == "")) {  //you need to make a namefile for split matrix
-                               ofstream out;
-                               namefile = phylipfile + ".names";
-                               m->openOutputFile(namefile, out);
-                               for (int i = 0; i < listToMakeNameFile->getNumBins(); i++) {
-                                       string bin = listToMakeNameFile->get(i);
-                                       out << bin << '\t' << bin << endl;
-                               }
-                               out.close();
-                       }
-                       delete listToMakeNameFile;
-                       delete convert;
-                       
-                       m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to convert the distance file."); m->mothurOutEndLine();
-               }
-               if (m->control_pressed) { return 0; }
-               
-               estart = time(NULL);
-               m->mothurOut("Splitting the file..."); m->mothurOutEndLine();
-               
-               //split matrix into non-overlapping groups
-               SplitMatrix* split;
-               if (splitmethod == "distance")                  {       split = new SplitMatrix(distfile, namefile, countfile, taxFile, cutoff, splitmethod, large);                                                    }
-               else if (splitmethod == "classify")             {       split = new SplitMatrix(distfile, namefile, countfile, taxFile, taxLevelCutoff, splitmethod, large);                                    }
-               else if (splitmethod == "fasta")                {       split = new SplitMatrix(fastafile, namefile, countfile, taxFile, taxLevelCutoff, cutoff, splitmethod, processors, classic, outputDir);  }
-               else { m->mothurOut("Not a valid splitting method.  Valid splitting algorithms are distance, classify or fasta."); m->mothurOutEndLine(); return 0;             }
-               
-               split->split();
-               
-               if (m->control_pressed) { delete split; return 0; }
-               
-               singletonName = split->getSingletonNames();
-               vector< map<string, string> > distName = split->getDistanceFiles();  //returns map of distance files -> namefile sorted by distance file size
-               delete split;
-               
-               //output a merged distance file
-               if (splitmethod == "fasta")             { createMergedDistanceFile(distName); }
-                       
+                
+#endif
+                
+                //if user gave a phylip file convert to column file
+                if (format == "phylip") {
+                    estart = time(NULL);
+                    m->mothurOut("Converting to column format..."); m->mothurOutEndLine();
+                    
+                    ReadCluster* convert = new ReadCluster(distfile, cutoff, outputDir, false);
+                    
+                    NameAssignment* nameMap = NULL;
+                    convert->setFormat("phylip");
+                    convert->read(nameMap);
+                    
+                    if (m->control_pressed) {  delete convert;  return 0;  }
+                    
+                    distfile = convert->getOutputFile();
+                    
+                    //if no names file given with phylip file, create it
+                    ListVector* listToMakeNameFile =  convert->getListVector();
+                    if ((namefile == "") && (countfile == "")) {  //you need to make a namefile for split matrix
+                        ofstream out;
+                        namefile = phylipfile + ".names";
+                        m->openOutputFile(namefile, out);
+                        for (int i = 0; i < listToMakeNameFile->getNumBins(); i++) {
+                            string bin = listToMakeNameFile->get(i);
+                            out << bin << '\t' << bin << endl;
+                        }
+                        out.close();
+                    }
+                    delete listToMakeNameFile;
+                    delete convert;
+                    
+                    m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to convert the distance file."); m->mothurOutEndLine();
+                }
+                if (m->control_pressed) { return 0; }
+                
+                estart = time(NULL);
+                m->mothurOut("Splitting the file..."); m->mothurOutEndLine();
+                
+                //split matrix into non-overlapping groups
+                SplitMatrix* split;
+                if (splitmethod == "distance")                 {       split = new SplitMatrix(distfile, namefile, countfile, taxFile, cutoff, splitmethod, large);                                                    }
+                else if (splitmethod == "classify")            {       split = new SplitMatrix(distfile, namefile, countfile, taxFile, taxLevelCutoff, splitmethod, large);                                    }
+                else if (splitmethod == "fasta")               {       split = new SplitMatrix(fastafile, namefile, countfile, taxFile, taxLevelCutoff, cutoff, splitmethod, processors, classic, outputDir);  }
+                else { m->mothurOut("Not a valid splitting method.  Valid splitting algorithms are distance, classify or fasta."); m->mothurOutEndLine(); return 0;            }
+                
+                split->split();
+                
+                if (m->control_pressed) { delete split; return 0; }
+                
+                singletonName = split->getSingletonNames();
+                distName = split->getDistanceFiles();  //returns map of distance files -> namefile sorted by distance file size
+                delete split;
+                
+                if (m->debug) { m->mothurOut("[DEBUG]: distName.size() = " + toString(distName.size()) + ".\n"); }
+                
+                //output a merged distance file
+                //if (splitmethod == "fasta")          { createMergedDistanceFile(distName); }
                                
-               if (m->control_pressed) { return 0; }
-               
-               m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to split the distance file."); m->mothurOutEndLine();
-               estart = time(NULL);
-               
+                if (m->control_pressed) { return 0; }
+                
+                m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to split the distance file."); m->mothurOutEndLine();
+                estart = time(NULL);
+                
+                if (!runCluster) { 
+                    printFile(singletonName, distName);
+                    
+                    m->mothurOutEndLine();
+                    m->mothurOut("Output File Names: "); m->mothurOutEndLine();
+                    for (int i = 0; i < distName.size(); i++) {        m->mothurOut(distName[i].begin()->first); m->mothurOutEndLine(); m->mothurOut(distName[i].begin()->second); m->mothurOutEndLine();      }
+                    m->mothurOutEndLine();
+                    return 0;
+                    
+                }
+                deleteFiles = true;
+            }
                //****************** break up files between processes and cluster each file set ******************************//
        #ifdef USE_MPI
                        ////you are process 0 from above////
@@ -640,6 +676,9 @@ int ClusterSplitCommand::execute(){
                mergeLists(listFileNames, labelBins, listSingle);
 
                if (m->control_pressed) { for (int i = 0; i < outputNames.size(); i++) { m->mothurRemove(outputNames[i]); } return 0; }
+        
+        //delete after all are complete incase a crash happens
+        if (!deleteFiles) { for (int i = 0; i < distName.size(); i++) {        m->mothurRemove(distName[i].begin()->first); m->mothurRemove(distName[i].begin()->second);      } }
                
                m->mothurOut("It took " + toString(time(NULL) - estart) + " seconds to merge."); m->mothurOutEndLine();
                
@@ -804,11 +843,13 @@ int ClusterSplitCommand::mergeLists(vector<string> listNames, map<float, int> us
                if (outputDir == "") { outputDir += m->hasPath(distfile); }
                fileroot = outputDir + m->getRootName(m->getSimpleName(distfile));
                
-        string sabundFileName = fileroot+ tag + "." + getOutputFileNameTag("sabund");
-        string rabundFileName = fileroot+ tag + "." + getOutputFileNameTag("rabund");
-        string listFileName = fileroot+ tag + ".";
-        if (countfile != "") { listFileName += "unique_"; }
-        listFileName += getOutputFileNameTag("list");
+        map<string, string> variables; 
+        variables["[filename]"] = fileroot;
+        variables["[clustertag]"] = tag;
+        string sabundFileName = getOutputFileName("sabund", variables);
+        string rabundFileName = getOutputFileName("rabund", variables);
+        if (countfile != "") { variables["[tag2]"] = "unique_list"; }
+        string listFileName = getOutputFileName("list", variables);
         
         if (countfile == "") {
             m->openOutputFile(sabundFileName,  outSabund);
@@ -820,8 +861,10 @@ int ClusterSplitCommand::mergeLists(vector<string> listNames, map<float, int> us
                m->openOutputFile(listFileName, outList);
         outputNames.push_back(listFileName); outputTypes["list"].push_back(listFileName);
                
-               
                map<float, int>::iterator itLabel;
+        
+        //clears out junk for autocompleting of list files above.  Perhaps there is a beter way to handle this from within the data structure?
+        m->printedListHeaders = false;
 
                //for each label needed
                for(itLabel = userLabels.begin(); itLabel != userLabels.end(); itLabel++) {
@@ -830,9 +873,12 @@ int ClusterSplitCommand::mergeLists(vector<string> listNames, map<float, int> us
                        if (itLabel->first == -1) { thisLabel = "unique"; }
                        else { thisLabel = toString(itLabel->first,  length-1);  } 
                        
-                       outList << thisLabel << '\t' << itLabel->second << '\t';
+                       //outList << thisLabel << '\t' << itLabel->second << '\t';
             
             RAbundVector* rabund = NULL;
+            ListVector completeList;
+            completeList.setLabel(thisLabel);
+            
             if (countfile == "") {
                 rabund = new RAbundVector();
                 rabund->setLabel(thisLabel);
@@ -841,7 +887,8 @@ int ClusterSplitCommand::mergeLists(vector<string> listNames, map<float, int> us
                        //add in singletons
                        if (listSingle != NULL) {
                                for (int j = 0; j < listSingle->getNumBins(); j++) {
-                                       outList << listSingle->get(j) << '\t';
+                                       //outList << listSingle->get(j) << '\t';
+                    completeList.push_back(listSingle->get(j));
                                        if (countfile == "") { rabund->push_back(m->getNumNames(listSingle->get(j))); }
                                }
                        }
@@ -858,7 +905,8 @@ int ClusterSplitCommand::mergeLists(vector<string> listNames, map<float, int> us
                                if (list == NULL) { m->mothurOut("Error merging listvectors in file " + listNames[k]); m->mothurOutEndLine();  }        
                                else {          
                                        for (int j = 0; j < list->getNumBins(); j++) {
-                                               outList << list->get(j) << '\t';
+                                               //outList << list->get(j) << '\t';
+                        completeList.push_back(list->get(j));
                                                if (countfile == "") { rabund->push_back(m->getNumNames(list->get(j))); }
                                        }
                                        delete list;
@@ -871,7 +919,10 @@ int ClusterSplitCommand::mergeLists(vector<string> listNames, map<float, int> us
                 sabund.print(outSabund);
                 rabund->print(outRabund);
             }
-                       outList << endl;
+                       //outList << endl;
+            if (!m->printedListHeaders) { 
+                m->listBinLabelsInFile.clear(); completeList.printHeaders(outList); }
+            completeList.print(outList);
                        
                        if (rabund != NULL) { delete rabund; }
                }
@@ -933,7 +984,7 @@ vector<string>  ClusterSplitCommand::createProcesses(vector< map<string, string>
             if ((processToAssign-1) == 1) { m->mothurOut(distName[i].begin()->first + "\n"); }
         }
         
-        //not lets reverse the order of ever other process, so we balance big files running with little ones
+        //now lets reverse the order of ever other process, so we balance big files running with little ones
         for (int i = 0; i < processors; i++) {
             //cout << i << endl;
             int remainder = ((i+1) % processors);
@@ -948,7 +999,7 @@ vector<string>  ClusterSplitCommand::createProcesses(vector< map<string, string>
                
                //loop through and create all the processes you want
                while (process != processors) {
-                       int pid = fork();
+                       pid_t pid = fork();
                        
                        if (pid > 0) {
                                processIDS.push_back(pid);  //create map from line number to pid so you can append files in correct order later
@@ -958,7 +1009,7 @@ vector<string>  ClusterSplitCommand::createProcesses(vector< map<string, string>
                                vector<string> listFileNames = cluster(dividedNames[process], labels);
                                
                                //write out names to file
-                               string filename = toString(getpid()) + ".temp";
+                               string filename = m->mothurGetpid(process) + ".temp";
                                ofstream out;
                                m->openOutputFile(filename, out);
                                out << tag << endl;
@@ -967,7 +1018,7 @@ vector<string>  ClusterSplitCommand::createProcesses(vector< map<string, string>
                                
                                //print out labels
                                ofstream outLabels;
-                               filename = toString(getpid()) + ".temp.labels";
+                               filename = m->mothurGetpid(process) + ".temp.labels";
                                m->openOutputFile(filename, outLabels);
                                
                                outLabels << cutoff << endl;
@@ -1155,7 +1206,7 @@ string ClusterSplitCommand::clusterClassicFile(string thisDistFile, string thisN
             cluster->readPhylipFile(thisDistFile, nameMap);
                }else if (countfile != "") {
             ct = new CountTable();
-            ct->readTable(thisNamefile);
+            ct->readTable(thisNamefile, false, false);
             cluster->readPhylipFile(thisDistFile, ct);
         }
         tag = cluster->getTag();
@@ -1235,9 +1286,10 @@ string ClusterSplitCommand::clusterClassicFile(string thisDistFile, string thisN
         if(namefile != ""){    delete nameMap; }
         else { delete ct; }
         
-        m->mothurRemove(thisDistFile);
-        m->mothurRemove(thisNamefile);
-        
+        if (deleteFiles) {
+            m->mothurRemove(thisDistFile);
+            m->mothurRemove(thisNamefile);
+        }
         return listFileName;
         
        }
@@ -1283,7 +1335,7 @@ string ClusterSplitCommand::clusterFile(string thisDistFile, string thisNamefile
             read->read(nameMap);
                }else if (countfile != "") {
             ct = new CountTable();
-            ct->readTable(thisNamefile);
+            ct->readTable(thisNamefile, false, false);
             read->read(ct);
         }else { read->read(nameMap); }
                
@@ -1311,9 +1363,10 @@ string ClusterSplitCommand::clusterFile(string thisDistFile, string thisNamefile
         m->mothurOutEndLine(); m->mothurOut("Clustering " + thisDistFile); m->mothurOutEndLine();
                
         //create cluster
-        if (method == "furthest")      {       cluster = new CompleteLinkage(rabund, list, matrix, cutoff, method); }
-        else if(method == "nearest"){  cluster = new SingleLinkage(rabund, list, matrix, cutoff, method); }
-        else if(method == "average"){  cluster = new AverageLinkage(rabund, list, matrix, cutoff, method);     }
+        float adjust = -1.0;
+        if (method == "furthest")      {       cluster = new CompleteLinkage(rabund, list, matrix, cutoff, method, adjust); }
+        else if(method == "nearest"){  cluster = new SingleLinkage(rabund, list, matrix, cutoff, method, adjust); }
+        else if(method == "average"){  cluster = new AverageLinkage(rabund, list, matrix, cutoff, method, adjust);     }
         tag = cluster->getTag();
                
         if (outputDir == "") { outputDir += m->hasPath(thisDistFile); }
@@ -1389,8 +1442,10 @@ string ClusterSplitCommand::clusterFile(string thisDistFile, string thisNamefile
             return listFileName;
         }
         
-        m->mothurRemove(thisDistFile);
-        m->mothurRemove(thisNamefile);
+        if (deleteFiles) {
+            m->mothurRemove(thisDistFile);
+            m->mothurRemove(thisNamefile);
+        }
         
         if (saveCutoff != cutoff) { 
             if (hard)  {  saveCutoff = m->ceilDist(saveCutoff, precision);     }
@@ -1423,7 +1478,9 @@ int ClusterSplitCommand::createMergedDistanceFile(vector< map<string, string> >
                
                string thisOutputDir = outputDir;
                if (outputDir == "") { thisOutputDir = m->hasPath(fastafile); }
-               string outputFileName = thisOutputDir + m->getRootName(m->getSimpleName(fastafile)) + getOutputFileNameTag("column");
+        map<string, string> variables; 
+        variables["[filename]"] = thisOutputDir + m->getRootName(m->getSimpleName(fastafile));
+               string outputFileName = getOutputFileName("column", variables);
                m->mothurRemove(outputFileName);
                
                
@@ -1472,3 +1529,66 @@ int ClusterSplitCommand::createRabund(CountTable*& ct, ListVector*& list, RAbund
     
 }
 //**********************************************************************************************************************
+int ClusterSplitCommand::printFile(string singleton, vector< map<string, string> >& distName){
+    try {
+        ofstream out;
+        map<string, string> variables;
+        string thisOutputDir = outputDir;
+               if (outputDir == "") { thisOutputDir = m->hasPath(distfile); }
+        variables["[filename]"] = thisOutputDir + m->getRootName(m->getSimpleName(distfile));
+               string outputFileName = getOutputFileName("file", variables);
+        m->openOutputFile(outputFileName, out);
+        
+        out << singleton << endl;
+        if (namefile != "") { out << "name" << endl; }
+        else if (countfile != "") { out << "count" << endl; }
+        else { out << "unknown" << endl; }
+        
+        for (int i = 0; i < distName.size(); i++) {    out << distName[i].begin()->first << '\t' << distName[i].begin()->second << endl;       }
+        out.close();
+        
+        return 0;
+    }
+    catch(exception& e) {
+               m->errorOut(e, "ClusterCommand", "printFile");
+               exit(1);
+       }
+    
+}
+//**********************************************************************************************************************
+string ClusterSplitCommand::readFile(vector< map<string, string> >& distName){
+    try {
+        string singleton, thiscolumn, thisname, type;
+        
+        ifstream in;
+        m->openInputFile(file, in);
+        
+        in >> singleton; m->gobble(in);
+        in >> type; m->gobble(in);
+        
+        if (type == "name") { namefile = "name"; }
+        else if (type == "count") { countfile = "count"; }
+        else {  m->mothurOut("[ERROR]: unknown file type. Are the files in column 2 of the file name files or count files? Please change unknown to name or count.\n"); m->control_pressed = true; }
+        
+        
+        while(!in.eof()) {
+            if (m->control_pressed) { break; }
+            
+            in >> thiscolumn; m->gobble(in);
+            in >> thisname; m->gobble(in);
+            
+            map<string, string> temp;
+            temp[thiscolumn] = thisname;
+            distName.push_back(temp);
+        }
+        in.close();
+        
+        return singleton;
+    }
+    catch(exception& e) {
+               m->errorOut(e, "ClusterCommand", "readFile");
+               exit(1);
+       }
+    
+}
+//**********************************************************************************************************************