diff --git a/src/linclust/kmermatcher.cpp b/src/linclust/kmermatcher.cpp index 536cdff3..7bb3f076 100644 --- a/src/linclust/kmermatcher.cpp +++ b/src/linclust/kmermatcher.cpp @@ -482,7 +482,7 @@ KmerPosition * doComputation(size_t &totalKmers, size_t h par.kmerSize = ret.second; Debug(Debug::INFO) << "\nAdjusted k-mer length " << par.kmerSize << "\n"; }else{ - std::pair ret = fillKmerPositionArray(hashSeqPair, totalKmers, seqDbr, par, subMat, true, hashStartRange, hashEndRange, NULL); + std::pair ret = fillKmerPositionArray(hashSeqPair, totalKmers, seqDbr, par, subMat, true, hashStartRange, hashEndRange, NULL); elementsToSort = ret.first; } if(hashEndRange == SIZE_T_MAX){ @@ -1581,29 +1581,29 @@ void setKmerLengthAndAlphabet(Parameters ¶meters, size_t aaDbSize, int seqTy } } -template std::pair fillKmerPositionArray<0, short, false>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<0, short, false>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<1, short, false>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<1, short, false>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<2, short, false>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<2, short, false>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<0, int, false>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<0, int, false>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<1, int, false>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<1, int, false>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<2, int, false>(KmerPosition< int, false> * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<2, int, false>(KmerPosition< int, false> * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<0, short, true>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<0, short, true>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<1, short, true>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<1, short, true>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<2, short, true>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<2, short, true>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<0, int, true>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<0, int, true>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<1, int, true>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<1, int, true>(KmerPosition * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); -template std::pair fillKmerPositionArray<2, int, true>(KmerPosition< int, true> * kmerArray, size_t kmerArraySize, DBReader &seqDbr, +template std::pair fillKmerPositionArray<2, int, true>(KmerPosition< int, true> * kmerArray, size_t kmerArraySize, DBReader &seqDbr, Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution); template KmerPosition *initKmerPositionMemory(size_t size); diff --git a/src/linclust/kmermatcher.h b/src/linclust/kmermatcher.h index 64ce325d..1b7d158b 100644 --- a/src/linclust/kmermatcher.h +++ b/src/linclust/kmermatcher.h @@ -62,9 +62,7 @@ struct AdjacentSeqArray { // save memory when adjacent sequence is unused template <> struct AdjacentSeqArray { - void setAdjacentSeq(const int, const unsigned char) { - Debug(Debug::ERROR) << "Invalid write attempt at adjacent sequence array"; - }; + void setAdjacentSeq(const int, const unsigned char) {}; unsigned char getAdjacentSeq(int) { Debug(Debug::ERROR) << "Invalid read attempt at adjacent sequence array"; return '\0';