X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readmatrix.hpp;h=90d5b430de4a1ce73e5a9c03880333c4b39febad;hb=5a4ac4f954c4b4445bcee272f1f8220ddcc9c1e4;hp=9c71732f87a712eef8660748926e7a1ceb64c6c6;hpb=20a2d0350a737a434c89f303662d64a8eeea7b05;p=mothur.git

diff --git a/readmatrix.hpp b/readmatrix.hpp
index 9c71732..90d5b43 100644
--- a/readmatrix.hpp
+++ b/readmatrix.hpp
@@ -10,82 +10,34 @@
  *
  */
 
-#include "rabundvector.hpp"
+#include "mothur.h"
 #include "listvector.hpp"
-#include "sparsematrix.hpp"
 #include "nameassignment.hpp"
-#include "inputdata.h"
-#include "globaldata.hpp"
-#include "sabundvector.hpp"
-#include "groupmap.h"
+#include "counttable.h"
+#include "sparsedistancematrix.h"
 
 class SparseMatrix;
 
 class ReadMatrix {
 
 public:
-	ReadMatrix(){	D = new SparseMatrix();	}
-	virtual void read(NameAssignment*){};
-	virtual void read(GlobalData* globaldata){};
+	ReadMatrix(){ DMatrix = new SparseDistanceMatrix(); m = MothurOut::getInstance();  }
+	virtual ~ReadMatrix() {}
+	virtual int read(NameAssignment*){ return 1; }
+    virtual int read(CountTable*){ return 1; }
+	
 	void setCutoff(float c)			{	cutoff = c;		}
-	SparseMatrix* getMatrix()		{	return D;		}
+    SparseDistanceMatrix* getDMatrix()		{	return DMatrix;		}
 	ListVector* getListVector()		{	return list;	}
-//	OrderVector* getOrderVector()   {	return order;	}
 
 	int successOpen;
 	
 protected:
-	SparseMatrix* D;
+    SparseDistanceMatrix* DMatrix;
 	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;
-	OrderVector* order;
-	SAbundVector* sabund;
-	GlobalData* globaldata;
-	// InputData* getInput()			{	return input;	}
+	MothurOut* m;
+	bool sim;
 };