X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readmatrix.hpp;h=49ae2946fda42c49c8475b040ac8f7e3f5617499;hb=fdfbfe59134dd7dd3e49d90609d129128ba2d370;hp=2c47832f166ea0df47a7b5f5a8760c73f9ce2dfe;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git

diff --git a/readmatrix.hpp b/readmatrix.hpp
index 2c47832..49ae294 100644
--- a/readmatrix.hpp
+++ b/readmatrix.hpp
@@ -14,7 +14,6 @@
 #include "listvector.hpp"
 #include "sparsematrix.hpp"
 #include "nameassignment.hpp"
-#include "globaldata.hpp"
 
 class SparseMatrix;
 
@@ -23,8 +22,8 @@ class ReadMatrix {
 public:
 	ReadMatrix(){	D = new SparseMatrix();	 m = MothurOut::getInstance();  }
 	virtual ~ReadMatrix() {}
-	virtual void read(NameAssignment*){};
-	virtual void read(GlobalData* globaldata){};
+	virtual int read(NameAssignment*){ return 1; }
+	
 	void setCutoff(float c)			{	cutoff = c;		}
 	SparseMatrix* getMatrix()		{	return D;		}
 	ListVector* getListVector()		{	return list;	}
@@ -35,9 +34,9 @@ public:
 protected:
 	SparseMatrix* D;
 	ListVector* list;
-	GlobalData* globaldata;
 	float cutoff;
 	MothurOut* m;
+	bool sim;
 };