broke apart read matrix file

[mothur.git] / readmatrix.hpp

diff --git a/readmatrix.hpp b/readmatrix.hpp
index cfa7731b45dd5b37f2b39365fc0c22a19a9534d5..66480e7a6999ed90830f45a730c49ab4b850c73f 100644 (file)
--- a/readmatrix.hpp
+++ b/readmatrix.hpp
@@ -11,15 +11,10 @@
  */
 
 #include "mothur.h"
-#include "rabundvector.hpp"
 #include "listvector.hpp"
-#include "sharedlistvector.h"
 #include "sparsematrix.hpp"
 #include "nameassignment.hpp"
-#include "inputdata.h"
 #include "globaldata.hpp"
-#include "sabundvector.hpp"
-#include "groupmap.h"
 
 class SparseMatrix;
 
@@ -40,58 +35,9 @@ protected:
        SparseMatrix* D;
        ListVector* list;
        GlobalData* globaldata;
-       OrderVector* order;
-       InputData* input;
        float cutoff;
 };
 
 
 
-class ReadPhylipMatrix : public ReadMatrix {
-       
-public:
-       ReadPhylipMatrix(string);
-       ~ReadPhylipMatrix();
-       void read(NameAssignment*);
-private:
-       ifstream fileHandle;
-       string distFile;
-};
-
-
-
-class ReadColumnMatrix : public ReadMatrix {
-       
-public:
-       ReadColumnMatrix(string);
-       ~ReadColumnMatrix();
-       void read(NameAssignment*);
-private:
-       ifstream fileHandle;
-       string distFile;
-};
-
-
-class ReadPhilFile : public ReadMatrix {
-       
-public:
-       ReadPhilFile(string);
-       ~ReadPhilFile();
-       void read(GlobalData* globaldata);
-private:
-       ifstream fileHandle;
-       string philFile;
-       InputData* input;
-       InputData* inputSabund;
-       InputData* inputList;
-       ListVector* list;
-       SharedListVector* SharedList;
-       OrderVector* order;
-       SAbundVector* sabund;
-       GlobalData* globaldata;
-       // InputData* getInput()                        {       return input;   }
-};
-
-
-
 #endif