X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readmatrix.hpp;h=66480e7a6999ed90830f45a730c49ab4b850c73f;hb=154e089bcd37c2c2f773e53ffb88a20170b27037;hp=44e7bf6a61932122b8e6212f01cb1773b91de9ed;hpb=fd282e6b4be2560f5b1bd154a9e8d24b798eefaf;p=mothur.git

diff --git a/readmatrix.hpp b/readmatrix.hpp
index 44e7bf6..66480e7 100644
--- a/readmatrix.hpp
+++ b/readmatrix.hpp
@@ -10,15 +10,11 @@
  *
  */
 
-#include "rabundvector.hpp"
+#include "mothur.h"
 #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;
 
@@ -39,57 +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;
-	ListVector* list;
-	SharedListVector* SharedList;
-	OrderVector* order;
-	SAbundVector* sabund;
-	GlobalData* globaldata;
-	// InputData* getInput()			{	return input;	}
-};
-
-
-
 #endif