X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=kruskalwalliscommand.cpp;h=76aebe05e36b441e29c8632d585d5ba21a4f92a6;hb=8e67e9de1b200106bea5a468ac02125954656499;hp=9064f49c747081ddde6c23edd82afbed8b83d6fe;hpb=923d4c33e857c00142887f524741c06be537cb7e;p=mothur.git diff --git a/kruskalwalliscommand.cpp b/kruskalwalliscommand.cpp index 9064f49..76aebe0 100644 --- a/kruskalwalliscommand.cpp +++ b/kruskalwalliscommand.cpp @@ -4,6 +4,7 @@ * * Created on June 26, 2012, 11:06 AM */ + #include "kruskalwalliscommand.h" //********************************************************************************************************************** @@ -186,22 +187,26 @@ void KruskalWallisCommand::assignRank(vector &vec) { while ( it != vec.end() ) { j = rank; oldit = it; - if (!equalvalue(*it, *it+1)) { *it->rank = rank; rank=rank+1; it++; } + if (!equalvalue(*it, *(it+1))) { + (*it).rank = rank; + rank = rank+1; + it++; } else { - while(equalrank(*it, *it+1)) { - j = j + (j+1.0); + while(equalrank(*it, *(it+1))) { + j = j + (j+1); rank++; it++; } numRanks = double (distance(oldit, it)); avgRank = j / numRanks; while(oldit != it) { - *oldit->rank = avgRank; + (*oldit).rank = avgRank; oldit++; } } } + } catch(exception& e) {