X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=collectsharedcommand.cpp;h=e989233c7b86c3efae39d5a7f1b5b0541a365bd5;hb=9ca2caadbeac83bb84b3330d9204b1b659d62941;hp=c473c2d77e819164d62799095ea6bf849d27c42a;hpb=7e0cf6431e287072c40b2c10c9e08199fce29ef4;p=mothur.git diff --git a/collectsharedcommand.cpp b/collectsharedcommand.cpp index c473c2d..e989233 100644 --- a/collectsharedcommand.cpp +++ b/collectsharedcommand.cpp @@ -19,6 +19,7 @@ #include "sharedsorest.h" #include "sharedthetayc.h" #include "sharedthetan.h" +#include "sharednseqs.h" //********************************************************************************************************************** @@ -31,9 +32,6 @@ CollectSharedCommand::CollectSharedCommand(){ format = globaldata->getFormat(); validCalculator = new ValidCalculators(); - //set users groups - setGroups(); - int i; for (i=0; iEstimators.size(); i++) { if (validCalculator->isValidCalculator("shared", globaldata->Estimators[i]) == true) { @@ -59,7 +57,10 @@ CollectSharedCommand::CollectSharedCommand(){ cDisplays.push_back(new CollectDisplay(new SharedThetaYC(), new SharedOneColumnFile(fileNameRoot+"shared.thetayc"))); }else if (globaldata->Estimators[i] == "sharedthetan") { cDisplays.push_back(new CollectDisplay(new SharedThetaN(), new SharedOneColumnFile(fileNameRoot+"shared.thetan"))); + }else if (globaldata->Estimators[i] == "sharednseqs") { + cDisplays.push_back(new CollectDisplay(new SharedNSeqs(), new SharedOneColumnFile(fileNameRoot+"shared.nseqs"))); } + } } @@ -112,6 +113,9 @@ int CollectSharedCommand::execute(){ order = SharedList->getSharedOrderVector(); } set orderList; + + //set users groups + setGroups(); while(order != NULL){ orderList.insert(order->getLabel());