added stricter compilation requirements and fixed resulting errors

[mothur.git] / jackknife.cpp

diff --git a/jackknife.cpp b/jackknife.cpp
index a166eb4785984d23a6c5949b93db2d3d73cbe3a1..35f0910fab36ca781d2f7653461b0ea79771adf4 100644 (file)
--- a/jackknife.cpp
+++ b/jackknife.cpp
@@ -25,13 +25,9 @@ void Jackknife::getAMatrix(void){
                }
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the Jackknife class Function getAMatrix. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "Jackknife", "getAMatrix");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the Jackknife class function getAMatrix. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /**************************************************************************************************/
@@ -57,13 +53,9 @@ double Jackknife::CN(double z){
                return n;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the Jackknife class Function CN. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "Jackknife", "CN");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the Jackknife class function CN. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /***********************************************************************/
@@ -130,7 +122,7 @@ EstOutput Jackknife::getValues(SAbundVector* rank){
                        }
                        ci = 1.96 * sqrt(ci - jack);
                }
-               else if(k=1){
+               else if(k==1){
                        jack = N[1];
                        ci = 1.96*sqrt(variance[1]);
                }else{
@@ -152,13 +144,9 @@ EstOutput Jackknife::getValues(SAbundVector* rank){
                return data;
        }
        catch(exception& e) {
-               cout << "Standard Error: " << e.what() << " has occurred in the Jackknife class Function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
+               errorOut(e, "Jackknife", "getValues");
                exit(1);
        }
-       catch(...) {
-               cout << "An unknown error has occurred in the Jackknife class function getValues. Please contact Pat Schloss at pschloss@microbio.umass.edu." << "\n";
-               exit(1);
-       }       
 }
 
 /***********************************************************************/