]> git.donarmstrong.com Git - mothur.git/commitdiff
fixed pointers in mgcluster
authorKathryn Iverson <kd.iverson@gmail.com>
Tue, 3 Jul 2012 19:01:16 +0000 (15:01 -0400)
committerKathryn Iverson <kd.iverson@gmail.com>
Tue, 3 Jul 2012 19:01:16 +0000 (15:01 -0400)
mgclustercommand.cpp
mgclustercommand.h

index 878d6a40cfb53bc70157d9c9cc77b60097118781..cffb80f9e8f2963d4983c6637d8eef2b33566de4 100644 (file)
@@ -247,8 +247,8 @@ int MGClusterCommand::execute(){
         
         if(countfile != "") {
             //map<string, int> 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<string> names = ct.getNamesOfSeqs();
 
index 6f4453316a33d41cb18774d6c9b435bc563980e2..0626b86cd96792dfce2b4c523760749f44d74858 100644 (file)
@@ -47,6 +47,7 @@ private:
        Cluster* cluster;
        HCluster* hcluster;
        ListVector* list;
+    CountTable* ct;
        ListVector oldList;
     RAbundVector rav;
        vector<seqDist> overlapMatrix;
@@ -63,7 +64,7 @@ private:
        ListVector* mergeOPFs(map<string, int>, float);
        void sortHclusterFiles(string, string);
        vector<seqDist> getSeqs(ifstream&);
-    void createRabund(CountTable);
+    void createRabund(CountTable*, ListVector*);
 
 };