@@ -482,7 +482,7 @@ KmerPosition<T, IncludeAdjacentSeq> * doComputation(size_t &totalKmers, size_t h
482482 par.kmerSize = ret.second ;
483483 Debug (Debug::INFO) << " \n Adjusted k-mer length " << par.kmerSize << " \n " ;
484484 }else {
485- std::pair<size_t , size_t > ret = fillKmerPositionArray<Parameters::DBTYPE_AMINO_ACIDS, T>(hashSeqPair, totalKmers, seqDbr, par, subMat, true , hashStartRange, hashEndRange, NULL );
485+ std::pair<size_t , size_t > ret = fillKmerPositionArray<Parameters::DBTYPE_AMINO_ACIDS, T, IncludeAdjacentSeq >(hashSeqPair, totalKmers, seqDbr, par, subMat, true , hashStartRange, hashEndRange, NULL );
486486 elementsToSort = ret.first ;
487487 }
488488 if (hashEndRange == SIZE_T_MAX){
@@ -1581,29 +1581,29 @@ void setKmerLengthAndAlphabet(Parameters ¶meters, size_t aaDbSize, int seqTy
15811581 }
15821582}
15831583
1584- template std::pair<size_t , size_t > fillKmerPositionArray<0 , short , false >(KmerPosition<short , false > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1584+ template std::pair<size_t , size_t > fillKmerPositionArray<0 , short , false >(KmerPosition<short , false > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
15851585 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1586- template std::pair<size_t , size_t > fillKmerPositionArray<1 , short , false >(KmerPosition<short , false > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1586+ template std::pair<size_t , size_t > fillKmerPositionArray<1 , short , false >(KmerPosition<short , false > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
15871587 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1588- template std::pair<size_t , size_t > fillKmerPositionArray<2 , short , false >(KmerPosition<short , false > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1588+ template std::pair<size_t , size_t > fillKmerPositionArray<2 , short , false >(KmerPosition<short , false > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
15891589 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1590- template std::pair<size_t , size_t > fillKmerPositionArray<0 , int , false >(KmerPosition<int , false > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1590+ template std::pair<size_t , size_t > fillKmerPositionArray<0 , int , false >(KmerPosition<int , false > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
15911591 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1592- template std::pair<size_t , size_t > fillKmerPositionArray<1 , int , false >(KmerPosition <int , false >* kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1592+ template std::pair<size_t , size_t > fillKmerPositionArray<1 , int , false >(KmerPosition <int , false >* kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
15931593 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1594- template std::pair<size_t , size_t > fillKmerPositionArray<2 , int , false >(KmerPosition< int , false > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1594+ template std::pair<size_t , size_t > fillKmerPositionArray<2 , int , false >(KmerPosition< int , false > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
15951595 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1596- template std::pair<size_t , size_t > fillKmerPositionArray<0 , short , true >(KmerPosition<short , true > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1596+ template std::pair<size_t , size_t > fillKmerPositionArray<0 , short , true >(KmerPosition<short , true > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
15971597 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1598- template std::pair<size_t , size_t > fillKmerPositionArray<1 , short , true >(KmerPosition<short , true > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1598+ template std::pair<size_t , size_t > fillKmerPositionArray<1 , short , true >(KmerPosition<short , true > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
15991599 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1600- template std::pair<size_t , size_t > fillKmerPositionArray<2 , short , true >(KmerPosition<short , true > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1600+ template std::pair<size_t , size_t > fillKmerPositionArray<2 , short , true >(KmerPosition<short , true > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
16011601 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1602- template std::pair<size_t , size_t > fillKmerPositionArray<0 , int , true >(KmerPosition<int , true > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1602+ template std::pair<size_t , size_t > fillKmerPositionArray<0 , int , true >(KmerPosition<int , true > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
16031603 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1604- template std::pair<size_t , size_t > fillKmerPositionArray<1 , int , true >(KmerPosition <int , true >* kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1604+ template std::pair<size_t , size_t > fillKmerPositionArray<1 , int , true >(KmerPosition <int , true >* kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
16051605 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
1606- template std::pair<size_t , size_t > fillKmerPositionArray<2 , int , true >(KmerPosition< int , true > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
1606+ template std::pair<size_t , size_t > fillKmerPositionArray<2 , int , true >(KmerPosition< int , true > * kmerArray, size_t kmerArraySize, DBReader<unsigned int > &seqDbr,
16071607 Parameters & par, BaseMatrix * subMat, bool hashWholeSequence, size_t hashStartRange, size_t hashEndRange, size_t * hashDistribution);
16081608
16091609template KmerPosition<short , false > *initKmerPositionMemory (size_t size);
0 commit comments