fixed unweighted calculator

[mothur.git] / unifracunweightedcommand.h

diff --git a/unifracunweightedcommand.h b/unifracunweightedcommand.h
index cc01aab8505d6c36978a2a5933f9167de565fe99..7bf53386a3100f0c881a1f937ad18b887132ca00 100644 (file)
--- a/unifracunweightedcommand.h
+++ b/unifracunweightedcommand.h
@@ -10,11 +10,6 @@
  *
  */
 
-#include <iostream>
-#include <fstream>
-#include <vector>
-#include <map>
-#include <cmath>
 #include "command.hpp"
 #include "unweighted.h"
 #include "treemap.h"
@@ -46,8 +41,8 @@ class UnifracUnweightedCommand : public Command {
                map<float, float> rscoreFreq;  //unweighted score, number of random trees with that score.
                map<float, float> uscoreFreq;  //unweighted, number of user trees with that score.
                map<float, float> totalrscoreFreq;  //unweighted score, number of random trees with that score.
-               map<float, float> rCumul;               //unweighted score, cumulative percentage of number of random trees with that score or lower.
-               map<float, float> uCumul;  //unweighted, cumulative percentage of number of user trees with that score or lower .
+               map<float, float> rCumul;               //unweighted score, cumulative percentage of number of random trees with that score or higher.
+               map<float, float> uCumul;  //unweighted, cumulative percentage of number of user trees with that score or higher .
                map<float, float>::iterator it;
                map<float, float>::iterator it2;
                
@@ -55,7 +50,8 @@ class UnifracUnweightedCommand : public Command {
                
                void printUWSummaryFile();
                void printUnweightedFile();
-               void saveRandomScores();    
+               void saveRandomScores(); 
+               void setGroups();   
                
 };