X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=sharedlistvector.cpp;h=4774180dd6032c0de1b87597360af6d14e7c2a2d;hb=753dc84cf289b1d5dc0ca5b0c043640927aa951a;hp=33d3692659fefde48883e83dd0c7dcaf3fbdb67e;hpb=de2dc9fb831f569b823031d0730f5a0d739e8290;p=mothur.git diff --git a/sharedlistvector.cpp b/sharedlistvector.cpp index 33d3692..4774180 100644 --- a/sharedlistvector.cpp +++ b/sharedlistvector.cpp @@ -16,11 +16,11 @@ /***********************************************************************/ -SharedListVector::SharedListVector() : DataVector(), maxRank(0), numBins(0), numSeqs(0){} +SharedListVector::SharedListVector() : DataVector(), maxRank(0), numBins(0), numSeqs(0){globaldata = GlobalData::getInstance();} /***********************************************************************/ -SharedListVector::SharedListVector(int n): DataVector(), data(n, "") , maxRank(0), numBins(0), numSeqs(0){} +SharedListVector::SharedListVector(int n): DataVector(), data(n, "") , maxRank(0), numBins(0), numSeqs(0){globaldata = GlobalData::getInstance();} /***********************************************************************/ SharedListVector::SharedListVector(ifstream& f) : DataVector(), maxRank(0), numBins(0), numSeqs(0) { @@ -272,6 +272,7 @@ SharedRAbundVector SharedListVector::getSharedRAbundVector(string groupName) { rav.setLabel(label); rav.setGroup(groupName); + return rav; } @@ -292,6 +293,8 @@ vector SharedListVector::getSharedRAbundVector() { vector lookup; util->setGroups(globaldata->Groups, globaldata->gGroupmap->namesOfGroups); + + delete util; for (int i = 0; i < globaldata->Groups.size(); i++) { SharedRAbundVector* temp = new SharedRAbundVector();