added countable class to read and store count file. added count parameter to make...

[mothur.git] / readmatrix.hpp

diff --git a/readmatrix.hpp b/readmatrix.hpp
index 2c47832f166ea0df47a7b5f5a8760c73f9ce2dfe..49ae2946fda42c49c8475b040ac8f7e3f5617499 100644 (file)
--- 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;
 };