added checks for ^C to quit command instead of program

[mothur.git] / unifracweightedcommand.cpp

diff --git a/unifracweightedcommand.cpp b/unifracweightedcommand.cpp
index 3c6c037147c3fb0a1a3da670dfaed6b63c2767e7..cd7fec12320e3ee50e415a348df4a5b503e35763 100644 (file)
--- a/unifracweightedcommand.cpp
+++ b/unifracweightedcommand.cpp
@@ -128,6 +128,15 @@ int UnifracWeightedCommand::execute() {
                
                //get weighted scores for users trees
                for (int i = 0; i < T.size(); i++) {
+                       
+                       if (m->control_pressed) { 
+                               delete randT;
+                               if (random) { delete reading; }
+                               outSum.close();
+                               for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());  }
+                               return 0; 
+                       }
+
                        counter = 0;
                        rScores.resize(numComp);  //data[0] = weightedscore AB, data[1] = weightedscore AC...
                        uScores.resize(numComp);  //data[0] = weightedscore AB, data[1] = weightedscore AC...
@@ -139,6 +148,15 @@ int UnifracWeightedCommand::execute() {
 
                        userData = weighted->getValues(T[i]);  //userData[0] = weightedscore
                        
+                       if (m->control_pressed) { 
+                               delete randT;
+                               if (random) { delete reading; delete output; }
+                               outSum.close();
+                               for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());  }
+                               return 0; 
+                       }
+
+                       
                        //save users score
                        for (int s=0; s<numComp; s++) {
                                //add users score to vector of user scores
@@ -158,9 +176,27 @@ int UnifracWeightedCommand::execute() {
                                                 
                                                //create a random tree with same topology as T[i], but different labels
                                                randT->assembleRandomUnifracTree(globaldata->Groups[r], globaldata->Groups[l]);
+                                               
+                                               if (m->control_pressed) { 
+                                                       delete randT;
+                                                       if (random) { delete reading; delete output; }
+                                                       outSum.close();
+                                                       for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());  }
+                                                       return 0; 
+                                               }
+
+
                                                //get wscore of random tree
                                                randomData = weighted->getValues(randT, globaldata->Groups[r], globaldata->Groups[l]);
                                                
+                                               if (m->control_pressed) { 
+                                                       delete randT;
+                                                       if (random) { delete reading; delete output; }
+                                                       outSum.close();
+                                                       for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());  }
+                                                       return 0; 
+                                               }
+                                               
                                                //save scores
                                                rScores[count].push_back(randomData[0]);
                                                count++;
@@ -202,6 +238,15 @@ int UnifracWeightedCommand::execute() {
                        validScores.clear();
                }
                
+               
+               if (m->control_pressed) { 
+                               delete randT;
+                               if (random) { delete reading;  }
+                               outSum.close();
+                               for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());  }
+                               return 0; 
+               }
+               
                //finish progress bar
                if (random) {   reading->finish();      delete reading;         }
                
@@ -214,6 +259,11 @@ int UnifracWeightedCommand::execute() {
                
                delete randT;
                
+               if (m->control_pressed) { 
+                       for (int i = 0; i < outputNames.size(); i++) {  remove(outputNames[i].c_str());  }
+                       return 0; 
+               }
+               
                m->mothurOutEndLine();
                m->mothurOut("Output File Names: "); m->mothurOutEndLine();
                for (int i = 0; i < outputNames.size(); i++) {  m->mothurOut(outputNames[i]); m->mothurOutEndLine();    }