added weightedlinkage.cpp

[mothur.git] / readtreecommand.h

diff --git a/readtreecommand.h b/readtreecommand.h
index 0810ab015ab93d98a90ec2e742ac7d4f77050722..b0d10f70b57e9fa8ec27622ee9566b67d5c2853c 100644 (file)
--- a/readtreecommand.h
+++ b/readtreecommand.h
@@ -10,9 +10,6 @@
  *
  */
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <fstream>
 #include "command.hpp"
 #include "readtree.h"
 #include "treemap.h"
@@ -21,22 +18,22 @@ class GlobalData;
 
 class ReadTreeCommand : public Command {
 public:
-       ReadTreeCommand();
+       ReadTreeCommand(string);
        ~ReadTreeCommand();
        int execute();
+       void help();
        
 private:
        GlobalData* globaldata;
        ReadTree* read;
        TreeMap* treeMap;
-       string filename;
-};
-
-
-
-
-
+       string filename, treefile, groupfile, namefile;
+       bool abort;
+       map<string, string> nameMap;
+       
+       int readNamesFile();
 
+};
 
 
-#endif
\ No newline at end of file
+#endif