added checks for ^C to quit command instead of program

[mothur.git] / slayer.cpp

diff --git a/slayer.cpp b/slayer.cpp
index 2d079cd6ac10ae5ed4aeea0454ff3f0e984561e8..5d5a48b864695ce2ed92357006b834efa24195bb 100644 (file)
--- a/slayer.cpp
+++ b/slayer.cpp
@@ -20,6 +20,8 @@ string Slayer::getResults(Sequence* query, vector<Sequence*> refSeqs) {
                for (int i = 0; i < refSeqs.size(); i++) {
                
                        for (int j = i+1; j < refSeqs.size(); j++) {
+                       
+                               if (m->control_pressed) { return "no";  }
        
                                //make copies of query and each parent because runBellerophon removes gaps and messes them up
                                Sequence* q = new Sequence(query->getName(), query->getAligned());
@@ -29,12 +31,26 @@ string Slayer::getResults(Sequence* query, vector<Sequence*> refSeqs) {
                                map<int, int> spots;  //map from spot in original sequence to spot in filtered sequence for query and both parents
                                vector<data_struct> divs = runBellerophon(q, leftParent, rightParent, spots);
                                
+                               if (m->control_pressed) { 
+                                       delete q;
+                                       delete leftParent;
+                                       delete rightParent;
+                                       return "no"; 
+                               }
+                               
                                vector<data_struct> selectedDivs;
                                for (int k = 0; k < divs.size(); k++) {
                                
                                        vector<snps> snpsLeft = getSNPS(divs[k].parentA.getAligned(), divs[k].querySeq.getAligned(), divs[k].parentB.getAligned(), divs[k].winLStart, divs[k].winLEnd);
                                        vector<snps> snpsRight = getSNPS(divs[k].parentA.getAligned(), divs[k].querySeq.getAligned(), divs[k].parentB.getAligned(), divs[k].winRStart, divs[k].winREnd);
                                        
+                                       if (m->control_pressed) { 
+                                               delete q;
+                                               delete leftParent;
+                                               delete rightParent;
+                                               return "no"; 
+                                       }
+                                       
                                        int numSNPSLeft = snpsLeft.size();
                                        int numSNPSRight = snpsRight.size();
                                        
@@ -54,6 +70,13 @@ string Slayer::getResults(Sequence* query, vector<Sequence*> refSeqs) {
                                                        
                                                        float BS_A, BS_B;
                                                        bootstrapSNPS(snpsLeft, snpsRight, BS_A, BS_B);
+                                                       
+                                                       if (m->control_pressed) { 
+                                                               delete q;
+                                                               delete leftParent;
+                                                               delete rightParent;
+                                                               return "no"; 
+                                                       }
 
                                                        divs[k].bsa = BS_A;
                                                        divs[k].bsb = BS_B;
@@ -136,6 +159,8 @@ vector<data_struct> Slayer::runBellerophon(Sequence* q, Sequence* pA, Sequence*
                
                for (int i = windowSize-1; i <= (length - windowSize); i += windowStep) {
                
+                       if (m->control_pressed) { return data; }
+               
                        int breakpoint = i;
                        int leftLength = breakpoint + 1;
                        int rightLength = length - leftLength;
@@ -262,7 +287,7 @@ vector<snps> Slayer::getSNPS(string parentA, string query, string parentB, int l
        }
 }
 /***********************************************************************/
-void Slayer::bootstrapSNPS(vector<snps> left, vector<snps> right, float& BSA, float& BSB) {
+int Slayer::bootstrapSNPS(vector<snps> left, vector<snps> right, float& BSA, float& BSB) {
        try {
 
                srand((unsigned)time( NULL ));
@@ -276,6 +301,8 @@ void Slayer::bootstrapSNPS(vector<snps> left, vector<snps> right, float& BSA, fl
                for (int i = 0; i < iters; i++) {
                        //random sampling with replacement.
                
+                       if (m->control_pressed) { return 0;  }
+                       
                        vector<snps> selectedLeft;
 
                        for (int j = 0; j < numLeft; j++) {
@@ -339,6 +366,8 @@ void Slayer::bootstrapSNPS(vector<snps> left, vector<snps> right, float& BSA, fl
                BSA = ((float) count_A / (float) iters) * 100;
                BSB = ((float) count_B / (float) iters) * 100;
 //cout << "bsa = " << BSA << " bsb = " << BSB << endl;
+
+               return 0;
        
        }
        catch(exception& e) {