]> git.donarmstrong.com Git - mothur.git/blobdiff - inputdata.cpp
fixes while testing 1.33.0
[mothur.git] / inputdata.cpp
index bf783a35d5e06e12fa4fcf2c3ff58ba7d9618778..c9142b7a356de09f0fddd89ae5f415993f4795c3 100644 (file)
 /***********************************************************************/
 
 InputData::InputData(string fName, string f) : format(f){
-       
-       openInputFile(fName, fileHandle);
+       m = MothurOut::getInstance();
+       m->openInputFile(fName, fileHandle);
        filename = fName;
-       
+       m->saveNextLabel = "";
 }
-
 /***********************************************************************/
 
-
 InputData::~InputData(){
        fileHandle.close();
-//     delete output;
-       
+       m->saveNextLabel = "";
 }
 
 /***********************************************************************/
 
 InputData::InputData(string fName, string orderFileName, string f) : format(f){
        try {
-               
+               m = MothurOut::getInstance();
                ifstream ofHandle;
-               openInputFile(orderFileName, ofHandle);
+               m->openInputFile(orderFileName, ofHandle);
                string name;
 
                int count = 0;
@@ -45,14 +42,16 @@ InputData::InputData(string fName, string orderFileName, string f) : format(f){
                        ofHandle >> name;
                        orderMap[name] = count;
                        count++;
-                       gobble(ofHandle);
+                       m->gobble(ofHandle);
                }
                ofHandle.close();
        
-               openInputFile(fName, fileHandle);
+               m->openInputFile(fName, fileHandle);
+               m->saveNextLabel = "";
+               
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "InputData");
+               m->errorOut(e, "InputData", "InputData");
                exit(1);
        }
 }
