added checks for ^C to quit command instead of program

[mothur.git] / readdistcommand.h

diff --git a/readdistcommand.h b/readdistcommand.h
index 3dfda1ba5cb5960642c0891570290fa9ae0d01a1..1f852be88e84223a3f07b9847f71e57ee8160442 100644 (file)
--- a/readdistcommand.h
+++ b/readdistcommand.h
@@ -9,11 +9,10 @@
  *
  */
 
-#include <Carbon/Carbon.h>
-#include <iostream>
-#include <fstream>
 #include "command.hpp"
 #include "readmatrix.hpp"
+#include "fullmatrix.h"
+#include "groupmap.h"
 
 /* The read.dist command is used to read a distance matrix file.  
 The read.dist command parameter options are phylipfile, columnfile, namefile, cutoff and precision. 
@@ -27,17 +26,24 @@ class GlobalData;
 
 class ReadDistCommand : public Command {
 public:
-       ReadDistCommand();
+       ReadDistCommand(string);
        ~ReadDistCommand();
        int execute();
+       void help();
        
 private:
        GlobalData* globaldata;
        double cutoff;
        int precision;
        ReadMatrix* read;
-       string filename, format, method;
+       FullMatrix* matrix;
+       GroupMap* groupMap;
+       string distFileName, format, method;
+       string phylipfile, columnfile, namefile, groupfile, outputDir;
        NameAssignment* nameMap;
+
+       bool abort;
+
 };
 
-#endif
\ No newline at end of file
+#endif