]> git.donarmstrong.com Git - mothur.git/blobdiff - summarysharedcommand.cpp
fixed some issues while testing 1.6
[mothur.git] / summarysharedcommand.cpp
index 253c3382d9cfcfc94a59a90e990bf2474afe1ac5..9f951debfddf4346ed362dffa529d03e4bce3350 100644 (file)
@@ -273,7 +273,7 @@ int SummarySharedCommand::execute(){
                while((lookup[0] != NULL) && ((allLines == 1) || (userLabels.size() != 0) || (userLines.size() != 0))) {
                
                        if(allLines == 1 || lines.count(count) == 1 || labels.count(lookup[0]->getLabel()) == 1){                       
-                               mothurOut(lookup[0]->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                               mothurOut(lookup[0]->getLabel()); mothurOutEndLine();
                                process(lookup);
                                
                                processedLabels.insert(lookup[0]->getLabel());
@@ -285,7 +285,7 @@ int SummarySharedCommand::execute(){
                                        for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  } 
                                        lookup = input->getSharedRAbundVectors(lastLabel);
 
-                                       mothurOut(lookup[0]->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                                       mothurOut(lookup[0]->getLabel()); mothurOutEndLine();
                                        process(lookup);
                                        
                                        processedLabels.insert(lookup[0]->getLabel());
@@ -318,10 +318,10 @@ int SummarySharedCommand::execute(){
                
                //run last line if you need to
                if (needToRun == true)  {
-                               for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  } 
+                               for (int i = 0; i < lookup.size(); i++) {  if (lookup[i] != NULL) {     delete lookup[i];       } } 
                                lookup = input->getSharedRAbundVectors(lastLabel);
 
-                               mothurOut(lookup[0]->getLabel() + "\t" + toString(count)); mothurOutEndLine();
+                               mothurOut(lookup[0]->getLabel()); mothurOutEndLine();
                                process(lookup);
                                for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  } 
                }