X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=slibshuff.cpp;h=92998e66ac1eadb442b5b0afc0cfee33835f902a;hp=1f2d3dfea52fade8645c2afd2eebf239e8fa7231;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=c82900be3ceed3d9bc491bdc98b1819ef85c1af7

diff --git a/slibshuff.cpp b/slibshuff.cpp
index 1f2d3df..92998e6 100644
--- a/slibshuff.cpp
+++ b/slibshuff.cpp
@@ -44,7 +44,7 @@ vector<vector<double> > SLibshuff::evaluateAll(){
 		return dCXYValues;
 	}
 	catch(exception& e) {
-		errorOut(e, "SLibshuff", "evaluateAll");
+		m->errorOut(e, "SLibshuff", "evaluateAll");
 		exit(1);
 	}
 }
@@ -53,13 +53,24 @@ vector<vector<double> > SLibshuff::evaluateAll(){
 
 double SLibshuff::sCalculate(int x, int y){
 	try{
+		double sum = 0.0,t=0.0;
+		
 		minX = getMinX(x);
+		
+		if (m->control_pressed) { return sum; }
+		
 		minXY = getMinXY(x,y);
+		
+		if (m->control_pressed) { return sum; }
 
 		sort(minX.begin(), minX.end());
+		
+		if (m->control_pressed) { return sum; }
+		
 		sort(minXY.begin(), minXY.end());
+		
+		if (m->control_pressed) { return sum; }
 
-		double sum = 0.0,t=0.0;
 		int ix=0,iy=0;
 		while( (ix < groupSizes[x]) && (iy < groupSizes[x]) ) {
 			double h = (ix-iy)/double(groupSizes[x]);
@@ -97,7 +108,7 @@ double SLibshuff::sCalculate(int x, int y){
 		return sum;
 	}
 	catch(exception& e) {
-		errorOut(e, "SLibshuff", "sCalculate");
+		m->errorOut(e, "SLibshuff", "sCalculate");
 		exit(1);
 	}
 }