X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=inputdata.cpp;h=b237bb4fc55b0bacafa3815f9619f0345bd31492;hb=753dc84cf289b1d5dc0ca5b0c043640927aa951a;hp=2c249e6a4a42b89a93b48a4252c60613f40fae9f;hpb=d59f91eb1230d2c7867a92cb86138b7003100ab4;p=mothur.git diff --git a/inputdata.cpp b/inputdata.cpp index 2c249e6..b237bb4 100644 --- a/inputdata.cpp +++ b/inputdata.cpp @@ -24,7 +24,7 @@ InputData::InputData(string fName, string f) : format(f){ InputData::~InputData(){ - + fileHandle.close(); // delete output; } @@ -183,14 +183,14 @@ OrderVector* InputData::getOrderVector(){ } } /***********************************************************************/ - +//this is used when you don't need the order vector vector InputData::getSharedRAbundVectors(){ try { if(fileHandle){ if (format == "sharedfile") { - SharedOrder = new SharedOrderVector(fileHandle); - if (SharedOrder != NULL) { - return SharedOrder->getSharedRAbundVector(); + SharedRAbundVector* SharedRAbund = new SharedRAbundVector(fileHandle); + if (SharedRAbund != NULL) { + return SharedRAbund->getSharedRAbundVectors(); } }else if (format == "shared") { SharedList = new SharedListVector(fileHandle); @@ -216,6 +216,7 @@ vector InputData::getSharedRAbundVectors(){ } } + /***********************************************************************/ SAbundVector* InputData::getSAbundVector(){