X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readotu.cpp;h=286a2be271a4a7bb2225a71c7081b1a5c8eb4571;hb=753dc84cf289b1d5dc0ca5b0c043640927aa951a;hp=09a6c4cd00f58d5fc09424972c3f6ae93c88542d;hpb=de2dc9fb831f569b823031d0730f5a0d739e8290;p=mothur.git diff --git a/readotu.cpp b/readotu.cpp index 09a6c4c..286a2be 100644 --- a/readotu.cpp +++ b/readotu.cpp @@ -31,21 +31,24 @@ void ReadOTUFile::read(GlobalData* globaldata){ }else {//there is an orderfile input = new InputData(philFile, globaldata->getOrderFile(), globaldata->getFormat()); } - +//cout << "made it here" << endl; //memory leak prevention //if (globaldata->ginput != NULL) { delete globaldata->ginput; } globaldata->ginput = input; //saving to be used by collector and rarefact commands. - +//cout << "after input" << endl; if ((globaldata->getFormat() == "list") || (globaldata->getFormat() == "rabund") || (globaldata->getFormat() == "sabund")) {//you are reading a list, rabund or sabund file for collect, rarefaction or summary. order = input->getOrderVector(); //memory leak prevention //if (globaldata->gorder != NULL) { delete globaldata->gorder; } globaldata->gorder = order; //saving to be used by collect and rarefact commands. sabund = inputSabund->getSAbundVector(); + //if (globaldata->sabund != NULL) { delete globaldata->sabund; } globaldata->sabund = sabund; //saving to be used by summary command. rabund = inputRabund->getRAbundVector(); + //if (globaldata->rabund != NULL) { delete globaldata->rabund; } globaldata->rabund = rabund; //saving to be used by heatmap.bin command. list = inputList->getListVector(); + //if (globaldata->gListVector != NULL) { delete globaldata->gListVector; } globaldata->gListVector = list; }else if (globaldata->getFormat() == "shared") {