fixed Thomas' calculators

[mothur.git] / summarysharedcommand.cpp

diff --git a/summarysharedcommand.cpp b/summarysharedcommand.cpp
index a4a345e4f7fa57714b44ecda860e4753c9674338..46055c0f6f9f428db22e258b9f4a28c060ac774f 100644 (file)
--- a/summarysharedcommand.cpp
+++ b/summarysharedcommand.cpp
@@ -30,7 +30,7 @@
 #include "sharedmorisitahorn.h"
 #include "sharedbraycurtis.h"
 #include "sharedjackknife.h"
-#include "sharedwhittaker.h"
+#include "whittaker.h"
 
 
 //**********************************************************************************************************************
@@ -129,22 +129,12 @@ int SummarySharedCommand::execute(){
                        }
                }
                
-               if (format == "sharedfile") {
-                       read = new ReadOTUFile(globaldata->inputFileName);      
-                       read->read(&*globaldata); 
+               read = new ReadOTUFile(globaldata->inputFileName);      
+               read->read(&*globaldata); 
                        
-                       input = globaldata->ginput;
-                       order = input->getSharedOrderVector();
-               }else {
-                       //you are using a list and a groupfile
-                       read = new ReadOTUFile(globaldata->inputFileName);      
-                       read->read(&*globaldata); 
-               
-                       input = globaldata->ginput;
-                       SharedList = globaldata->gSharedList;
-                       order = SharedList->getSharedOrderVector();
-               }
-               
+               input = globaldata->ginput;
+               order = input->getSharedOrderVector();
+                               
                //set users groups
                util->setGroups(globaldata->Groups, globaldata->gGroupmap->namesOfGroups, "summary");
                
@@ -229,17 +219,7 @@ int SummarySharedCommand::execute(){
                        }
                
                        //get next line to process
-                       if (format == "sharedfile") {
-                               order = input->getSharedOrderVector();
-                       }else {
-                               //you are using a list and a groupfile
-                               SharedList = input->getSharedListVector(); //get new list vector to process
-                               if (SharedList != NULL) {
-                                       order = SharedList->getSharedOrderVector(); //gets new order vector with group info.
-                               }else {
-                                       break;
-                               }
-                       }
+                       order = input->getSharedOrderVector();
                        count++;
                }