X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=jackknife.cpp;h=8f0629832208e797efbdc815e619bab28ed49046;hp=35f0910fab36ca781d2f7653461b0ea79771adf4;hb=df7e3ff9f68ef157b0328a2d353c3258c5d45d89;hpb=28d65de5f06f5b033109a3b8bbb6d3c4060914d3

diff --git a/jackknife.cpp b/jackknife.cpp
index 35f0910..8f06298 100644
--- a/jackknife.cpp
+++ b/jackknife.cpp
@@ -12,7 +12,7 @@
 /***********************************************************************/
 void Jackknife::getAMatrix(void){
 	try {
-		vector<vector<double> > B = binomial(maxOrder);
+		vector<vector<double> > B = m->binomial(maxOrder);
 
 		aMat.resize(maxOrder+1);
 
@@ -25,7 +25,7 @@ void Jackknife::getAMatrix(void){
 		}
 	}
 	catch(exception& e) {
-		errorOut(e, "Jackknife", "getAMatrix");
+		m->errorOut(e, "Jackknife", "getAMatrix");
 		exit(1);
 	}
 }
@@ -53,7 +53,7 @@ double Jackknife::CN(double z){
 		return n;
 	}
 	catch(exception& e) {
-		errorOut(e, "Jackknife", "CN");
+		m->errorOut(e, "Jackknife", "CN");
 		exit(1);
 	}
 }
@@ -67,7 +67,7 @@ EstOutput Jackknife::getValues(SAbundVector* rank){
 	
 		double jack, jacklci, jackhci;
 	
-		double maxRank = (double)rank->getMaxRank();
+		int maxRank = (double)rank->getMaxRank();
 		int S = rank->getNumBins();
 
 		double N[maxOrder+1];
@@ -144,7 +144,7 @@ EstOutput Jackknife::getValues(SAbundVector* rank){
 		return data;
 	}
 	catch(exception& e) {
-		errorOut(e, "Jackknife", "getValues");
+		m->errorOut(e, "Jackknife", "getValues");
 		exit(1);
 	}
 }