cleaned up code

[mothur.git] / kruskalwalliscommand.cpp

diff --git a/kruskalwalliscommand.cpp b/kruskalwalliscommand.cpp
index 946701bd46268a59556df9757c3fefba4ecbfd49..76aebe05e36b441e29c8632d585d5ba21a4f92a6 100644 (file)
--- a/kruskalwalliscommand.cpp
+++ b/kruskalwalliscommand.cpp
@@ -4,10 +4,11 @@
  *
  * Created on June 26, 2012, 11:06 AM
  */
+
 #include "kruskalwalliscommand.h"
 
 //**********************************************************************************************************************
-/*vector<string> KruskalWallisCommand::setParameters(){        
+vector<string> KruskalWallisCommand::setParameters(){  
        try {
                CommandParameter pinputdir("inputdir", "String", "", "", "", "", "",false,false); parameters.push_back(pinputdir);
                CommandParameter poutputdir("outputdir", "String", "", "", "", "", "",false,false); parameters.push_back(poutputdir);
@@ -117,7 +118,7 @@ KruskalWallisCommand::KruskalWallisCommand(string option) {
                m->errorOut(e, "KruskalWallisCommand", "KruskalWallisCommand");
                exit(1);
        }
-}**/
+}
 //**********************************************************************************************************************
 int KruskalWallisCommand::execute(){
        try {
@@ -186,22 +187,26 @@ void KruskalWallisCommand::assignRank(vector<groupRank> &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) {