Commit 69e40ee9 authored by Rayan Chikhi's avatar Rayan Chikhi
Browse files

fixed a nasty bug in bcalm - fast minimizer computation shouldn't be done at all in freq order

parent 6e463177
......@@ -1081,7 +1081,7 @@ struct Kmer
* \param[in] kmerSize : size of the kmers handled by the model.
* \param[in] minimizerSize : size of the mmers handled by the model.
* \param[in] cmp : functor that compares two minizers
* \param[in] freq_order : tbd
* \param[in] freq_order : a 4^m table containing the frequency of each minimizer
*/
ModelMinimizer (size_t kmerSize, size_t minimizerSize, Comparator cmp=Comparator(), uint32_t *freq_order=NULL)
: ModelAbstract <ModelMinimizer<ModelType,Comparator>, Kmer > (kmerSize),
......@@ -1357,7 +1357,7 @@ struct Kmer
* Note: only used for KmerCanonicals */
void computeNewMinimizer(KmerMinimizer<ModelCanonical, Comparator>& kmer, bool fastMethod = true) const
{
if (!fastMethod)
if (!fastMethod || _freq_order) // fast method doesn't work with frequency order
{
computeNewMinimizerOriginal(kmer);
return;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment