X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readmatrix.hpp;h=d4edb5b8ad866e10a15ce82ef22d22d418c68e84;hb=aa9238c0a9e6e7aa0ed8b8b606b08ad4fd7dcfe3;hp=cfa7731b45dd5b37f2b39365fc0c22a19a9534d5;hpb=c5c7502f435e1413c19e373dab1dfebcaa67588d;p=mothur.git

diff --git a/readmatrix.hpp b/readmatrix.hpp
index cfa7731..d4edb5b 100644
--- a/readmatrix.hpp
+++ b/readmatrix.hpp
@@ -11,24 +11,20 @@
  */
 
 #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;
 
 class ReadMatrix {
 
 public:
-	ReadMatrix(){	D = new SparseMatrix();	}
-	virtual void read(NameAssignment*){};
-	virtual void read(GlobalData* globaldata){};
+	ReadMatrix(){	D = new SparseMatrix();	 m = MothurOut::getInstance();  }
+	virtual ~ReadMatrix() {}
+	virtual int read(NameAssignment*){ return 1; }
+	
 	void setCutoff(float c)			{	cutoff = c;		}
 	SparseMatrix* getMatrix()		{	return D;		}
 	ListVector* getListVector()		{	return list;	}
@@ -40,56 +36,8 @@ 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;	}
+	MothurOut* m;
 };