added sequence name to error string in fastq.info. Changed np_shannon to npshannon.

[mothur.git] / rarefact.cpp

diff --git a/rarefact.cpp b/rarefact.cpp
index ec77dd57f2ce811bcac6fa588ee715114eb10f1c..ca105b7f82fad6be8cc45e7b9e7953da3f4471e4 100644 (file)
--- a/rarefact.cpp
+++ b/rarefact.cpp
@@ -116,7 +116,7 @@ int Rarefact::createProcesses(vector<int>& procIters, RarefactionCurveData* rcd,
        try {
 #if defined (__APPLE__) || (__MACH__) || (linux) || (__linux)
                int process = 1;
-               int num = 0;
+               
                vector<int> processIDS;
                
                EstOutput results;
@@ -157,7 +157,7 @@ int Rarefact::createProcesses(vector<int>& procIters, RarefactionCurveData* rcd,
                        for(int j=0;j<displays.size();j++){
                                string s = toString(processIDS[i]) + toString(j) + ".rarefact.temp";
                                displays[j]->inputTempFiles(s);
-                               remove(s.c_str());
+                               m->mothurRemove(s);
                        }
                }
                
@@ -183,7 +183,7 @@ try {
                }
                
                //if jumble is false all iters will be the same
-               if (globaldata->jumble == false)  {  nIters = 1;  }
+               if (m->jumble == false)  {  nIters = 1;  }
                
                //convert freq percentage to number
                int increment = 1;
@@ -196,7 +196,7 @@ try {
                                displays[i]->init(label);                 
                        }
                        
-                       if (globaldata->jumble == true)  {
+                       if (m->jumble == true)  {
                                //randomize the groups
                                random_shuffle(lookup.begin(), lookup.end());
                        }