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

diff --git a/readmatrix.hpp b/readmatrix.hpp
index 66480e7..49ae294 100644
--- a/readmatrix.hpp
+++ b/readmatrix.hpp
@@ -14,16 +14,16 @@
 #include "listvector.hpp"
 #include "sparsematrix.hpp"
 #include "nameassignment.hpp"
-#include "globaldata.hpp"
 
 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;	}
@@ -34,8 +34,9 @@ public:
 protected:
 	SparseMatrix* D;
 	ListVector* list;
-	GlobalData* globaldata;
 	float cutoff;
+	MothurOut* m;
+	bool sim;
 };