X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=rarefact.cpp;h=76f68296b209ec1eb8e2ff5a14668b32fd451b8b;hb=5a86e9e5a5a9e061e17b3ae64fb8881f14e53b8a;hp=f5e7952688cdbb1dd182ca44df9c152ef46879d9;hpb=b1bcc272003b50a8c06dc9120754da1f5b744598;p=mothur.git

diff --git a/rarefact.cpp b/rarefact.cpp
index f5e7952..76f6829 100644
--- a/rarefact.cpp
+++ b/rarefact.cpp
@@ -12,13 +12,16 @@
 
 /***********************************************************************/
 
-int Rarefact::getCurve(int increment = 1, int nIters = 1000){
+int Rarefact::getCurve(float percentFreq = 0.01, int nIters = 1000){
 	try {
 		RarefactionCurveData* rcd = new RarefactionCurveData();
 		for(int i=0;i<displays.size();i++){
 			rcd->registerDisplay(displays[i]);
 		}
-	
+		
+		//convert freq percentage to number
+		int increment = numSeqs * percentFreq;
+		
 		for(int iter=0;iter<nIters;iter++){
 		
 			for(int i=0;i<displays.size();i++){
@@ -73,7 +76,7 @@ int Rarefact::getCurve(int increment = 1, int nIters = 1000){
 
 /***********************************************************************/
 
-int Rarefact::getSharedCurve(int increment = 1, int nIters = 1000){
+int Rarefact::getSharedCurve(float percentFreq = 0.01, int nIters = 1000){
 try {
 		SharedRarefactionCurveData* rcd = new SharedRarefactionCurveData();
 		
@@ -87,6 +90,9 @@ try {
 		//if jumble is false all iters will be the same
 		if (globaldata->jumble == false)  {  nIters = 1;  }
 		
+		//convert freq percentage to number
+		int increment = numSeqs * percentFreq;
+		
 		for(int iter=0;iter<nIters;iter++){
 		
 			for(int i=0;i<displays.size();i++){