added nseqs and sharednseqs calculators, removed excess tabs in output files.

[mothur.git] / collectsharedcommand.cpp

diff --git a/collectsharedcommand.cpp b/collectsharedcommand.cpp
index c473c2d77e819164d62799095ea6bf849d27c42a..e989233c7b86c3efae39d5a7f1b5b0541a365bd5 100644 (file)
--- 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; i<globaldata->Estimators.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<string> orderList;
+               
+               //set users groups
+               setGroups();
 
                while(order != NULL){
                        orderList.insert(order->getLabel());