X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=normalizesharedcommand.cpp;h=bbf9a8335a3c2847f89b8cf136670c03a73e9725;hb=ee8403d4eb5760187d62b42a9cf4272de8fc0ec4;hp=bcec00a0bc6dd47e15ddcf72000dc4a9dbec9469;hpb=55386dddad84cc1140d736cabaf4dd0ae16f2e01;p=mothur.git

diff --git a/normalizesharedcommand.cpp b/normalizesharedcommand.cpp
index bcec00a..bbf9a83 100644
--- a/normalizesharedcommand.cpp
+++ b/normalizesharedcommand.cpp
@@ -176,7 +176,7 @@ NormalizeSharedCommand::NormalizeSharedCommand(string option) {
 			if (temp == "not found") {  
 				norm = 0;  //once you have read, set norm to smallest group number
 			}else { 
-				convert(temp, norm);
+				m->mothurConvert(temp, norm);
 				if (norm < 0) { m->mothurOut("norm must be positive."); m->mothurOutEndLine(); abort=true; }
 			}
 			
@@ -632,6 +632,7 @@ int NormalizeSharedCommand::eliminateZeroOTUS(vector<SharedRAbundVector*>& thisl
 		
 		//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; }
 		
@@ -647,7 +648,13 @@ int NormalizeSharedCommand::eliminateZeroOTUS(vector<SharedRAbundVector*>& thisl
 					newLookup[j]->push_back(thislookup[j]->getAbundance(i), thislookup[j]->getGroup());
 				}
 				//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);
@@ -681,6 +688,7 @@ int NormalizeSharedCommand::eliminateZeroOTUS(vector<SharedRAbundFloatVector*>&
 		
 		//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; }
 			
@@ -696,7 +704,13 @@ int NormalizeSharedCommand::eliminateZeroOTUS(vector<SharedRAbundFloatVector*>&
 					newLookup[j]->push_back(thislookup[j]->getAbundance(i), thislookup[j]->getGroup());
 				}
 				//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);