X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=collect.cpp;h=79e997de38bc8938bbcdb72d7134a566a7b9a2bb;hb=7bf581f8c46b08eb3bb40715dac94695edee4a67;hp=08426a8499bdf41c0fab815f20421d4bc070de0f;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git

diff --git a/collect.cpp b/collect.cpp
index 08426a8..79e997d 100644
--- a/collect.cpp
+++ b/collect.cpp
@@ -11,7 +11,7 @@
 
 /***********************************************************************/
 
-void Collect::getCurve(int increment = 1){
+int Collect::getCurve(float percentFreq = 0.01){
         try {
                 RAbundVector* lookup = new RAbundVector(order->getNumBins());
                 SAbundVector* rank        = new SAbundVector(order->getMaxRank()+1);
@@ -21,9 +21,17 @@ void Collect::getCurve(int increment = 1){
                 for(int i=0;i<displays.size();i++){
                         ccd->registerDisplay(displays[i]); //adds a display[i] to cdd
                         displays[i]->init(label);                   //sets displays label
-                }                                                                           
+                }   
+				
+				//convert freq percentage to number
+				int increment = 1;
+				if (percentFreq < 1.0) {  increment = numSeqs * percentFreq;  }
+				else { increment = percentFreq;  }
+																						                                                                        
                 for(int i=0;i<numSeqs;i++){
-
+						
+						if (m->control_pressed) { delete lookup; delete rank; delete ccd;  return 1;  }
+						
                         int binNumber = order->get(i);
                         int abundance = lookup->get(binNumber);
                 
@@ -50,6 +58,8 @@ void Collect::getCurve(int increment = 1){
 				delete lookup;
 				delete rank;
 				delete ccd;
+				
+				return 0;
         }
         catch(exception& e) {
 			m->errorOut(e, "Collect", "getCurve");
@@ -58,9 +68,9 @@ void Collect::getCurve(int increment = 1){
 }
 
 /***********************************************************************/
-void Collect::getSharedCurve(int increment = 1){
+int Collect::getSharedCurve(float percentFreq = 0.01){
 try {
-                globaldata = GlobalData::getInstance();
+				globaldata = GlobalData::getInstance();
                 vector<SharedRAbundVector*> lookup; 
 				vector<SharedRAbundVector*> subset;
 
@@ -78,22 +88,31 @@ try {
                 //initialize labels for output
                 //makes  'uniqueAB         uniqueAC  uniqueBC' if your groups are A, B, C
                 getGroupComb();
-                groupLabel = ""; 
-                for (int s = 0; s < groupComb.size(); s++) {
-                        groupLabel = groupLabel + label + groupComb[s] + "\t";
-                }
-				
-				//for multi displays
-				string groupLabelAll = groupLabel + label + "all\t";
 				
                 for(int i=0;i<displays.size();i++){
                         ccd->registerDisplay(displays[i]); //adds a display[i] to cdd
+						bool hasLciHci = displays[i]->hasLciHci();
+						groupLabel = "";
+						for (int s = 0; s < groupComb.size(); s++) {
+							if (hasLciHci) {  groupLabel = groupLabel + label + groupComb[s] + "\t" + label + groupComb[s] + "lci\t" + label + groupComb[s] + "hci\t"; }
+							else{  groupLabel = groupLabel + label + groupComb[s] + "\t";  }
+						}
+
+						string groupLabelAll = groupLabel + label + "all\t"; 
 						if ((displays[i]->isCalcMultiple() == true) && (displays[i]->getAll() == true)) {   displays[i]->init(groupLabelAll); }
 						else {  displays[i]->init(groupLabel);  }           
                 }
                 
+				//convert freq percentage to number
+				int increment = 1;
+				if (percentFreq < 1.0) {  increment = numSeqs * percentFreq;  }
+				else { increment = percentFreq;  }
+				
                 //sample all the members
                 for(int i=0;i<numSeqs;i++){
+				
+						if (m->control_pressed) { for (int j = 0; j < lookup.size(); j++) {  delete lookup[j]; } delete ccd;  return 1;  }
+						
                         //get first sample
                         individual chosen = sharedorder->get(i);
                         int abundance; 
@@ -155,6 +174,8 @@ try {
 				for (int i = 0; i < lookup.size(); i++) {
 					delete lookup[i];
 				}
+				
+				return 0;
 
         }
         catch(exception& e) {