X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=sharedordervector.cpp;h=80b8fb9bd45a8596e91afe30fdec3984b2411de6;hp=3944212ea99e688cea1e04af5bd559044869505d;hb=499f4ac6e321f9f03d4c3aa25c3b6880892c8b83;hpb=260ae19c36cb11a53ddc5a75b5e507f8dd8b31d6

diff --git a/sharedordervector.cpp b/sharedordervector.cpp
index 3944212..80b8fb9 100644
--- a/sharedordervector.cpp
+++ b/sharedordervector.cpp
@@ -28,10 +28,9 @@ SharedOrderVector::SharedOrderVector(string id, vector<individual>  ov) :
 
 SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() {  //reads in a shared file
 	try {
-		globaldata = GlobalData::getInstance();
 		maxRank = 0; numBins = 0; numSeqs = 0;
-		
-		if (globaldata->gGroupmap == NULL) {  groupmap = new GroupMap(); }
+				
+		groupmap = new GroupMap(); 
 		
 		int num, inputData, count;
 		count = 0;  numSeqs = 0;
@@ -39,14 +38,50 @@ SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() {  //reads in a
 		individual newguy;
 		
 		//read in first row since you know there is at least 1 group.
-		f >> label >> groupN >> num;
+		//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"
+				f >> label; m->gobble(f);
+				
+				//gets "numOtus"
+				f >> label; m->gobble(f);
+				
+				//eat rest of line
+				label = m->getline(f); m->gobble(f);
+				
+				//parse labels to save
+				istringstream iStringStream(label);
+				m->sharedBinLabelsInFile.clear();
+				while(!iStringStream.eof()){
+					if (m->control_pressed) { break; }
+					string temp;
+					iStringStream >> temp;  m->gobble(iStringStream);
+					
+					m->sharedBinLabelsInFile.push_back(temp);
+				}
+				
+				f >> label;
+			}
+		}else { label = m->saveNextLabel; }
+		
+		//reset labels, currentLabels may have gotten changed as otus were eliminated because of group choices or sampling
+		m->currentSharedBinLabels = m->sharedBinLabelsInFile;
+		
+		//read in first row since you know there is at least 1 group.
+		f >> groupN >> num;
+		
 		holdLabel = label;
 		
-		if (globaldata->gGroupmap == NULL) { 
-			//save group in groupmap
-			groupmap->namesOfGroups.push_back(groupN);
-			groupmap->groupIndex[groupN] = 0;
-		}
+		
+		vector<string> allGroups;
+		//save group in groupmap
+		allGroups.push_back(groupN);
+		groupmap->groupIndex[groupN] = 0;
+		
 		
 		for(int i=0;i<num;i++){
 			f >> inputData;
@@ -59,18 +94,18 @@ SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() {  //reads in a
 		
 		m->gobble(f); 
 		
-		if (f.eof() != true) { f >> nextLabel; }
+		if (!(f.eof())) { f >> nextLabel; }
 		
 		//read the rest of the groups info in
 		while ((nextLabel == holdLabel) && (f.eof() != true)) {
 			f >> groupN >> num;
 			count++;
 			
-			if (globaldata->gGroupmap == NULL) { 
-				//save group in groupmap
-				groupmap->namesOfGroups.push_back(groupN);
-				groupmap->groupIndex[groupN] = count;
-			}
+			
+			//save group in groupmap
+			allGroups.push_back(groupN);
+			groupmap->groupIndex[groupN] = count;
+			
 			
 			for(int i=0;i<num;i++){
 				f >> inputData;
@@ -87,10 +122,10 @@ SharedOrderVector::SharedOrderVector(ifstream& f) : DataVector() {  //reads in a
 
 		}
 		
-		//put file pointer back since you are now at a new distance label
-		for (int i = 0; i < nextLabel.length(); i++) { f.unget();  }
-	
-		if (globaldata->gGroupmap == NULL) { globaldata->gGroupmap = groupmap; }
+		m->saveNextLabel = nextLabel;
+			
+		groupmap->setNamesOfGroups(allGroups);
+		m->setAllGroups(allGroups);
 		
 		updateStats();
 		
@@ -171,7 +206,14 @@ void SharedOrderVector::print(ostream& output){
 	}
 }
 
+/***********************************************************************/
 
+void SharedOrderVector::clear(){
+	numBins = 0;
+	maxRank = 0;
+	numSeqs = 0;
+	data.clear();
+}
 /***********************************************************************/
 
 void SharedOrderVector::resize(int){
@@ -279,8 +321,12 @@ vector<SharedRAbundVector*> SharedOrderVector::getSharedRAbundVector() {
 		util = new SharedUtil();
 		vector<SharedRAbundVector*> lookup;
 		
-		util->setGroups(globaldata->Groups, globaldata->gGroupmap->namesOfGroups);
-		util->getSharedVectors(globaldata->Groups, lookup, this);
+		vector<string> Groups = m->getGroups();
+		vector<string> allGroups = m->getAllGroups();
+		util->setGroups(Groups, allGroups);
+		util->getSharedVectors(Groups, lookup, this);
+		m->setGroups(Groups);
+		m->setAllGroups(allGroups);
 		
 		return lookup;
 	}