X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=inputdata.cpp;h=8b1829a3db697df21b3d0f64bf6be6cfea15c536;hb=bd27c2b0612942815b7417c79f7ee41f669a2a34;hp=5d71450ef60bb0fe5c972d6c38fe67565a5687e7;hpb=a76d81690125ca57d7f602ac93abad75cf9796c2;p=mothur.git

diff --git a/inputdata.cpp b/inputdata.cpp
index 5d71450..8b1829a 100644
--- a/inputdata.cpp
+++ b/inputdata.cpp
@@ -18,18 +18,13 @@ InputData::InputData(string fName, string f) : format(f){
 	m = MothurOut::getInstance();
 	m->openInputFile(fName, fileHandle);
 	filename = fName;
-	
+	m->saveNextLabel = "";
 }
-
 /***********************************************************************/
 
-
 InputData::~InputData(){
 	fileHandle.close();
-	globaldata = GlobalData::getInstance();
-	globaldata->saveNextLabel = "";
-//	delete output;
-	
+	m->saveNextLabel = "";
 }
 
 /***********************************************************************/
@@ -52,6 +47,8 @@ InputData::InputData(string fName, string orderFileName, string f) : format(f){
 		ofHandle.close();
 	
 		m->openInputFile(fName, fileHandle);
+		m->saveNextLabel = "";
+		
 	}
 	catch(exception& e) {
 		m->errorOut(e, "InputData", "InputData");
@@ -296,7 +293,7 @@ OrderVector* InputData::getOrderVector(){
 			else if(format == "sabund"){
 				input = new SAbundVector(fileHandle);
 			}
-			
+						
 			m->gobble(fileHandle);
 			
 			output = new OrderVector();	
@@ -398,7 +395,7 @@ OrderVector* InputData::getOrderVector(string label){
 				}
 
 			}
-			
+						
 			in.close();		
 
 			output = new OrderVector();
@@ -429,6 +426,7 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(){
 				}
 			}else if (format == "shared") {
 				SharedList = new SharedListVector(fileHandle);
+				
 				if (SharedList != NULL) {
 					return SharedList->getSharedRAbundVector();
 				}
@@ -453,7 +451,8 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(string label){
 		string  thisLabel;
 		
 		m->openInputFile(filename, in);
-		
+		m->saveNextLabel = "";
+	
 		if(in){
 			if (format == "sharedfile")  {
 				while (in.eof() != true) {
@@ -461,6 +460,7 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(string label){
 					SharedRAbundVector* SharedRAbund = new SharedRAbundVector(in);
 					if (SharedRAbund != NULL) {
 						thisLabel = SharedRAbund->getLabel();
+					
 						//if you are at the last label
 						if (thisLabel == label) {  in.close(); return SharedRAbund->getSharedRAbundVectors();  }
 						else {
@@ -477,6 +477,7 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(string label){
 				while (in.eof() != true) {
 					
 					SharedList = new SharedListVector(in);
+					
 					if (SharedList != NULL) {
 						thisLabel = SharedList->getLabel();
 						//if you are at the last label
@@ -515,6 +516,15 @@ vector<SharedRAbundFloatVector*> InputData::getSharedRAbundFloatVectors(){
 				if (SharedRelAbund != NULL) {
 					return SharedRelAbund->getSharedRAbundFloatVectors();
 				}
+			}else if (format == "sharedfile")  {
+				SharedRAbundVector* SharedRAbund = new SharedRAbundVector(fileHandle);
+				if (SharedRAbund != NULL) {
+					vector<SharedRAbundVector*> lookup = SharedRAbund->getSharedRAbundVectors(); 
+					vector<SharedRAbundFloatVector*> lookupFloat = SharedRAbund->getSharedRAbundFloatVectors(lookup); 
+					for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } lookup.clear();
+					return lookupFloat;  
+				}
+						
 			}
 			m->gobble(fileHandle);
 		}
@@ -536,9 +546,10 @@ vector<SharedRAbundFloatVector*> InputData::getSharedRAbundFloatVectors(string l
 		string  thisLabel;
 		
 		m->openInputFile(filename, in);
+		m->saveNextLabel = "";
 		
 		if(in){
-			if (format == "sharedfile")  {
+			if (format == "relabund")  {
 				while (in.eof() != true) {
 					
 					SharedRAbundFloatVector* SharedRelAbund = new SharedRAbundFloatVector(in);
@@ -555,8 +566,32 @@ vector<SharedRAbundFloatVector*> InputData::getSharedRAbundFloatVectors(string l
 					}else{  break;  }
 					m->gobble(in);
 				}
-			}
+			}else if (format == "sharedfile")  {
+				while (in.eof() != true) {
+					
+					SharedRAbundVector* SharedRAbund = new SharedRAbundVector(in);
+					if (SharedRAbund != NULL) {
+						thisLabel = SharedRAbund->getLabel();
+						
+						//if you are at the last label
+						if (thisLabel == label) {  
+							in.close(); 
+							vector<SharedRAbundVector*> lookup = SharedRAbund->getSharedRAbundVectors(); 
+							vector<SharedRAbundFloatVector*> lookupFloat = SharedRAbund->getSharedRAbundFloatVectors(lookup); 
+							for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } lookup.clear();
+							return lookupFloat;  
+						}else {
+							//so you don't loose this memory
+							vector<SharedRAbundVector*> lookup = SharedRAbund->getSharedRAbundVectors(); 
+							for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; } lookup.clear();
+							delete SharedRAbund;
+						}
+					}else{  break;  }
+					m->gobble(in);
+				}
+			}	
 		}
+		
 				
 		//this is created to signal to calling function that the input file is at eof
 		vector<SharedRAbundFloatVector*> null;  null.push_back(NULL);
@@ -588,8 +623,7 @@ SAbundVector* InputData::getSAbundVector(){
 			}
 			else if(format == "sabund"){
 				input = new SAbundVector(fileHandle);
-			}
-					
+			}					
 			m->gobble(fileHandle);
 
 			sabund = new SAbundVector();
@@ -728,7 +762,7 @@ RAbundVector* InputData::getRAbundVector(){
 			else if(format == "sabund"){
 				input = new SAbundVector(fileHandle);
 			}
-					
+			
 			m->gobble(fileHandle);
 
 			rabund = new RAbundVector();
@@ -828,7 +862,8 @@ RAbundVector* InputData::getRAbundVector(string label){
 					
 				}
 
-			}
+			}			
+			
 			
 			in.close();