cleaned up code

diff --git a/kruskalwalliscommand.cpp b/kruskalwalliscommand.cpp
index 9064f49c747081ddde6c23edd82afbed8b83d6fe..76aebe05e36b441e29c8632d585d5ba21a4f92a6 100644 (file)
--- 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<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) {

diff --git a/kruskalwalliscommand.h b/kruskalwalliscommand.h
index 1aadb16e807c8e69d563f4a94abe23dc74c26d19..e3bf100bd2c8b468701f4aaee17c3807758d3f56 100644 (file)
--- a/kruskalwalliscommand.h
+++ b/kruskalwalliscommand.h
@@ -47,11 +47,11 @@ private:
     
   
         
-    bool comparevalue(const groupRank &a, const groupRank &b) { return a.value < b.value; }
-    bool equalvalue(const groupRank &a, const groupRank &b) { return a.value == b.value; }
-    bool comparerank(const groupRank &a, const groupRank &b) { return a.rank < b.rank; }
-    bool equalrank(const groupRank &a, const groupRank &b) { return a.rank == b.rank; }
-    bool equalgroup(const groupRank &a, const groupRank &b) { return a.group == b.group; }
+    static bool comparevalue(const groupRank &a, const groupRank &b) { return a.value < b.value; }
+    static bool equalvalue(const groupRank &a, const groupRank &b) { return a.value == b.value; }
+    static bool comparerank(const groupRank &a, const groupRank &b) { return a.rank < b.rank; }
+    static bool equalrank(const groupRank &a, const groupRank &b) { return a.rank == b.rank; }
+    static bool equalgroup(const groupRank &a, const groupRank &b) { return a.group == b.group; }
     
 };