reworked amova / homova / anosim

[mothur.git] / corraxescommand.h

diff --git a/corraxescommand.h b/corraxescommand.h
index 45a2b785401ead3f70bd87ea43777e8db05c5fbf..bbe87abcbd1eeccb677a4e59c58ce64cb961944c 100644 (file)
--- a/corraxescommand.h
+++ b/corraxescommand.h
@@ -11,18 +11,9 @@
  */
 
 #include "command.hpp"
-#include "sharedrabundvector.h"
 #include "sharedrabundfloatvector.h"
 #include "inputdata.h"
 
-/***************************************************************/
-struct spearmanRank {
-       string name;
-       float score;
-       
-       spearmanRank(string n, float s) : name(n), score(s) {}
-};
-/***************************************************************/
 
 class CorrAxesCommand : public Command {
 public:
@@ -47,12 +38,11 @@ private:
        
        vector<string> outputNames, Groups;
        map<string, vector<string> > outputTypes;
-       vector<SharedRAbundVector*> lookup;
        vector<SharedRAbundFloatVector*> lookupFloat;
+       vector<string> metadataLabels;
        
-       int getShared();
-       int getSharedFloat();
-       int convertToRelabund();
+       int getSharedFloat(InputData*);
+       int getMetadata();
        int eliminateZeroOTUS(vector<SharedRAbundFloatVector*>&);
        map<string, vector<float> > readAxes();
        int calcPearson(map<string, vector<float> >&, ofstream&);