@@ -60,12 +59,12 @@ InputData::InputData(string fName, string orderFileName, string f) : format(f){
 
 ListVector* InputData::getListVector(){
        try {
-               if(fileHandle){
+               if(!fileHandle.eof()){
                        if(format == "list") {
                                list = new ListVector(fileHandle);
                        }else{ list = NULL;  }
                                        
-                       gobble(fileHandle);
+                       m->gobble(fileHandle);
                        return list;
                }
                else{
@@ -73,18 +72,18 @@ ListVector* InputData::getListVector(){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getListVector");
+               m->errorOut(e, "InputData", "getListVector");
                exit(1);
        }
 }
 
 /***********************************************************************/
-
 ListVector* InputData::getListVector(string label){
        try {
                ifstream in;
                string  thisLabel;
-               openInputFile(filename, in);
+               m->openInputFile(filename, in);
+        m->saveNextLabel = "";
                
                if(in){
 
@@ -99,7 +98,7 @@ ListVector* InputData::getListVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete list;    }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
                        }else{ list = NULL;  }
                        
@@ -111,11 +110,45 @@ ListVector* InputData::getListVector(string label){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getListVector");
+               m->errorOut(e, "InputData", "getListVector");
                exit(1);
        }
 }
+/***********************************************************************/
+ListVector* InputData::getListVector(string label, bool resetFP){
+       try {
+               string  thisLabel;
+               fileHandle.clear();
+               fileHandle.seekg(0);
+        m->saveNextLabel = "";
+               
+               if(fileHandle){
 
+                       if (format == "list") {
+                       
+                               while (fileHandle.eof() != true) {
+                                       
+                                       list = new ListVector(fileHandle); m->gobble(fileHandle);
+                                       thisLabel = list->getLabel();
+                                       
+                                       //if you are at the last label
+                                       if (thisLabel == label) {  break;  }
+                                       //so you don't loose this memory
+                                       else {  delete list;    }
+                               }
+                       }else{ list = NULL;  }
+               
+                       return list;
+               }
+               else{
+                       return NULL;
+               }
+       }
+       catch(exception& e) {
+               m->errorOut(e, "InputData", "getListVector");
+               exit(1);
+       }
+}
 
 /***********************************************************************/
 
@@ -126,7 +159,7 @@ SharedListVector* InputData::getSharedListVector(){
                                SharedList = new SharedListVector(fileHandle);
                        }else{ SharedList = NULL;  }
                                        
-                       gobble(fileHandle);
+                       m->gobble(fileHandle);
                        return SharedList;
                }
                else{
@@ -134,7 +167,7 @@ SharedListVector* InputData::getSharedListVector(){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getSharedListVector");
+               m->errorOut(e, "InputData", "getSharedListVector");
                exit(1);
        }
 }
@@ -144,7 +177,7 @@ SharedListVector* InputData::getSharedListVector(string label){
        try {
                ifstream in;
                string  thisLabel;
-               openInputFile(filename, in);
+               m->openInputFile(filename, in);
                
                if(in){
 
@@ -159,7 +192,7 @@ SharedListVector* InputData::getSharedListVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete SharedList;      }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }else{ SharedList = NULL;  }
@@ -172,7 +205,7 @@ SharedListVector* InputData::getSharedListVector(string label){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getSharedListVector");
+               m->errorOut(e, "InputData", "getSharedListVector");
                exit(1);
        }
 }
@@ -188,7 +221,7 @@ SharedOrderVector* InputData::getSharedOrderVector(){
                                SharedOrder = new SharedOrderVector(fileHandle);
                        }else{ SharedOrder = NULL;  }
                                
-                       gobble(fileHandle);
+                       m->gobble(fileHandle);
                        return SharedOrder;
                        
                }else{
@@ -196,7 +229,7 @@ SharedOrderVector* InputData::getSharedOrderVector(){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getSharedOrderVector");
+               m->errorOut(e, "InputData", "getSharedOrderVector");
                exit(1);
        }
 }
@@ -207,7 +240,8 @@ SharedOrderVector* InputData::getSharedOrderVector(string label){
        try {
                ifstream in;
                string  thisLabel;
-               openInputFile(filename, in);
+               m->openInputFile(filename, in);
+        m->saveNextLabel = "";
                
                if(in){
 
@@ -222,7 +256,7 @@ SharedOrderVector* InputData::getSharedOrderVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete SharedOrder;     }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }else{ SharedOrder = NULL;  }
@@ -235,7 +269,7 @@ SharedOrderVector* InputData::getSharedOrderVector(string label){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getSharedOrderVector");
+               m->errorOut(e, "InputData", "getSharedOrderVector");
                exit(1);
        }
 }
@@ -262,8 +296,8 @@ OrderVector* InputData::getOrderVector(){
                        else if(format == "sabund"){
                                input = new SAbundVector(fileHandle);
                        }
-                       
-                       gobble(fileHandle);
+                                               
+                       m->gobble(fileHandle);
                        
                        output = new OrderVector();     
                        *output = (input->getOrderVector());
@@ -275,7 +309,7 @@ OrderVector* InputData::getOrderVector(){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getOrderVector");
+               m->errorOut(e, "InputData", "getOrderVector");
                exit(1);
        }
 }
@@ -286,11 +320,11 @@ OrderVector* InputData::getOrderVector(string label){
        
                ifstream in;
                string  thisLabel;
-               openInputFile(filename, in);
+               m->openInputFile(filename, in);
                
                if(in){
                        if((format == "list") || (format == "listorder")) {
-                       
+                m->saveNextLabel = "";
                                while (in.eof() != true) {
                                        
                                        input = new ListVector(in);
@@ -300,11 +334,11 @@ OrderVector* InputData::getOrderVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
                        }
                        else if (format == "shared")  {
-                               
+                               m->saveNextLabel = "";
                                while (in.eof() != true) {
                                        
                                        input = new SharedListVector(in);
@@ -314,7 +348,7 @@ OrderVector* InputData::getOrderVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }
@@ -329,7 +363,7 @@ OrderVector* InputData::getOrderVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }
@@ -344,7 +378,7 @@ OrderVector* InputData::getOrderVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }
@@ -359,12 +393,12 @@ OrderVector* InputData::getOrderVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                        
                                }
 
                        }
-                       
+                                               
                        in.close();             
 
                        output = new OrderVector();
@@ -378,7 +412,7 @@ OrderVector* InputData::getOrderVector(string label){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getOrderVector");
+               m->errorOut(e, "InputData", "getOrderVector");
                exit(1);
        }
 }
@@ -395,11 +429,12 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(){
                                }
                        }else if (format == "shared") {
                                SharedList = new SharedListVector(fileHandle);
+                               
                                if (SharedList != NULL) {
                                        return SharedList->getSharedRAbundVector();
                                }
                        }
