changed random forest output filename

[mothur.git] / slibshuff.cpp

diff --git a/slibshuff.cpp b/slibshuff.cpp
index 1f2d3dfea52fade8645c2afd2eebf239e8fa7231..92998e66ac1eadb442b5b0afc0cfee33835f902a 100644 (file)
--- 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);
        }
 }