fixed subsample name file name issue. added count parameter to cluster command....

[mothur.git] / clusterclassic.h

diff --git a/clusterclassic.h b/clusterclassic.h
index 110c0408e5107e9acebd322c7a1070f364c13a7d..a650bbf8de79147c3bd48bbcf1f63fdf22c6f574 100644 (file)
--- a/clusterclassic.h
+++ b/clusterclassic.h
@@ -1,8 +1,7 @@
-#ifndef CLUSTER_H
-#define CLUSTER_H
+#ifndef CLUSTERCLASSIC_H
+#define CLUSTERCLASSIC_H
 
 
-#include "mothur.h"
 #include "mothurout.h"
 #include "listvector.hpp"
 #include "rabundvector.hpp"
@@ -28,7 +27,7 @@ public:
        int getNSeqs() { return nseqs; }        
        ListVector* getListVector() { return list; }
        RAbundVector* getRAbundVector() { return rabund; }              
-       string getTag();
+       string getTag() { return tag; }
        void setMapWanted(bool m);  
        map<string, int> getSeqtoBin()  {  return seq2Bin;      }
 
@@ -42,13 +41,13 @@ private:
        struct colDist {
                int col;
                int row;
-               double dist;
+               float dist;
                colDist(int r, int c, double d) : row(r), col(c), dist(d) {}
        };
        
        RAbundVector* rabund;
        ListVector* list;
-       vector< vector<double> > dMatrix;       
+       vector< vector<float> > dMatrix;        
        //vector<colDist> rowSmallDists;
        
        int smallRow;
@@ -57,7 +56,7 @@ private:
        bool mapWanted, sim;
        double cutoff, aboveCutoff;
        map<string, int> seq2Bin;
-       string method;
+       string method, tag;
        
        MothurOut* m;
 };