-                       gobble(fileHandle);
+                       m->gobble(fileHandle);
                }
                                
                //this is created to signal to calling function that the input file is at eof
@@ -408,7 +443,7 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(){
                
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getSharedRAbundVectors");
+               m->errorOut(e, "InputData", "getSharedRAbundVectors");
                exit(1);
        }
 }
@@ -418,8 +453,9 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(string label){
                ifstream in;
                string  thisLabel;
                
-               openInputFile(filename, in);
-               
+               m->openInputFile(filename, in);
+               m->saveNextLabel = "";
+       
                if(in){
                        if (format == "sharedfile")  {
                                while (in.eof() != true) {
@@ -427,6 +463,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 {
@@ -436,13 +473,14 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(string label){
                                                        delete SharedRAbund;
                                                }
                                        }else{  break;  }
-                                       gobble(in);
+                                       m->gobble(in);
                                        
                                }
                        }else if (format == "shared") {
                                while (in.eof() != true) {
                                        
                                        SharedList = new SharedListVector(in);
+                                       
                                        if (SharedList != NULL) {
                                                thisLabel = SharedList->getLabel();
                                                //if you are at the last label
@@ -452,7 +490,7 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(string label){
                                                        delete SharedList;
                                                }
                                        }else{  break;  }
-                                       gobble(in);
+                                       m->gobble(in);
                                        
                                }
                        
@@ -466,12 +504,109 @@ vector<SharedRAbundVector*> InputData::getSharedRAbundVectors(string label){
        
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getSharedRAbundVectors");
+               m->errorOut(e, "InputData", "getSharedRAbundVectors");
                exit(1);
        }
 }
 
-
+/***********************************************************************/
+//this is used when you don't need the order vector
+vector<SharedRAbundFloatVector*> InputData::getSharedRAbundFloatVectors(){
+       try {
+               if(fileHandle){
+                       if (format == "relabund")  {
+                               SharedRAbundFloatVector* SharedRelAbund = new SharedRAbundFloatVector(fileHandle);
+                               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);
+               }
+                               
+               //this is created to signal to calling function that the input file is at eof
+               vector<SharedRAbundFloatVector*> null;  null.push_back(NULL);
+               return null;
+               
+       }
+       catch(exception& e) {
+               m->errorOut(e, "InputData", "getSharedRAbundFloatVectors");
+               exit(1);
+       }
+}
+/***********************************************************************/
+vector<SharedRAbundFloatVector*> InputData::getSharedRAbundFloatVectors(string label){
+       try {
+               ifstream in;
+               string  thisLabel;
+               
+               m->openInputFile(filename, in);
+               m->saveNextLabel = "";
+               
+               if(in){
+                       if (format == "relabund")  {
+                               while (in.eof() != true) {
+                                       
+                                       SharedRAbundFloatVector* SharedRelAbund = new SharedRAbundFloatVector(in);
+                                       if (SharedRelAbund != NULL) {
+                                               thisLabel = SharedRelAbund->getLabel();
+                                               //if you are at the last label
+                                               if (thisLabel == label) {  in.close(); return SharedRelAbund->getSharedRAbundFloatVectors();  }
+                                               else {
+                                                       //so you don't loose this memory
+                                                       vector<SharedRAbundFloatVector*> lookup = SharedRelAbund->getSharedRAbundFloatVectors(); 
+                                                       for (int i = 0; i < lookup.size(); i++) {  delete lookup[i];  }
+                                                       delete SharedRelAbund;
+                                               }
+                                       }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);
+               in.close();
+               return null;
+       
+       }
+       catch(exception& e) {
+               m->errorOut(e, "InputData", "getSharedRAbundFloatVectors");
+               exit(1);
+       }
+}
 /***********************************************************************/
 
 SAbundVector* InputData::getSAbundVector(){
@@ -491,9 +626,8 @@ SAbundVector* InputData::getSAbundVector(){
                        }
                        else if(format == "sabund"){
                                input = new SAbundVector(fileHandle);
-                       }
-                                       
-                       gobble(fileHandle);
+                       }                                       
+                       m->gobble(fileHandle);
 
                        sabund = new SAbundVector();
                        *sabund = (input->getSAbundVector());
@@ -505,7 +639,7 @@ SAbundVector* InputData::getSAbundVector(){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getSAbundVector");
+               m->errorOut(e, "InputData", "getSAbundVector");
                exit(1);
        }
 }
@@ -515,11 +649,11 @@ SAbundVector* InputData::getSAbundVector(string label){
        
                ifstream in;
                string  thisLabel;
-               openInputFile(filename, in);
+               m->openInputFile(filename, in);
                
                if(in){
                        if (format == "list") {
-                       
+                m->saveNextLabel = "";
                                while (in.eof() != true) {
                                        
                                        input = new ListVector(in);
@@ -529,11 +663,11 @@ SAbundVector* InputData::getSAbundVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
                        }
                        else if (format == "shared")  {
-                               
+                               m->saveNextLabel = "";
                                while (in.eof() != true) {
                                        
                                        input = new SharedListVector(in);
@@ -543,7 +677,7 @@ SAbundVector* InputData::getSAbundVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }
@@ -558,7 +692,7 @@ SAbundVector* InputData::getSAbundVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }
@@ -573,7 +707,7 @@ SAbundVector* InputData::getSAbundVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }
@@ -588,7 +722,7 @@ SAbundVector* InputData::getSAbundVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                        
                                }
 
@@ -607,7 +741,7 @@ SAbundVector* InputData::getSAbundVector(string label){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getSAbundVector");
+               m->errorOut(e, "InputData", "getSAbundVector");
                exit(1);
        }
 }
@@ -631,8 +765,8 @@ RAbundVector* InputData::getRAbundVector(){
                        else if(format == "sabund"){
                                input = new SAbundVector(fileHandle);
                        }
-                                       
-                       gobble(fileHandle);
+                       
+                       m->gobble(fileHandle);
 
                        rabund = new RAbundVector();
                        *rabund = (input->getRAbundVector());
@@ -644,7 +778,7 @@ RAbundVector* InputData::getRAbundVector(){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getRAbundVector");
+               m->errorOut(e, "InputData", "getRAbundVector");
                exit(1);
        }
 }
@@ -654,10 +788,11 @@ RAbundVector* InputData::getRAbundVector(string label){
        
                ifstream in;
                string  thisLabel;
-               openInputFile(filename, in);
+               m->openInputFile(filename, in);
                
                if(in){
                        if (format == "list") {
+                m->saveNextLabel = "";
                        
                                while (in.eof() != true) {
                                        
@@ -668,10 +803,11 @@ RAbundVector* InputData::getRAbundVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
                        }
                        else if (format == "shared")  {
+                m->saveNextLabel = "";
                                
                                while (in.eof() != true) {
                                        
@@ -682,7 +818,7 @@ RAbundVector* InputData::getRAbundVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }
@@ -697,7 +833,7 @@ RAbundVector* InputData::getRAbundVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }
@@ -712,7 +848,7 @@ RAbundVector* InputData::getRAbundVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                }
 
                        }
@@ -727,11 +863,12 @@ RAbundVector* InputData::getRAbundVector(string label){
                                        if (thisLabel == label) {  break;  }
                                        //so you don't loose this memory
                                        else {  delete input;   }
-                                       gobble(in);
+                                       m->gobble(in);
                                        
                                }
 
-                       }
+                       }                       
+                       
                        
                        in.close();             
 
@@ -745,7 +882,7 @@ RAbundVector* InputData::getRAbundVector(string label){
                }
        }
        catch(exception& e) {
-               errorOut(e, "InputData", "getRAbundVector");
+               m->errorOut(e, "InputData", "getRAbundVector");
                exit(1);
        }
 }