From 59af31754310365c71de1f205dd58af794f6c5ae Mon Sep 17 00:00:00 2001 From: Kathryn Iverson Date: Wed, 20 Jun 2012 16:27:31 -0400 Subject: [PATCH] added ifelse for rabund --- mgclustercommand.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/mgclustercommand.cpp b/mgclustercommand.cpp index 61e1306..c4cdb50 100644 --- a/mgclustercommand.cpp +++ b/mgclustercommand.cpp @@ -230,9 +230,19 @@ int MGClusterCommand::execute(){ //must remember to delete those objects here since readBlast does not read = new ReadBlast(blastfile, cutoff, penalty, length, minWanted, hclusterWanted); read->read(nameMap); - - list = new ListVector(nameMap->getListVector()); - RAbundVector* rabund = new RAbundVector(list->getRAbundVector()); + + list = new ListVector(nameMap->getListVector()); + RAbundVector* rabund = NULL; + if(large) { + map nameMapCounts = m->readNames(namefile); + RAbundVector* rabund = newFunctionToCreateRabund(list, nameMapCounts); + }else { + RAbundVector* rabund = new RAbundVector(list->getRAbundVector()); + } + + + //list = new ListVector(nameMap->getListVector()); + //RAbundVector* rabund = new RAbundVector(list->getRAbundVector()); if (m->control_pressed) { outputTypes.clear(); delete nameMap; delete read; delete list; delete rabund; return 0; } -- 2.39.2