fixed linking error in collect, collectshared, and errorcheckor

[mothur.git] / collectcommand.cpp

diff --git a/collectcommand.cpp b/collectcommand.cpp
index f012ba151e0813f9b7ab67f5c2961db8eec23b1b..95a79d5bc69f763688915ecb998bd47cff162f1e 100644 (file)
--- a/collectcommand.cpp
+++ b/collectcommand.cpp
@@ -37,7 +37,7 @@ CollectCommand::CollectCommand(){
                                        cDisplays.push_back(new CollectDisplay(new Chao1(), new ThreeColumnFile(fileNameRoot+"chao")));
                                }else if (globaldata->Estimators[i] == "ace") { 
                                convert(globaldata->getAbund(), abund);
-                                       cDisplays.push_back(new CollectDisplay(new Ace(), new ThreeColumnFile(fileNameRoot+"ace")));
+                                       cDisplays.push_back(new CollectDisplay(new Ace(abund), new ThreeColumnFile(fileNameRoot+"ace")));
                                }else if (globaldata->Estimators[i] == "jack") { 
                                        cDisplays.push_back(new CollectDisplay(new Jackknife(), new ThreeColumnFile(fileNameRoot+"jack")));
                                }else if (globaldata->Estimators[i] == "shannon") { 
@@ -110,7 +110,6 @@ int CollectCommand::execute(){
                for(i = globaldata->labels.begin(); i != globaldata->labels.end(); ++i)
                        if(orderList.count(*i) == 0)
                                cout << "'" << *i << "'" << " is not a valid label.\n";
-               globaldata->clearLabels();
                for(int i=0;i<cDisplays.size();i++){    delete cDisplays[i];    }       
                return 0;
        }