X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=fullmatrix.h;h=9de7ead566d4d5446b5ea405b5e3c7eb24991cc0;hp=e2c0e31b5fa8e4ed81ced8ba88b61fc4620adbf3;hb=b206f634aae1b4ce13978d203247fb64757d5482;hpb=aa9238c0a9e6e7aa0ed8b8b606b08ad4fd7dcfe3

diff --git a/fullmatrix.h b/fullmatrix.h
index e2c0e31..9de7ead 100644
--- a/fullmatrix.h
+++ b/fullmatrix.h
@@ -11,7 +11,6 @@
 
 #include "mothur.h"
 #include "groupmap.h"
-#include "globaldata.hpp"
 #include "progress.hpp"
 
 
@@ -23,8 +22,8 @@ struct Names {
 class FullMatrix {
 	
 public:
-	FullMatrix(){ m = MothurOut::getInstance(); }
-	FullMatrix(ifstream&);
+	//FullMatrix(){ m = MothurOut::getInstance(); }
+	FullMatrix(ifstream&, GroupMap*, bool);
 	~FullMatrix(){};
 	
 	int getNumSeqs();
@@ -52,7 +51,7 @@ private:
 	int numSeqs;
 	int numGroups;
 	int numUserGroups;
-	GlobalData* globaldata;
+	bool sim;
 	MothurOut* m;
 };