updated getgroupnames

diff --git a/kruskalwalliscommand.cpp b/kruskalwalliscommand.cpp
index 39afca8c8acb0228a60d18b8df4da9a23eb6adef..dd5eb09cbd3b54fb439d277cbd166f01dc726f84 100644 (file)
--- a/kruskalwalliscommand.cpp
+++ b/kruskalwalliscommand.cpp
@@ -141,15 +141,19 @@ int KruskalWallisCommand::execute(){
         
         //math goes here
         
-        int N = lookup.size();
+        int N = m->getNumGroups();
         double H;
         double tmp = 0.0;
         vector<groupRank> vec;
+        vector<string> groups = m->getGroups();
         string group;
         int count;
         double sum;
                 
         //merge all groups into a vector
+        
+        
+        
         //rank function here
         assignRank(vec);
         
@@ -157,7 +161,7 @@ int KruskalWallisCommand::execute(){
         for (int i=0;i<N;i++) {
             count = 0;
             sum = 0;
-            //group = next group
+            group = groups[i];
             for(int j;j<vec.size();j++) {
                 if (vec[j].group == group) {
                     count++;
@@ -231,7 +235,9 @@ void KruskalWallisCommand::assignRank(vector<groupRank> &vec) {
     
 }
 //**********************************************************************************************************************
-
+void KruskalWallisCommand::assignValue(vector<groupRank> &vec) {
+    
+}
 //**********************************************************************************************************************
 //**********************************************************************************************************************
 //**********************************************************************************************************************
\ No newline at end of file

diff --git a/kruskalwalliscommand.h b/kruskalwalliscommand.h
index 0fa8b683f25397173fc747d5edf0a276508ca72e..4a1e18971802619f245d53af5a1ab7b881936316 100644 (file)
--- a/kruskalwalliscommand.h
+++ b/kruskalwalliscommand.h
@@ -38,6 +38,7 @@ public:
     int execute(); 
        void help() { m->mothurOut(getHelpString()); }
     void assignRank(vector<groupRank>&);
+    void assignValue(vector<groupRank>&);
     
     
 private: