X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=readblast.h;h=ef5ff9afa182f5fb7f7226c506481a0252964962;hb=5b72d1cf3fa48730e5bb70d59cced1e43e1fe424;hp=536d1af05db87dce20deaf344bd6410b952a61cb;hpb=74844a60d80c6dd06e3fb02ee9b928424f9019b0;p=mothur.git diff --git a/readblast.h b/readblast.h index 536d1af..ef5ff9a 100644 --- a/readblast.h +++ b/readblast.h @@ -10,7 +10,7 @@ */ #include "mothur.h" -#include "sparsematrix.hpp" +#include "sparsedistancematrix.h" #include "nameassignment.hpp" /****************************************************************************************/ @@ -25,8 +25,8 @@ public: ReadBlast(string, float, float, int, bool, bool); //blastfile, cutoff, penalty, length of overlap, min or max bsr, hclusterWanted ~ReadBlast() {} - void read(NameAssignment*); - SparseMatrix* getDistMatrix() { return matrix; } + int read(NameAssignment*); + SparseDistanceMatrix* getDistMatrix() { return matrix; } vector getOverlapMatrix() { return overlap; } string getOverlapFile() { return overlapFile; } string getDistFile() { return distFile; } @@ -38,11 +38,11 @@ private: bool minWanted; //if true choose min bsr, if false choose max bsr bool hclusterWanted; - SparseMatrix* matrix; + SparseDistanceMatrix* matrix; vector overlap; MothurOut* m; - void readNames(NameAssignment*); + int readNames(NameAssignment*); }; /*******************************************************************************************/