added hcluster command and fixed some bugs, namely one with smart distancing.

[mothur.git] / globaldata.hpp

diff --git a/globaldata.hpp b/globaldata.hpp
index e125e6f3d7032d78d2b1330dece6cf909a6bf320..0238a0aaeffa7a7e710182af82010ea058edf1df 100644 (file)
--- a/globaldata.hpp
+++ b/globaldata.hpp
@@ -10,6 +10,7 @@
 #include "tree.h"
 #include "sparsematrix.hpp"
 #include "sequencedb.h"
+#include "nameassignment.hpp"
 
 
 class ListVector;
@@ -73,6 +74,8 @@ public:
        void setOrderFile(string file);
        void setFormat(string); //do we need this?
        
+       NameAssignment* nameMap;
+       
        void clear(); 
        void clearLabels();
        void clearAbund();
@@ -81,7 +84,7 @@ public:
        
 private:
 
-       string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, treefile, sharedfile, format;
+       string phylipfile, columnfile, listfile, rabundfile, sabundfile, namefile, groupfile, orderfile, treefile, sharedfile, format, distfile;
 
        static GlobalData* _uniqueInstance;
        GlobalData( const GlobalData& ); // Disable copy constructor