added sequence name to error string in fastq.info. Changed np_shannon to npshannon.

[mothur.git] / treegroupscommand.cpp

diff --git a/treegroupscommand.cpp b/treegroupscommand.cpp
index f1be7cbfbf3ef3d51c60234f2705a706d8697a06..8c5aa4bbdc926515c6e3796a3a7969aa9abffca9 100644 (file)
--- a/treegroupscommand.cpp
+++ b/treegroupscommand.cpp
@@ -240,7 +240,7 @@ TreeGroupCommand::TreeGroupCommand(string option)  {
                        if (groups == "not found") { groups = ""; }
                        else { 
                                m->splitAtDash(groups, Groups);
-                               m->Groups = Groups;
+                               m->setGroups(Groups);
                        }
                                
                        calc = validParameter.validFile(parameters, "calc", false);                     
@@ -257,10 +257,10 @@ TreeGroupCommand::TreeGroupCommand(string option)  {
 
                        string temp;
                        temp = validParameter.validFile(parameters, "precision", false);                        if (temp == "not found") { temp = "100"; }
-                       convert(temp, precision); 
+                       m->mothurConvert(temp, precision); 
                        
                        temp = validParameter.validFile(parameters, "cutoff", false);                   if (temp == "not found") { temp = "10"; }
-                       convert(temp, cutoff); 
+                       m->mothurConvert(temp, cutoff); 
                        cutoff += (5 / (precision * 10.0));
                        
                        //if the user changes the output directory command factory will send this info to us in the output parameter 
@@ -396,13 +396,13 @@ int TreeGroupCommand::execute(){
                        
                        //create treemap class from groupmap for tree class to use
                        tmap = new TreeMap();
-                       tmap->makeSim(m->namesOfGroups);
+                       tmap->makeSim(m->getAllGroups());
                        
                        //clear globaldatas old tree names if any
                        m->Treenames.clear();
                        
                        //fills globaldatas tree names
-                       m->Treenames = m->Groups;
+                       m->Treenames = m->getGroups();
                
                        if (m->control_pressed) { return 0; }
                        
@@ -438,13 +438,14 @@ int TreeGroupCommand::execute(){
                        
                        tmap->makeSim(list);
                        
-                       m->Groups = tmap->namesOfGroups;
+                       vector<string> namesGroups = tmap->getNamesOfGroups();
+                       m->setGroups(namesGroups);
                
                        //clear globaldatas old tree names if any
                        m->Treenames.clear();
                
                        //fills globaldatas tree names
-                       m->Treenames = m->Groups;
+                       m->Treenames = m->getGroups();
                        
                        //used in tree constructor 
                        m->runParse = false;
@@ -468,7 +469,7 @@ int TreeGroupCommand::execute(){
                }
                                
                //reset groups parameter
-               m->Groups.clear(); 
+               m->clearGroups(); 
                
                //set tree file as new current treefile
                string current = "";