fixed trim.seqs bug with qtrim parameter and added num=1 special case to database...

[mothur.git] / clustersplitcommand.cpp

diff --git a/clustersplitcommand.cpp b/clustersplitcommand.cpp
index 85c70f04127b4ae63ddf1f16f6e8adb2fea39e9c..c36e280e2925e3d07e6ef33e0756bbc039f08299 100644 (file)
--- a/clustersplitcommand.cpp
+++ b/clustersplitcommand.cpp
@@ -380,7 +380,6 @@ int ClusterSplitCommand::execute(){
                                        
                        //for each file group figure out which process will complete it
                        //want to divide the load intelligently so the big files are spread between processes
-                       int count = 1;
                        for (int i = 0; i < distName.size(); i++) { 
                                int processToAssign = (i+1) % processors; 
                                if (processToAssign == 0) { processToAssign = processors; }
@@ -538,7 +537,6 @@ int ClusterSplitCommand::execute(){
                                        
                                        //for each file group figure out which process will complete it
                                        //want to divide the load intelligently so the big files are spread between processes
-                                       int count = 1;
                                        for (int i = 0; i < distName.size(); i++) { 
                                                int processToAssign = (i+1) % processors; 
                                                if (processToAssign == 0) { processToAssign = processors; }
@@ -991,9 +989,7 @@ vector<string> ClusterSplitCommand::cluster(vector< map<string, string> > distNa
                        m->openOutputFile(fileroot+ tag + ".list",      listFile);
                
                        listFileNames.push_back(fileroot+ tag + ".list");
-               
-                       time_t estart = time(NULL);
-                       
+                               
                        float previousDist = 0.00000;
                        float rndPreviousDist = 0.00000;
                        
@@ -1115,7 +1111,7 @@ int ClusterSplitCommand::createMergedDistanceFile(vector< map<string, string> >
                }
 #endif
                                
-                       
+               return 0;       
                
                
        }