]> git.donarmstrong.com Git - mothur.git/blobdiff - globaldata.cpp
This contains Pat's bug fixes and updates. It represents mothur v.1.3.0
[mothur.git] / globaldata.cpp
index d4eb9980c9051919eecb25e18a0c7b685dae65a1..1be2c6edb082e8c700f2165349590ed653154eaa 100644 (file)
@@ -1,20 +1,6 @@
-#include <iostream>
-#include <iomanip>
-#include <string>
-#include <map>
-#include <sstream>
-#include <stdexcept>
-
-using namespace std;
-
 #include "globaldata.hpp"
-#include "sparsematrix.hpp"
 #include "tree.h"
-#include "rabundvector.hpp"
-#include "sabundvector.hpp"
-#include "listvector.hpp"
-#include <exception>
-#include <iostream>
+#include "sparsematrix.hpp"
 
 /*******************************************************/
 
@@ -27,62 +13,23 @@ GlobalData* GlobalData::getInstance() {
 }
 /*******************************************************/
 
-/******************************************************/
-
-ListVector* GlobalData::getListVector()                {       return gListVector;             }
-/*******************************************************/
-
-/******************************************************/
-void GlobalData::setListVector(ListVector* lv){
-       try {
-               if(gListVector != NULL){        delete gListVector;     }
-               gListVector = new ListVector(*lv);
-       }
-       catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function setListVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the GlobalData class function setListVector. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-}
-
-/*******************************************************/
-
-/******************************************************/
-
-SparseMatrix* GlobalData::getSparseMatrix()    {       return gSparseMatrix;   }
-/*******************************************************/
-
-/******************************************************/
-void GlobalData::setSparseMatrix(SparseMatrix* sm){
-       try{
-               if(gSparseMatrix != NULL){      delete gSparseMatrix;   }
-               gSparseMatrix = new SparseMatrix(*sm);
-       }
-       catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function setSparseMatrix. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the GlobalData class function setSparseMatrix. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-
-}
-/*******************************************************/
-
 /******************************************************/
 //This function parses through the option string of the command to remove its parameters
 void GlobalData::parseGlobalData(string commandString, string optionText){
        try {
-               allLines = 1;
                commandName = commandString; //save command name to be used by other classes
                
+               //set all non filename paramters to default
+               reset();
+               
                //clears out data from previous read
                if ((commandName == "read.dist") || (commandName == "read.otu") || (commandName == "read.tree")) { 
                        clear();
+                       gGroupmap = NULL;
+                       gTree.clear();
+                       Treenames.clear();
+                       labels.clear(); lines.clear(); Groups.clear();
+                       allLines = 1;
                }
                
                //saves help request
@@ -90,6 +37,14 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                        helpRequest = optionText;
                }
                
+               if (commandName == "libshuff") {
+                       iters = "10000";
+                       cutoff = "1.0";
+               }
+               
+               //set default value for cutoff
+               if (commandName == "dist.seqs") {       cutoff = "1.0";         }
+
                string key, value;              
                //reads in parameters and values
                if((optionText != "") && (commandName != "help")){
@@ -102,8 +57,11 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                                if (key == "list" )             { listfile = value; inputFileName = value; fileroot = value; format = "list";           }
                                if (key == "rabund" )   { rabundfile = value; inputFileName = value; fileroot = value; format = "rabund";       }
                                if (key == "sabund" )   { sabundfile = value; inputFileName = value; fileroot = value; format = "sabund";       } 
-                               if (key == "fasta" )    { fastafile = value; inputFileName = value; fileroot = value; format = "fasta";         } 
+                               if (key == "fasta" )    { fastafile = value; inputFileName = value; fileroot = value; format = "fasta";         }
+                               if (key == "nexus" )    { nexusfile = value; inputFileName = value; fileroot = value; format = "nexus";         } 
+                               if (key == "clustal" )  { clustalfile = value; inputFileName = value; fileroot = value; format = "clustal"; }
                                if (key == "tree" )             { treefile = value; inputFileName = value; fileroot = value; format = "tree";           }
+                               if (key == "shared" )   { sharedfile = value; inputFileName = value; fileroot = value; format = "sharedfile";   }
                                if (key == "name" )             { namefile = value;             }
                                if (key == "order" )    { orderfile = value;    }
                                if (key == "group" )    { groupfile = value;    }
@@ -114,41 +72,32 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                                if (key == "freq" )                     { freq = value;                 }
                                if (key == "method" )           { method = value;               }
                                if (key == "fileroot" )         { fileroot = value;             }
-                               if (key == "randomtree" )       { randomtree = value;   }
-                               if (key == "groups" )           { groups = value;       }
+                               if (key == "abund" )        { abund = value;        }
+                               if (key == "random" )           { randomtree = value;   }
+                               if (key == "calc")                      { calc = value;                 }
+                               if (key == "step")                      { step = value;                 }
+                               if (key == "form")                      { form = value;                 }
+                               if (key == "sorted")            { sorted = value;               }
+                               if (key == "vertical")          { vertical = value;             }
+                               if (key == "trump")                 { trump = value;            }
+                               if (key == "hard")                      { hard = value;         }
+                               if (key == "soft")                  { soft = value;                 }
+                               if (key == "scale")                     { scale = value;                }
+                               if (key == "countends" )        { countends = value;    }
+                               if (key == "processors" )       { processors = value;   }
+                               if (key == "size" )         { size = value;         }
+                               if (key == "candidate")         { candidatefile = value;        }
+                               if (key == "search")            { search = value;               }
+                               if (key == "ksize")                     { ksize = value;                }
+                               if (key == "align")                 { align = value;            }
+                               if (key == "match")                     { match = value;                }
+                               if (key == "mismatch")          { mismatch = value;         }
+                               if (key == "gapopen")           { gapopen = value;              }
+                               if (key == "gapextend" )        { gapextend = value;    }
                                
-                               if (key == "single") {//stores estimators in a vector
-                                       singleEstimators.clear(); //clears out old values
-                                       if (value == "default") { value = "sobs-chao-ace-jack-bootstrap-shannon-npshannon-simpson-rarefraction"; }
-                                       splitAtDash(value, singleEstimators);
-                               }
-                               if (key == "rarefaction") {//stores estimators in a vector
-                                       rareEstimators.clear(); //clears out old values
-                                       if (value == "default") { value = "rarefraction"; }
-                                       splitAtDash(value, rareEstimators);
-                               }
-                               if (key == "shared") {//stores estimators in a vector
-                                       sharedEstimators.clear(); //clears out old values
-                                       if (value == "default") { value = "sharedChao-sharedAce-sharedJabund-sharedSorensonAbund-sharedJclass-sharedSorClass-sharedJest-sharedSorEst-SharedThetaYC-SharedThetaN"; }
-                                       splitAtDash(value, sharedEstimators);
-                               }
-                               if (key == "summary") { //stores summaries to be used in a vector
-                                       summaryEstimators.clear();
-                                       if (value == "default") { value = "summary-chao-ace-jack-bootstrap-shannon-npshannon-simpson"; }
-                                       splitAtDash(value, summaryEstimators);
-                               }
-                               if (key == "sharedsummary") { //stores sharedSummaries to be used in a vector
-                                       sharedSummaryEstimators.clear();
-                                       if (value == "default") { value = "sharedChao-sharedAce-sharedJabund-sharedSorensonAbund-sharedJclass-sharedSorClass-sharedJest-sharedSorEst-SharedThetaYC-SharedThetaN"; }
-                                       splitAtDash(value, sharedSummaryEstimators);
-                               }
-                               if (key == "sharedrarefaction") { //stores sharedrarefaction to be used in a vector
-                                       sharedRareEstimators.clear();
-                                       if (value == "default") { value = "sharedobserved"; }
-                                       splitAtDash(value, sharedRareEstimators);
-                               }
                                if (key == "line") {//stores lines to be used in a set
                                        lines.clear();
+                                       labels.clear();
                                        line = value;
                                        label = "";
                                        splitAtDash(value, lines);
@@ -156,11 +105,13 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                                }
                                if (key == "label") {//stores labels to be used in a set
                                        labels.clear();
+                                       lines.clear();
                                        label = value;
                                        line = "";
                                        splitAtDash(value, labels);
                                        allLines = 0;
                                }
+
                                if (key == "groups") {//stores groups to be used in a vector
                                        Groups.clear();
                                        groups = value;
@@ -178,7 +129,10 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                        if (key == "rabund" )   { rabundfile = value; inputFileName = value; fileroot = value; format = "rabund";       }
                        if (key == "sabund" )   { sabundfile = value; inputFileName = value; fileroot = value; format = "sabund";       }
                        if (key == "fasta" )    { fastafile = value; inputFileName = value; fileroot = value; format = "fasta";         }
-                       if (key == "tree" )             { treefile = value; inputFileName = value; fileroot = value; format = "tree";           }  
+                       if (key == "nexus" )    { nexusfile = value; inputFileName = value; fileroot = value; format = "nexus";         }
+                       if (key == "clustal" )  { clustalfile = value; inputFileName = value; fileroot = value; format = "clustal"; } 
+                       if (key == "tree" )             { treefile = value; inputFileName = value; fileroot = value; format = "tree";           } 
+                       if (key == "shared" )   { sharedfile = value; inputFileName = value; fileroot = value; format = "sharedfile";   } 
                        if (key == "name" )             { namefile = value;             }
                        if (key == "order" )    { orderfile = value;    }
                        if (key == "group" )    { groupfile = value;    }
@@ -189,86 +143,117 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                        if (key == "freq" )                     { freq = value;                 }
                        if (key == "method" )           { method = value;               }
                        if (key == "fileroot" )         { fileroot = value;             }
-                       if (key == "randomtree" )       { randomtree = value;   }
-                       if (key == "groups" )           { groups = value;       }
+                       if (key == "abund" )        { abund = value;        }
+                       if (key == "random" )           { randomtree = value;   }
+                       if (key == "calc")                      { calc = value;                 }
+                       if (key == "step")                      { step = value;                 }
+                       if (key == "form")                      { form = value;                 }
+                       if (key == "sorted")            { sorted = value;               }
+                       if (key == "vertical")          { vertical = value;             }
+                       if (key == "trump")                 { trump = value;            }
+                       if (key == "hard")                      { hard = value;         }
+                       if (key == "soft")                  { soft = value;                 }
+                       if (key == "scale")                     { scale = value;                }
+                       if (key == "countends" )        { countends = value;    }
+                       if (key == "processors" )       { processors = value;   }
+                       if (key == "size" )         { size = value;         }
+                       if (key == "candidate")         { candidatefile = value;        }
+                       if (key == "search")            { search = value;               }
+                       if (key == "ksize")                     { ksize = value;                }
+                       if (key == "align")                 { align = value;            }
+                       if (key == "match")                     { match = value;                }
+                       if (key == "mismatch")          { mismatch = value;         }
+                       if (key == "gapopen")           { gapopen = value;              }
+                       if (key == "gapextend" )        { gapextend = value;    }
 
-                       
-                       if (key == "single") {//stores estimators in a vector
-                               singleEstimators.clear(); //clears out old values
-                               if (value == "default") { value = "sobs-chao-ace-jack-bootstrap-shannon-npshannon-simpson-rarefraction"; }
-                               splitAtDash(value, singleEstimators);
-                       }
-                       if (key == "rarefaction") {//stores estimators in a vector
-                               rareEstimators.clear(); //clears out old values
-                               if (value == "default") { value = "rarefraction"; }
-                               splitAtDash(value, rareEstimators);
-                       }
-                       if (key == "shared") {//stores estimators in a vector
-                               sharedEstimators.clear(); //clears out old values
-                               if (value == "default") { value = "sharedChao-sharedAce-sharedJabund-sharedSorensonAbund-sharedJclass-sharedSorClass-sharedJest-sharedSorEst-SharedThetaYC-SharedThetaN"; }
-                               splitAtDash(value, sharedEstimators);
-                       }
-                       if (key == "summary") { //stores summaries to be used in a vector
-                               summaryEstimators.clear();
-                               if (value == "default") { value = "summary-chao-ace-jack-bootstrap-shannon-npshannon-simpson"; }
-                               splitAtDash(value, summaryEstimators);
-                       }
-                       if (key == "sharedsummary") { //stores sharedSummaries to be used in a vector
-                               sharedSummaryEstimators.clear();
-                               if (value == "default") { value = "sharedChao-sharedAce-sharedJabund-sharedSorensonAbund-sharedJclass-sharedSorClass-sharedJest-sharedSorEst-SharedThetaYC-SharedThetaN"; }
-                               splitAtDash(value, sharedSummaryEstimators);
-                       }
-                       if (key == "sharedrarefaction") { //stores sharedrarefaction to be used in a vector
-                               sharedRareEstimators.clear();
-                               if (value == "default") { value = "sharedobserved"; }
-                               splitAtDash(value, sharedRareEstimators);
-                       }
-                       
                        if (key == "line") {//stores lines to be used in a vector
                                lines.clear();
+                               labels.clear();
                                line = value;
                                label = "";
-                               splitAtDash(value, lines);
-                               allLines = 0;
+                               if (line != "all") {  splitAtDash(value, lines);  allLines = 0;  }
+                               else { allLines = 1;  }
                        }
+                       
                        if (key == "label") {//stores lines to be used in a vector
                                labels.clear();
+                               lines.clear();
                                label = value;
                                line = "";
-                               splitAtDash(value, labels);
-                               allLines = 0;
+                               if (label != "all") {  splitAtDash(value, labels);  allLines = 0;  }
+                               else { allLines = 1;  }
                        }
+                       
                        if (key == "groups") {//stores groups to be used in a vector
                                        Groups.clear();
                                        groups = value;
                                        splitAtDash(value, Groups);
                        }
-
                }
                
                //set format for shared
                if ((listfile != "") && (groupfile != "")) { format = "shared"; }
+               if ((phylipfile != "") && (groupfile != "")) { format = "matrix"; }
                                
-               //input defaults
+               //input defaults for calculators
                if (commandName == "collect.single") {
-                       if (singleEstimators.size() == 0) { splitAtDash(single, singleEstimators); }
+
+                       if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-shannon-npshannon-simpson"; }
+                       Estimators.clear();
+                       splitAtDash(calc, Estimators); 
                }
                if (commandName == "rarefaction.single") {
-                       if (rareEstimators.size() == 0) { splitAtDash(rarefaction, rareEstimators);  }  
+                       if ((calc == "default") || (calc == "")) { calc = "sobs"; }
+                       Estimators.clear();
+                       splitAtDash(calc, Estimators); 
                }
                if (commandName == "collect.shared") {
-                       if (sharedEstimators.size() == 0) { splitAtDash(shared, sharedEstimators); }    
+
+                       if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
+                       Estimators.clear();
+                       splitAtDash(calc, Estimators); 
                }
                if (commandName == "summary.single") {
-                       if (summaryEstimators.size() == 0) { splitAtDash(summary, summaryEstimators); }
+                       if ((calc == "default") || (calc == "")) { calc = "sobs-chao-ace-jack-shannon-npshannon-simpson"; }
+                       Estimators.clear();
+                       splitAtDash(calc, Estimators); 
                }
                if (commandName == "summary.shared") {
-                       if (sharedSummaryEstimators.size() == 0) { splitAtDash(sharedsummary, sharedSummaryEstimators); }
+                       if ((calc == "default") || (calc == "")) { calc = "sharedsobs-sharedchao-sharedace-jabund-sorabund-jclass-sorclass-jest-sorest-thetayc-thetan"; }
+                       Estimators.clear();
+                       splitAtDash(calc, Estimators); 
                }
                if (commandName == "rarefaction.shared") {
-                       if (sharedRareEstimators.size() == 0) { splitAtDash(sharedrarefaction, sharedRareEstimators); }
+                       if ((calc == "default") || (calc == "")) { calc = "sharedobserved"; }
+                       Estimators.clear();
+                       splitAtDash(calc, Estimators); 
+               }
+               if (commandName == "dist.seqs") {
+                       if ((calc == "default") || (calc == "")) {  calc = "onegap";    }
+                       if (countends == "")    { countends = "T"; }
+                       Estimators.clear();
+                       splitAtDash(calc, Estimators); 
+               }
+               if (commandName == "venn") {
+                       if ((calc == "default") || (calc == "")) { 
+                               if (format == "list") { calc = "sobs"; }
+                               else { calc = "sharedsobs"; }
+                       }
+                       Estimators.clear();
+                       splitAtDash(calc, Estimators); 
+               }
+               if ((commandName == "tree.shared") || (commandName == "bootstrap.shared") || (commandName == "dist.shared")) {
+                       if ((calc == "default") || (calc == "")) { 
+                               calc = "jclass-thetayc";
+                       }
+                       Estimators.clear();
+                       splitAtDash(calc, Estimators); 
+               }
+               if(commandName == "filter.seqs"){
+                       if(trump == "" && vertical == "" && hard == "" && soft == ""){
+                               trump = '.';
+                       }
                }
-
 
                //if you have done a read.otu with a groupfile but don't want to use it anymore because you want to do single commands
                if ((commandName == "collect.single") || (commandName == "rarefaction.single") || (commandName == "summary.single")) {
@@ -276,7 +261,6 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                        else if (sabundfile != "") { format = "sabund"; }
                        else if (rabundfile != "") { format = "rabund"; }
                }
-                               
        }
        catch(exception& e) {
                cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function parseGlobalData. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
@@ -286,7 +270,6 @@ void GlobalData::parseGlobalData(string commandString, string optionText){
                cout << "An unknown error has occurred in the GlobalData class function parseGlobalData. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
                exit(1);
        }
-
 }
 /*******************************************************/
 
@@ -301,7 +284,10 @@ string GlobalData::getNameFile()           {       return namefile;        }
 string GlobalData::getGroupFile()              {       return groupfile;       }
 string GlobalData::getOrderFile()              {       return orderfile;       }
 string GlobalData::getTreeFile()               {       return treefile;        }
+string GlobalData::getSharedFile()             {       return sharedfile;      }
 string GlobalData::getFastaFile()              {       return fastafile;       }
+string GlobalData::getNexusFile()              {       return nexusfile;       }
+string GlobalData::getClustalFile()     {   return clustalfile; }
 string GlobalData::getCutOff()                 {       return cutoff;          }
 string GlobalData::getFormat()                 {       return format;          }
 string GlobalData::getPrecision()              {       return precision;       }
@@ -310,31 +296,59 @@ string GlobalData::getFileRoot()          {       return fileroot;        }
 string GlobalData::getIters()                  {       return iters;           }
 string GlobalData::getJumble()                 {       return jumble;          }
 string GlobalData::getFreq()                   {       return freq;            }
+string GlobalData::getAbund()           {   return abund;       }
 string GlobalData::getRandomTree()             {       return randomtree;      }
-void GlobalData::setListFile(string file)      {       listfile = file;        inputFileName = file;}
-void GlobalData::setRabundFile(string file)    {       rabundfile = file;      inputFileName = file;}
-void GlobalData::setSabundFile(string file)    {       sabundfile = file;      inputFileName = file;}
-void GlobalData::setPhylipFile(string file)    {       phylipfile = file;    inputFileName = file;}
-void GlobalData::setColumnFile(string file)    {       columnfile = file;    inputFileName = file;}
-//void GlobalData::setGroupFile(string file)   {       groupfile = file;               }
+string GlobalData::getGroups()                 {       return groups;          }
+string GlobalData::getStep()                   {       return step;            }
+string GlobalData::getForm()                   {       return form;            }
+string GlobalData::getSorted()                 {       return sorted;          }
+string GlobalData::getVertical()               {   return vertical;    }
+string GlobalData::getTrump()                  {   return trump;       }
+string GlobalData::getSoft()                   {   return soft;                }
+string GlobalData::getHard()                   {   return hard;                }
+string GlobalData::getScale()                  {       return scale;           }
+string GlobalData::getCountEnds()              {   return countends;   }
+string GlobalData::getProcessors()             {       return processors;      }
+string GlobalData::getSize()            {   return size;        }
+string GlobalData::getCandidateFile()  {       return candidatefile;}
+string GlobalData::getSearch()                 {       return search;          }
+string GlobalData::getKSize()                  {       return ksize;           }
+string GlobalData::getAlign()                  {       return align;           }
+string GlobalData::getMatch()                  {       return match;           }
+string GlobalData::getMismatch()               {       return mismatch;        }
+string GlobalData::getGapopen()                        {       return gapopen;         }
+string GlobalData::getGapextend()              {       return gapextend;       }
+
+
+void GlobalData::setListFile(string file)              {       listfile = file;        inputFileName = file;                                   }
+void GlobalData::setRabundFile(string file)            {       rabundfile = file;      inputFileName = file;                                   }
+void GlobalData::setSabundFile(string file)            {       sabundfile = file;      inputFileName = file;                                   }
+void GlobalData::setPhylipFile(string file)            {       phylipfile = file;    inputFileName = file;                                     }
+void GlobalData::setColumnFile(string file)            {       columnfile = file;    inputFileName = file;                                     }
+void GlobalData::setGroupFile(string file)             {       groupfile = file;                                                                                       }
+void GlobalData::setSharedFile(string file)            {       sharedfile = file;      inputFileName = file; fileroot = file;  }
 void GlobalData::setNameFile(string file)              {       namefile = file;                }
 void GlobalData::setFormat(string Format)              {       format = Format;                }
 void GlobalData::setRandomTree(string Random)  {       randomtree = Random;    }
+void GlobalData::setGroups(string g)                   {       groups = g;                             }
+void GlobalData::setCalc(string Calc)                  {       calc = Calc;                    }
+void GlobalData::setCountEnds(string e)                        {   countends = e;                      }
+void GlobalData::setProcessors(string p)               {       processors = p;                 }
 
 
 /*******************************************************/
 
 /******************************************************/
-
 GlobalData::GlobalData() {
        //option definitions should go here...
        helpRequest = "";
        clear();
+       gListVector == NULL;            
+       gSparseMatrix == NULL;  
 }
 /*******************************************************/
 
 /******************************************************/
-
 void GlobalData::clear() {
        //option definitions should go here...
        phylipfile              =       "";
@@ -346,7 +360,11 @@ void GlobalData::clear() {
        groupfile               =       ""; 
        orderfile               =       "";
        fastafile               =   "";
+       nexusfile               =   "";
+       clustalfile             =   "";
        treefile                =       "";
+       sharedfile              =       "";
+       candidatefile   =       "";
        cutoff                  =       "10.00";
        format                  =       "";
        precision               =       "100";
@@ -355,21 +373,67 @@ void GlobalData::clear() {
        label                   =       "";
        groups                  =       "";
        jumble                  =       "1";    //0 means don't jumble, 1 means jumble.
-       randomtree              =       "0";  //0 means user will enter some user trees, 1 means they just want the random tree distribution.
+       randomtree              =       "";  //"" means user will enter some user trees, "outputfile" means they just want the random tree distribution to be outputted to outputfile.
        freq                    =       "100";
        method                  =       "furthest";
        fileroot                =       "";
-       single                  =       "sobs-chao-ace-jack-bootstrap-shannon-npshannon-simpson-rarefraction";
-       rarefaction             =       "sobs";
-       shared                  =       "sharedSobs-sharedChao-sharedAce-sharedJabund-sharedSorensonAbund-sharedJclass-sharedSorClass-sharedJest-sharedSorEst-SharedThetaYC-SharedThetaN";
-       sharedsummary   =   "sharedSobs-sharedChao-sharedAce-sharedJabund-sharedSorensonAbund-sharedJclass-sharedSorClass-sharedJest-sharedSorEst-SharedThetaYC-SharedThetaN";
-       summary                 =       "summary-chao-ace-jack-bootstrap-shannon-npshannon-simpson";
-       sharedrarefaction = "sharedobserved";
+       abund           =   "10";
+       step                    =       "0.01";
+       form                    =       "integral";
+       sorted                  =       "T";  //F means don't sort, T means sort.
+       vertical        =   "";         
+       trump           =       "";             
+       hard                    =   "";         
+       soft            =   ""; 
+       scale                   =       "log10";
+       countends               =   "T";  //yes
+       processors              =       "1";
+       size            =   "0";
+       search                  =       "kmer";
+       ksize                   =       "7";
+       align                   =       "needleman";
+       match                   =       "1.0";
+       mismatch                =       "-1.0";
+       gapopen                 =       "-1.0";
+       gapextend               =       "-2.0";
 }
-/*******************************************************/
+
+//*******************************************************/
 
 /******************************************************/
+void GlobalData::reset() {
+       cutoff                  =       "10.00";
+       precision               =       "100";
+       iters                   =       "1000"; 
+       groups                  =       "";
+       jumble                  =       "1";    //0 means don't jumble, 1 means jumble.
+       sorted                  =       "T";  //F means don't sort, T means sort.
+       randomtree              =       "";  //"" means user will enter some user trees, "outputfile" means they just want the random tree distribution to be outputted to outputfile.
+       freq                    =       "100";
+       method                  =       "furthest";
+       calc                    =       "";
+       abund                   =   "10";
+       step                    =       "0.01";
+       form                    =       "integral";
+       countends               =   "T";
+       processors              =       "1";
+       size            =   "0";
+       search                  =       "kmer";
+       ksize                   =       "7";
+       align                   =       "needleman";
+       match                   =       "1.0";
+       mismatch                =       "-1.0";
+       gapopen                 =       "-1.0";
+       gapextend               =       "-2.0";
+       vertical        =   "";         
+       trump           =   "";         
+       hard                    =   "";         
+       soft            =   ""; 
+
+}
+/*******************************************************/
 
+/******************************************************/
 GlobalData::~GlobalData() {
        _uniqueInstance = 0;
        if(gListVector != NULL)         {       delete gListVector;             }
@@ -378,139 +442,143 @@ GlobalData::~GlobalData() {
 }
 /*******************************************************/
 
-/******************************************************/
-//This function parses the estimator options and puts them in a vector
-void GlobalData::splitAtDash(string& estim, vector<string>& container) {
-       try {
-               string individual;
-               
-               while (estim.find_first_of('-') != -1) {
-                       individual = estim.substr(0,estim.find_first_of('-'));
-                       if ((estim.find_first_of('-')+1) <= estim.length()) { //checks to make sure you don't have dash at end of string
-                               estim = estim.substr(estim.find_first_of('-')+1, estim.length());
-                               container.push_back(individual);
-                       }
-               }
-               //get last one
-               container.push_back(estim);
-       }
-       catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function splitAtDash. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the GlobalData class function splitAtDash. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-
-}
 /*******************************************************/
-
-/******************************************************/
-//This function parses the label options and puts them in a set
-void GlobalData::splitAtDash(string& estim, set<string>& container) {
+void GlobalData::parseTreeFile() {
+       //only takes names from the first tree and assumes that all trees use the same names.
        try {
-               string individual;
+               string filename = treefile;
+               ifstream filehandle;
+               openInputFile(filename, filehandle);
+               int c, comment;
+               comment = 0;
                
-               while (estim.find_first_of('-') != -1) {
-                       individual = estim.substr(0,estim.find_first_of('-'));
-                       if ((estim.find_first_of('-')+1) <= estim.length()) { //checks to make sure you don't have dash at end of string
-                               estim = estim.substr(estim.find_first_of('-')+1, estim.length());
-                               container.insert(individual);
+               //if you are not a nexus file 
+               if ((c = filehandle.peek()) != '#') {  
+                       while((c = filehandle.peek()) != ';') { 
+                               while ((c = filehandle.peek()) != ';') {
+                                       // get past comments
+                                       if(c == '[') {
+                                               comment = 1;
+                                       }
+                                       if(c == ']'){
+                                               comment = 0;
+                                       }
+                                       if((c == '(') && (comment != 1)){ break; }
+                                       filehandle.get();
+                               }
+
+                               readTreeString(filehandle); 
+                       }
+               //if you are a nexus file
+               }else if ((c = filehandle.peek()) == '#') {
+                       string holder = "";
+                                       
+                       // get past comments
+                       while(holder != "translate" && holder != "Translate"){  
+                               if(holder == "[" || holder == "[!"){
+                                       comment = 1;
+                               }
+                               if(holder == "]"){
+                                       comment = 0;
+                               }
+                               filehandle >> holder; 
+       
+                               //if there is no translate then you must read tree string otherwise use translate to get names
+                               if(holder == "tree" && comment != 1){   
+                                       //pass over the "tree rep.6878900 = "
+                                       while (((c = filehandle.get()) != '(') && ((c = filehandle.peek()) != EOF) ) {;}
+
+                                       if (c == EOF ) { break; }
+                                       filehandle.putback(c);  //put back first ( of tree.
+                                       readTreeString(filehandle);     
+                                       break;
+                               }
+                       }
+                       
+                       //use nexus translation rather than parsing tree to save time
+                       if ((holder == "translate") || (holder == "Translate")) {
+
+                               string number, name, h;
+                               h = ""; // so it enters the loop the first time
+                               while((h != ";") && (number != ";")) { 
+                                       filehandle >> number;
+                                       filehandle >> name;
+       
+                                       //c = , until done with translation then c = ;
+                                       h = name.substr(name.length()-1, name.length()); 
+                                       name.erase(name.end()-1);  //erase the comma
+                                       Treenames.push_back(number);
+                               }
+                               if (number == ";") { Treenames.pop_back(); }  //in case ';' from translation is on next line instead of next to last name
                        }
                }
-               //get last one
-               container.insert(estim);
+               
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function splitAtDash. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function parseTreeFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
                exit(1);
        }
        catch(...) {
-               cout << "An unknown error has occurred in the GlobalData class function splitAtDash. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               cout << "An unknown error has occurred in the GlobalData class function parseTreeFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
                exit(1);
-       }
-
+       }               
 }
 /*******************************************************/
 
-/******************************************************/
-//This function parses the line options and puts them in a set
-void GlobalData::splitAtDash(string& estim, set<int>& container) {
+/*******************************************************/
+void GlobalData::readTreeString(ifstream& filehandle)  {
        try {
-               string individual;
-               int lineNum;
+               int c;
+               string name; //k
                
-               while (estim.find_first_of('-') != -1) {
-                       individual = estim.substr(0,estim.find_first_of('-'));
-                       if ((estim.find_first_of('-')+1) <= estim.length()) { //checks to make sure you don't have dash at end of string
-                               estim = estim.substr(estim.find_first_of('-')+1, estim.length());
-                               convert(individual, lineNum); //convert the string to int
-                               container.insert(lineNum);
+               while((c = filehandle.peek()) != ';') { 
+                               //if you are a name
+                       if ((c != '(') && (c != ')') && (c != ',') && (c != ':') && (c != '\n') && (c != '\t') && (c != 32)) { //32 is space
+                               name = "";
+                               c = filehandle.get();
+       //              k = c;
+//cout << k << endl;
+                               while ((c != '(') && (c != ')') && (c != ',') && (c != ':') && (c != '\n') && (c != 32) && (c != '\t')) {                       
+                                       name += c;
+                                       c = filehandle.get();
+               //      k = c;
+//cout << " in name while " << k << endl;
+                               }
+                               
+//cout << "name = " << name << endl;
+                               Treenames.push_back(name);
+                               filehandle.putback(c);
+//k = c;
+//cout << " after putback" <<  k << endl;
+                       } 
+                       
+                       if (c  == ':') { //read until you reach the end of the branch length
+                               while ((c != '(') && (c != ')') && (c != ',') && (c != ';') && (c != '\n') && (c != '\t') && (c != 32)) {
+                                       c = filehandle.get();
+                               //      k = c;
+       //cout << " in branch while " << k << endl;
+                               }
+                               filehandle.putback(c);
                        }
-               }
-               //get last one
-               convert(estim, lineNum); //convert the string to int
-               container.insert(lineNum);
-       }
-       catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function splitAtDash. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the GlobalData class function splitAtDash. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-
-}
-/*******************************************************/
-
-/******************************************************/
+                       c = filehandle.get();
+                       if (c == ';') { break; }
+               //      k = c;
+//cout << k << endl;
 
-//This function splits up the various option parameters
-void GlobalData::splitAtComma(string& prefix, string& suffix){
-       try {
-               prefix = suffix.substr(0,suffix.find_first_of(','));
-               if ((suffix.find_first_of(',')+2) <= suffix.length()) {  //checks to make sure you don't have comma at end of string
-                       suffix = suffix.substr(suffix.find_first_of(',')+2, suffix.length());
                }
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function splitAtComma. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function parseTreeFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
                exit(1);
        }
        catch(...) {
-               cout << "An unknown error has occurred in the GlobalData class function splitAtComma. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               cout << "An unknown error has occurred in the GlobalData class function parseTreeFile. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
                exit(1);
-       }
+       }               
+}      
 
-}
 /*******************************************************/
 
-/******************************************************/
-//This function separates the key value from the option value i.e. distfile = "96_..."
-void GlobalData::splitAtEquals(string& key, string& value){            
-       try {
-               if(value.find_first_of('=') != -1){
-                       key = value.substr(0,value.find_first_of('='));
-                       if ((value.find_first_of('=')+1) <= value.length()) {
-                               value = value.substr(value.find_first_of('=')+1, value.length());
-                       }
-               }else{
-                       key = value;
-                       value = 1;
-               }
-       }
-       catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the GlobalData class Function splitAtEquals. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-       catch(...) {
-               cout << "An unknown error has occurred in the GlobalData class function splitAtEquals. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }
-
-}
 /*******************************************************/
 
-/******************************************************/
+