added name parameter to phylotype command

[mothur.git] / collect.cpp

diff --git a/collect.cpp b/collect.cpp
index 34191a07a324fb255120b02bfabba4b56c9d0c48..62ed9f24a929bab17a0733c98b5771105a395c3f 100644 (file)
--- a/collect.cpp
+++ b/collect.cpp
@@ -11,7 +11,7 @@
 
 /***********************************************************************/
 
-void Collect::getCurve(int increment = 1){
+int Collect::getCurve(int increment = 1){
         try {
                 RAbundVector* lookup = new RAbundVector(order->getNumBins());
                 SAbundVector* rank        = new SAbundVector(order->getMaxRank()+1);
@@ -23,7 +23,9 @@ void Collect::getCurve(int increment = 1){
                         displays[i]->init(label);                   //sets displays label
                 }                                                                           
                 for(int i=0;i<numSeqs;i++){
-
+                                               
+                                               if (m->control_pressed) { delete lookup; delete rank; delete ccd;  return 1;  }
+                                               
                         int binNumber = order->get(i);
                         int abundance = lookup->get(binNumber);
                 
@@ -50,15 +52,17 @@ void Collect::getCurve(int increment = 1){
                                delete lookup;
                                delete rank;
                                delete ccd;
+                               
+                               return 0;
         }
         catch(exception& e) {
-                       errorOut(e, "Collect", "getCurve");
+                       m->errorOut(e, "Collect", "getCurve");
                        exit(1);
         }
 }
 
 /***********************************************************************/
-void Collect::getSharedCurve(int increment = 1){
+int Collect::getSharedCurve(int increment = 1){
 try {
                 globaldata = GlobalData::getInstance();
                 vector<SharedRAbundVector*> lookup; 
@@ -94,6 +98,9 @@ try {
                 
                 //sample all the members
                 for(int i=0;i<numSeqs;i++){
+                               
+                                               if (m->control_pressed) { for (int j = 0; j < lookup.size(); j++) {  delete lookup[j]; } delete ccd;  return 1;  }
+                                               
                         //get first sample
                         individual chosen = sharedorder->get(i);
                         int abundance; 
@@ -155,10 +162,12 @@ try {
                                for (int i = 0; i < lookup.size(); i++) {
                                        delete lookup[i];
                                }
+                               
+                               return 0;
 
         }
         catch(exception& e) {
-                errorOut(e, "Collect", "getSharedCurve");
+                m->errorOut(e, "Collect", "getSharedCurve");
                                exit(1);
         }
 }