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

diff --git a/sharedrabundvector.cpp b/sharedrabundvector.cpp
index f42d24b..9b2bb67 100644
--- a/sharedrabundvector.cpp
+++ b/sharedrabundvector.cpp
@@ -55,7 +55,7 @@ SharedRAbundVector::SharedRAbundVector(string id, vector<individual> rav) : Data
 }
 
 
-/***********************************************************************/
+***********************************************************************/
 //reads a shared file
 SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0), numBins(0), numSeqs(0) {
 	try {
@@ -72,7 +72,7 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0),
 		//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"
@@ -95,16 +95,38 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0),
 					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;
+            
+            if (m->debug) { m->mothurOut("[DEBUG]: "+ groupN + '\t' + toString(num)); }
+        }
 		
 		//reset labels, currentLabels may have gotten changed as otus were eliminated because of group choices or sampling
 		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
@@ -118,6 +140,7 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0),
 		//fill vector.  data = first sharedrabund in file
 		for(int i=0;i<num;i++){
 			f >> inputData;
+            if (m->debug) { m->mothurOut("[DEBUG]: OTU" + toString(i+1)+ '\t' +toString(inputData)); }
 			
 			lookup[0]->push_back(inputData, groupN); //abundance, bin, group
 			push_back(inputData, groupN);
@@ -132,6 +155,7 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0),
 		//read the rest of the groups info in
 		while ((nextLabel == holdLabel) && (f.eof() != true)) {
 			f >> groupN >> num;
+            if (m->debug) { m->mothurOut("[DEBUG]: "+ groupN + '\t' + toString(num)); }
 			count++;
 			
 			allGroups.push_back(groupN);
@@ -145,6 +169,7 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0),
 			//fill vector.  
 			for(int i=0;i<num;i++){
 				f >> inputData;
+                if (m->debug) { m->mothurOut("[DEBUG]: OTU" + toString(i+1)+ '\t' +toString(inputData)); }
 				
 				lookup[count]->push_back(inputData, groupN); //abundance, bin, group
 			}
@@ -155,7 +180,6 @@ SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0),
 		}
 		m->saveNextLabel = nextLabel;
 		m->setAllGroups(allGroups);
-		
 	}
 	catch(exception& e) {
 		m->errorOut(e, "SharedRAbundVector", "SharedRAbundVector");
@@ -192,6 +216,18 @@ int SharedRAbundVector::getAbundance(int index){
 	return data[index].abundance;
 	
 }
+/***********************************************************************/
+//returns vector of abundances 
+vector<int> SharedRAbundVector::getAbundances(){
+    vector<int> abunds;
+    for (int i = 0; i < data.size(); i++) {
+        abunds.push_back(data[i].abundance);
+    }
+    
+	return abunds;
+}
+
+
 /***********************************************************************/
 
 int SharedRAbundVector::numNZ(){