X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedrabundfloatvector.cpp;h=fa32fc43a873d22482cfcb8e4172343f3516cbce;hb=1a968f34ae2d2680eaf189a197d1a21b8dfd6c03;hp=8abf92023620096dd820dbf2f16fcfb1fe34464c;hpb=91a27e0483827c06c21c4fe89558923bbfe86573;p=mothur.git

diff --git a/sharedrabundfloatvector.cpp b/sharedrabundfloatvector.cpp
index 8abf920..fa32fc4 100644
--- a/sharedrabundfloatvector.cpp
+++ b/sharedrabundfloatvector.cpp
@@ -48,7 +48,7 @@ SharedRAbundFloatVector::SharedRAbundFloatVector(ifstream& f) : DataVector(), ma
 		//are we at the beginning of the file??
 		if (m->saveNextLabel == "") {  
 			f >> label; 
-			
+            
 			//is this a shared file that has headers
 			if (label == "label") { 
 				//gets "group"
@@ -67,20 +67,40 @@ SharedRAbundFloatVector::SharedRAbundFloatVector(ifstream& f) : DataVector(), ma
 					if (m->control_pressed) { break; }
 					string temp;
 					iStringStream >> temp;  m->gobble(iStringStream);
-					
+                    
 					m->binLabelsInFile.push_back(temp);
 				}
 				
-				f >> label;
-			}
-		}else { label = m->saveNextLabel; }
+				f >> label >> groupN >> num;
+			}else {
+                //read in first row since you know there is at least 1 group.
+                f >> groupN >> num;
+                
+                //make binlabels because we don't have any
+                string snumBins = toString(num);
+                m->binLabelsInFile.clear();
+                for (int i = 0; i < num; i++) {  
+                    //if there is a bin label use it otherwise make one
+                    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;
+                    m->binLabelsInFile.push_back(binLabel);
+                }
+            }
+		}else { 
+            label = m->saveNextLabel; 
+            
+            //read in first row since you know there is at least 1 group.
+            f >> groupN >> num;
+        }
 		
 		//reset labels, currentLabels may have gotten changed as otus were eliminated because of group choices or sampling
-		m->currentBinLabels = m-> binLabelsInFile;
+		m->currentBinLabels = m->binLabelsInFile;
 		
-		//read in first row since you know there is at least 1 group.
-		f >> groupN >> num;
-
 		holdLabel = label;
 		
 		//add new vector to lookup
@@ -108,6 +128,7 @@ SharedRAbundFloatVector::SharedRAbundFloatVector(ifstream& f) : DataVector(), ma
 		//read the rest of the groups info in
 		while ((nextLabel == holdLabel) && (f.eof() != true)) {
 			f >> groupN >> num;
+            
 			count++;
 			
 			allGroups.push_back(groupN);
@@ -131,7 +152,6 @@ SharedRAbundFloatVector::SharedRAbundFloatVector(ifstream& f) : DataVector(), ma
 		
 		m->saveNextLabel = nextLabel;
 		m->setAllGroups(allGroups);
-	
 	}
 	catch(exception& e) {
 		m->errorOut(e, "SharedRAbundFloatVector", "SharedRAbundFloatVector");