From 9473b7b31670fac7df475ae5a4618a9d6603b27f Mon Sep 17 00:00:00 2001 From: westcott Date: Fri, 20 Aug 2010 17:45:36 +0000 Subject: [PATCH] pre.cluster --- preclustercommand.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/preclustercommand.cpp b/preclustercommand.cpp index 5dc2f5a..2156477 100644 --- a/preclustercommand.cpp +++ b/preclustercommand.cpp @@ -141,10 +141,10 @@ int PreClusterCommand::execute(){ //think about running through twice... list::iterator itList; list::iterator itList2; - for (itList = alignSeqs.begin(); itList != alignSeqs.end(); itList++) { + for (itList = alignSeqs.begin(); itList != alignSeqs.end();) { //try to merge it with all smaller seqs - for (itList2 = alignSeqs.begin(); itList2 != alignSeqs.end(); itList2++) { + for (itList2 = alignSeqs.begin(); itList2 != alignSeqs.end();) { if (m->control_pressed) { outFasta.close(); outNames.close(); remove(newFastaFile.c_str()); remove(newNamesFile.c_str()); return 0; } @@ -159,11 +159,11 @@ int PreClusterCommand::execute(){ (*itList).names += ',' + (*itList2).names; (*itList).numIdentical += (*itList2).numIdentical; - itList2 = alignSeqs.erase(itList2); + alignSeqs.erase(itList2++); count++; - } - } + }else{ itList2++; } + }else{ itList2++; } } -- 2.39.5