X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedrabundvector.cpp;h=0f2e48e8ac7bbdc18b10f15f1b764aed7ee58890;hb=250e3b11b1c9c1e1ad458ab6c7e71ac2e67e11d9;hp=9b2bb678ca7688777aa87a9f60015baba5d336d9;hpb=d3e27ba055f6765044b885cded5302d9cece161a;p=mothur.git

diff --git a/sharedrabundvector.cpp b/sharedrabundvector.cpp
index 9b2bb67..0f2e48e 100644
--- a/sharedrabundvector.cpp
+++ b/sharedrabundvector.cpp
@@ -86,13 +86,13 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0),
 				
 				//parse labels to save
 				istringstream iStringStream(label);
-				m->binLabelsInFile.clear();
+				m->sharedBinLabelsInFile.clear();
 				while(!iStringStream.eof()){
 					if (m->control_pressed) { break; }
 					string temp;
 					iStringStream >> temp;  m->gobble(iStringStream);
 		
-					m->binLabelsInFile.push_back(temp);
+					m->sharedBinLabelsInFile.push_back(temp);
 				}
 				
 				f >> label >> groupN >> num;
@@ -102,7 +102,7 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0),
                 
                 //make binlabels because we don't have any
                 string snumBins = toString(num);
-                m->binLabelsInFile.clear();
+                m->sharedBinLabelsInFile.clear();
                 for (int i = 0; i < num; i++) {  
                     //if there is a bin label use it otherwise make one
                     string binLabel = "Otu";
@@ -112,7 +112,7 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0),
                         for (int h = 0; h < diff; h++) { binLabel += "0"; }
                     }
                     binLabel += sbinNumber;
-                    m->binLabelsInFile.push_back(binLabel);
+                    m->sharedBinLabelsInFile.push_back(binLabel);
                 }
             }
 		}else { 
@@ -125,7 +125,7 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0),
         }
 		
 		//reset labels, currentLabels may have gotten changed as otus were eliminated because of group choices or sampling
-		m->currentBinLabels = m->binLabelsInFile;
+		m->currentSharedBinLabels = m->sharedBinLabelsInFile;
 		
 		holdLabel = label;
 		
@@ -385,7 +385,7 @@ void SharedRAbundVector::printHeaders(ostream& output){
 					for (int h = 0; h < diff; h++) { binLabel += "0"; }
 				}
 				binLabel += sbinNumber;
-				if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
+				if (i < m->currentSharedBinLabels.size()) {  binLabel = m->currentSharedBinLabels[i]; }
 				
 				output << binLabel << '\t'; 
 			}
@@ -400,14 +400,14 @@ void SharedRAbundVector::printHeaders(ostream& output){
 					for (int h = 0; h < diff; h++) { binLabel += "0"; }
 				}
 				binLabel += sbinNumber;
-				if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
+				if (i < m->currentSharedBinLabels.size()) {  binLabel = m->currentSharedBinLabels[i]; }
 				
 				output << binLabel << '\t'; 
 			}
 			
 			output << endl;
 		}
-		m->printedHeaders = true;
+		m->printedSharedHeaders = true;
 	}
 	catch(exception& e) {
 		m->errorOut(e, "SharedRAbundVector", "printHeaders");
@@ -533,7 +533,7 @@ int SharedRAbundVector::eliminateZeroOTUS(vector<SharedRAbundVector*>& thislooku
 						for (int h = 0; h < diff; h++) { binLabel += "0"; }
 					}
 					binLabel += sbinNumber; 
-					if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
+					if (i < m->currentSharedBinLabels.size()) {  binLabel = m->currentSharedBinLabels[i]; }
 					
 					newBinLabels.push_back(binLabel);
 				}
@@ -542,7 +542,7 @@ int SharedRAbundVector::eliminateZeroOTUS(vector<SharedRAbundVector*>& thislooku
 			for (int j = 0; j < thislookup.size(); j++) {  delete thislookup[j];  }
 			
 			thislookup = newLookup;
-			m->currentBinLabels = newBinLabels;
+			m->currentSharedBinLabels = newBinLabels;
 			
 			return 0;