changed groupfile in classify.seqs to reflect multiple fasta files

[mothur.git] / readcluster.cpp

diff --git a/readcluster.cpp b/readcluster.cpp
index 1cf9fc325b0ecdc5d222ded20346f79134f3b6b7..c8a8bc7b5074bf91ea46e2c30f2364a509d2c5ff 100644 (file)
--- a/readcluster.cpp
+++ b/readcluster.cpp
@@ -11,22 +11,27 @@
 
 /***********************************************************************/
 
-ReadCluster::ReadCluster(string distfile, float c){
+ReadCluster::ReadCluster(string distfile, float c, string o){
                globaldata = GlobalData::getInstance();
                m = MothurOut::getInstance();
         distFile = distfile;
                cutoff = c;
+               outputDir = o;
 }
 
 /***********************************************************************/
 
-void ReadCluster::read(NameAssignment* nameMap){
+int ReadCluster::read(NameAssignment* nameMap){
        try {
         
                if (format == "phylip") { convertPhylip2Column(nameMap); }
                else { list = new ListVector(nameMap->getListVector());  }
                
-               OutPutFile = sortFile(distFile);
+               if (m->control_pressed) { return 0; }
+               
+               OutPutFile = sortFile(distFile, outputDir);
+               
+               return 0;
                        
        }
        catch(exception& e) {
@@ -36,7 +41,7 @@ void ReadCluster::read(NameAssignment* nameMap){
 }
 /***********************************************************************/
 
-void ReadCluster::convertPhylip2Column(NameAssignment* nameMap){
+int ReadCluster::convertPhylip2Column(NameAssignment* nameMap){
        try {   
                //convert phylip file to column file
                map<int, string> rowToName;
@@ -96,6 +101,9 @@ void ReadCluster::convertPhylip2Column(NameAssignment* nameMap){
                                        list->set(i, name);
                                        
                                        for(int j=0;j<i;j++){
+                                       
+                                               if (m->control_pressed) { in.close(); out.close(); remove(tempFile.c_str()); return 0; }
+                                               
                                                in >> distance;
                                                
                                                if (distance == -1) { distance = 1000000; }
@@ -110,6 +118,9 @@ void ReadCluster::convertPhylip2Column(NameAssignment* nameMap){
                                        if(nameMap->count(name)==0){        m->mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); m->mothurOutEndLine(); }
                                        
                                        for(int j=0;j<i;j++){
+                                               
+                                               if (m->control_pressed) { in.close(); out.close(); remove(tempFile.c_str()); return 0; }
+                                               
                                                in >> distance;
                                                
                                                if (distance == -1) { distance = 1000000; }
@@ -130,6 +141,8 @@ void ReadCluster::convertPhylip2Column(NameAssignment* nameMap){
                                if(nameMap == NULL){
                                        list->set(i, name);
                                        for(int j=0;j<nseqs;j++){
+                                               if (m->control_pressed) { in.close(); out.close(); remove(tempFile.c_str()); return 0; }
+                                               
                                                in >> distance;
                                        
                                                if (distance == -1) { distance = 1000000; }
@@ -143,6 +156,8 @@ void ReadCluster::convertPhylip2Column(NameAssignment* nameMap){
                                        if(nameMap->count(name)==0){        m->mothurOut("Error: Sequence '" + name + "' was not found in the names file, please correct"); m->mothurOutEndLine(); }
                                        
                                        for(int j=0;j<nseqs;j++){
+                                               if (m->control_pressed) { in.close(); out.close(); remove(tempFile.c_str()); return 0; }
+                                               
                                                in >> distance;
                         
                                                if (distance == -1) { distance = 1000000; }
@@ -180,6 +195,8 @@ void ReadCluster::convertPhylip2Column(NameAssignment* nameMap){
                float dist;
                
                while (in2) {
+                       if (m->control_pressed) { in2.close(); out2.close(); remove(tempFile.c_str()); remove(outputFile.c_str()); return 0; }
+                       
                        in2 >> first >> second >> dist;
                        out2 << rowToName[first] << '\t' << rowToName[second] << '\t' << dist << endl;
                        gobble(in2);
@@ -189,6 +206,10 @@ void ReadCluster::convertPhylip2Column(NameAssignment* nameMap){
                
                remove(tempFile.c_str());
                distFile = outputFile;
+               
+               if (m->control_pressed) {  remove(outputFile.c_str());  }
+
+               return 0;
        }
        catch(exception& e) {
                m->errorOut(e, "ReadCluster", "convertPhylip2Column");