fixed io

[mothur.git] / clusterclassic.h

diff --git a/clusterclassic.h b/clusterclassic.h
index 9a896f28df1a51d29978914e6922ce924b083e86..932c806ec42ac52a4a90670239d0c4a6a27b1efb 100644 (file)
--- a/clusterclassic.h
+++ b/clusterclassic.h
@@ -1,12 +1,11 @@
-#ifndef CLUSTER_H
-#define CLUSTER_H
+#ifndef CLUSTERCLASSIC_H
+#define CLUSTERCLASSIC_H
 
 
-#include "mothur.h"
 #include "mothurout.h"
 #include "listvector.hpp"
-#include "globaldata.hpp"
 #include "rabundvector.hpp"
+#include "nameassignment.hpp"
 
 /*
  *  clusterclassic.h
@@ -21,14 +20,14 @@
 class ClusterClassic {
        
 public:
-       ClusterClassic(float, string);
+       ClusterClassic(float, string, bool);
        int readPhylipFile(string, NameAssignment*);
        void update(double&);
        double getSmallDist() { return smallDist; }     
        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;      }
 
@@ -54,13 +53,12 @@ private:
        int smallRow;
        int smallCol, nseqs;
        double smallDist;
-       bool mapWanted;
+       bool mapWanted, sim;
        double cutoff, aboveCutoff;
        map<string, int> seq2Bin;
-       string method;
+       string method, tag;
        
        MothurOut* m;
-       GlobalData* globaldata;
 };
 
 #endif