X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=collectcommand.cpp;h=000f85d1d91f3922766f024d71dc157640b2eabe;hb=d53f63d7e0d9c3feeb8ded5a74e6c150fae50fe9;hp=c716732474da857a38bee138931b4a769cca4aa1;hpb=5e7c1cf6a6dd289a90d27c0eef7eb4675b5e17b7;p=mothur.git diff --git a/collectcommand.cpp b/collectcommand.cpp index c716732..000f85d 100644 --- a/collectcommand.cpp +++ b/collectcommand.cpp @@ -10,6 +10,7 @@ #include "collectcommand.h" #include "ace.h" #include "sobs.h" +#include "nseqs.h" #include "chao1.h" #include "bootstrap.h" #include "simpson.h" @@ -35,8 +36,10 @@ CollectCommand::CollectCommand(){ cDisplays.push_back(new CollectDisplay(new Sobs(), new OneColumnFile(fileNameRoot+"sobs"))); }else if (globaldata->Estimators[i] == "chao") { cDisplays.push_back(new CollectDisplay(new Chao1(), new ThreeColumnFile(fileNameRoot+"chao"))); + }else if (globaldata->Estimators[i] == "nseqs") { + cDisplays.push_back(new CollectDisplay(new NSeqs(), new OneColumnFile(fileNameRoot+"nseqs"))); }else if (globaldata->Estimators[i] == "ace") { - convert(globaldata->getAbund(), abund); + convert(globaldata->getAbund(), abund); 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"))); @@ -110,7 +113,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