X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedrabundvector.cpp;h=f42d24ba4081cd95c1aa2f89367054755f136807;hb=65e21482d022d12f7a78a8d436fb51f322603e41;hp=56b7d094b1444a2afada95807a36b52e235c70e8;hpb=55386dddad84cc1140d736cabaf4dd0ae16f2e01;p=mothur.git

diff --git a/sharedrabundvector.cpp b/sharedrabundvector.cpp
index 56b7d09..f42d24b 100644
--- a/sharedrabundvector.cpp
+++ b/sharedrabundvector.cpp
@@ -336,13 +336,19 @@ int SharedRAbundVector::size(){
 /***********************************************************************/
 void SharedRAbundVector::printHeaders(ostream& output){
 	try {
-		
+		string snumBins = toString(numBins);
 		output << "label\tGroup\tnumOtus\t";
 		if (m->sharedHeaderMode == "tax") {
 			for (int i = 0; i < numBins; i++) {  
 				
 				//if there is a bin label use it otherwise make one
-				string binLabel = "PhyloType" + toString(i+1);
+				string binLabel = "PhyloType";
+				string sbinNumber = toString(i+1);
+				if (sbinNumber.length() < snumBins.length()) { 
+					int diff = snumBins.length() - sbinNumber.length();
+					for (int h = 0; h < diff; h++) { binLabel += "0"; }
+				}
+				binLabel += sbinNumber;
 				if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
 				
 				output << binLabel << '\t'; 
@@ -351,10 +357,16 @@ void SharedRAbundVector::printHeaders(ostream& output){
 		}else {
 			for (int i = 0; i < numBins; i++) {  
 				//if there is a bin label use it otherwise make one
-				string mybinLabel = "Otu" + toString(i+1);
-				if (i < m->currentBinLabels.size()) {  mybinLabel = m->currentBinLabels[i]; }
+				string binLabel = "Otu";
+				string sbinNumber = toString(i+1);
+				if (sbinNumber.length() < snumBins.length()) { 
+					int diff = snumBins.length() - sbinNumber.length();
+					for (int h = 0; h < diff; h++) { binLabel += "0"; }
+				}
+				binLabel += sbinNumber;
+				if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
 				
-				output << mybinLabel << '\t'; 
+				output << binLabel << '\t'; 
 			}
 			
 			output << endl;
@@ -395,7 +407,7 @@ int SharedRAbundVector::getGroupIndex()  { return index; }
 void SharedRAbundVector::setGroupIndex(int vIndex)	{ index = vIndex; }
 /***********************************************************************/
 int SharedRAbundVector::getNumBins(){
-	return numBins;
+		return numBins;
 }
 
 /***********************************************************************/
@@ -423,6 +435,7 @@ vector<SharedRAbundVector*> SharedRAbundVector::getSharedRAbundVectors(){
 		vector<string> Groups = m->getGroups();
 		vector<string> allGroups = m->getAllGroups();
 		util->setGroups(Groups, allGroups);
+		m->setGroups(Groups);
 		
 		bool remove = false;
 		for (int i = 0; i < lookup.size(); i++) {
@@ -460,6 +473,7 @@ int SharedRAbundVector::eliminateZeroOTUS(vector<SharedRAbundVector*>& thislooku
 			
 			//for each bin
 			vector<string> newBinLabels;
+			string snumBins = toString(thislookup[0]->getNumBins());
 			for (int i = 0; i < thislookup[0]->getNumBins(); i++) {
 				if (m->control_pressed) { for (int j = 0; j < newLookup.size(); j++) {  delete newLookup[j];  } return 0; }
 				
@@ -476,7 +490,13 @@ int SharedRAbundVector::eliminateZeroOTUS(vector<SharedRAbundVector*>& thislooku
 					}
 					
 					//if there is a bin label use it otherwise make one
-					string binLabel = "Otu" + toString(i+1);
+					string binLabel = "Otu";
+					string sbinNumber = toString(i+1);
+					if (sbinNumber.length() < snumBins.length()) { 
+						int diff = snumBins.length() - sbinNumber.length();
+						for (int h = 0; h < diff; h++) { binLabel += "0"; }
+					}
+					binLabel += sbinNumber; 
 					if (i < m->currentBinLabels.size()) {  binLabel = m->currentBinLabels[i]; }
 					
 					newBinLabels.push_back(binLabel);