X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readmatrix.hpp;fp=readmatrix.hpp;h=5ef8afa9d7846a18957ac30cb483e0be98f6450f;hb=0cefb55a2616975bd4a144fc345693695ffc9bb6;hp=49ae2946fda42c49c8475b040ac8f7e3f5617499;hpb=44f3a3c81a34fdee62550d98838a4b421e8df08e;p=mothur.git diff --git a/readmatrix.hpp b/readmatrix.hpp index 49ae294..5ef8afa 100644 --- a/readmatrix.hpp +++ b/readmatrix.hpp @@ -12,27 +12,26 @@ #include "mothur.h" #include "listvector.hpp" -#include "sparsematrix.hpp" #include "nameassignment.hpp" +#include "sparsedistancematrix.h" class SparseMatrix; class ReadMatrix { public: - ReadMatrix(){ D = new SparseMatrix(); m = MothurOut::getInstance(); } + ReadMatrix(){ DMatrix = new SparseDistanceMatrix(); m = MothurOut::getInstance(); } virtual ~ReadMatrix() {} virtual int read(NameAssignment*){ 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; float cutoff; MothurOut* m;