From 9eb79e6942cf98f3a0296ff9f63b4a47731b49e8 Mon Sep 17 00:00:00 2001
From: Kathryn Iverson <kd.iverson@gmail.com>
Date: Fri, 22 Jun 2012 17:10:10 -0400
Subject: [PATCH] added large parameter to mgcluster along with new rabund
support
---
mgclustercommand.cpp | 8 ++++----
mgclustercommand.h | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/mgclustercommand.cpp b/mgclustercommand.cpp
index 06f0519..508b05f 100644
--- a/mgclustercommand.cpp
+++ b/mgclustercommand.cpp
@@ -247,8 +247,8 @@ int MGClusterCommand::execute(){
}
- list = new ListVector(nameMap->getListVector());
- RAbundVector* rabund = new RAbundVector(list->getRAbundVector());
+ //list = new ListVector(nameMap->getListVector());
+ //rabund = new RAbundVector(list->getRAbundVector());
if (m->control_pressed) { outputTypes.clear(); delete nameMap; delete read; delete list; delete rabund; return 0; }
@@ -519,8 +519,8 @@ int MGClusterCommand::execute(){
m->mothurRemove(overlapFile);
}
- delete list;
- delete rabund;
+ delete list;
+ if (!large) {delete rabund;}
listFile.close();
sabundFile.close();
rabundFile.close();
diff --git a/mgclustercommand.h b/mgclustercommand.h
index 96410bf..ce3ffec 100644
--- a/mgclustercommand.h
+++ b/mgclustercommand.h
@@ -47,7 +47,7 @@ private:
HCluster* hcluster;
ListVector* list;
ListVector oldList;
- RAbundVector rav;
+ RAbundVector rav;
vector<seqDist> overlapMatrix;
vector<string> outputNames;
@@ -62,7 +62,7 @@ private:
ListVector* mergeOPFs(map<string, int>, float);
void sortHclusterFiles(string, string);
vector<seqDist> getSeqs(ifstream&);
- void createRabund(map<string, int>);
+ void createRabund(map<string, int>);
};
--
2.39.5