X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=hcluster.cpp;fp=hcluster.cpp;h=259036f0f02a42beb95926f9ce59a4140164840e;hb=832d53a9dfac6b1795735eec643d8cf627b0d8e3;hp=3b972c0e3cc91c15b4730db6ae837ec621b8d651;hpb=e1cf60b82a48d4d96e3a696a2d221c56cfb0b298;p=mothur.git diff --git a/hcluster.cpp b/hcluster.cpp index 3b972c0..259036f 100644 --- a/hcluster.cpp +++ b/hcluster.cpp @@ -27,7 +27,9 @@ HCluster::HCluster(RAbundVector* rav, ListVector* lv, string m, string d, NameAs if (method != "average") { openInputFile(distfile, filehandle); - }else{ firstRead = true; } + }else{ + processFile(); + } } catch(exception& e) { errorOut(e, "HCluster", "HCluster"); @@ -358,7 +360,6 @@ vector HCluster::getSeqs(){ if(method != "average") { sameSeqs = getSeqsFNNN(); }else{ - if (firstRead) { processFile(); } sameSeqs = getSeqsAN(); } @@ -755,8 +756,6 @@ void HCluster::processFile() { remove(distfile.c_str()); rename(outTemp.c_str(), distfile.c_str()); - - firstRead = false; } catch(exception& e) { errorOut(e, "HCluster", "processFile");