From: Kathryn Iverson Date: Tue, 3 Jul 2012 19:01:16 +0000 (-0400) Subject: fixed pointers in mgcluster X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=commitdiff_plain;h=6f0e427633e7ee80b6494eb677ad60e6cea94d62 fixed pointers in mgcluster --- diff --git a/mgclustercommand.cpp b/mgclustercommand.cpp index 878d6a4..cffb80f 100644 --- a/mgclustercommand.cpp +++ b/mgclustercommand.cpp @@ -247,8 +247,8 @@ int MGClusterCommand::execute(){ if(countfile != "") { //map nameMapCounts = m->readNames(namefile); - CountTable ct = new CountTable(); - ct.readTable(countfile); + ct = new CountTable(); + ct->readTable(countfile); createRabund(ct, list); rabund = &rav; }else { @@ -724,7 +724,7 @@ void MGClusterCommand::sortHclusterFiles(string unsortedDist, string unsortedOve //********************************************************************************************************************** -void MGClusterCommand::createRabund(CountTable ct, ListVector list){ +void MGClusterCommand::createRabund(CountTable* ct, ListVector* list){ try { //vector names = ct.getNamesOfSeqs(); diff --git a/mgclustercommand.h b/mgclustercommand.h index 6f44533..0626b86 100644 --- a/mgclustercommand.h +++ b/mgclustercommand.h @@ -47,6 +47,7 @@ private: Cluster* cluster; HCluster* hcluster; ListVector* list; + CountTable* ct; ListVector oldList; RAbundVector rav; vector overlapMatrix; @@ -63,7 +64,7 @@ private: ListVector* mergeOPFs(map, float); void sortHclusterFiles(string, string); vector getSeqs(ifstream&); - void createRabund(CountTable); + void createRabund(CountTable*, ListVector*); };