fix: canonical minimizer

tlemane · tlemane · commit 3bfce80c4a1e · 2021-10-27T17:28:49.000+02:00
diff --git a/include/kmtricks/kmer.hpp b/include/kmtricks/kmer.hpp
@@ -608,7 +608,8 @@ class Kmer
         rev |= revB[tmp & 3];
         tmp >>= 2;
       }
-      Mmer tmp_minim(value, size);
+      //Mmer tmp_minim(value, size);
+      Mmer tmp_minim(rev < value ? rev : value, size);
       if (is_valid_minimizer(tmp_minim.value(), size))
       {
         if (tmp_minim < minim)
@@ -864,8 +865,8 @@ template<> class Kmer<32>
         rev |= revB[tmp & 3];
         tmp >>= 2;
       }
-      //Mmer tmp_minim(rev < value ? rev : value, size);
-      Mmer tmp_minim(value, size);
+      Mmer tmp_minim(rev < value ? rev : value, size);
+      //Mmer tmp_minim(value, size);
       if (is_valid_minimizer(tmp_minim.value(), size))
       {
         if (tmp_minim < minim)
@@ -1147,7 +1148,8 @@ template<> class Kmer<64>
         rev |= revB[tmp & 3];
         tmp >>= 2;
       }
-      Mmer tmp_minim(value, size);
+      //Mmer tmp_minim(value, size);
+      Mmer tmp_minim(rev < value ? rev : value, size);
       if (is_valid_minimizer(tmp_minim.value(), size))
       {
         if (tmp_minim < minim)

Original file line number	Diff line number	Diff line change
`@@ -608,7 +608,8 @@ class Kmer`
`608`	`608`	`rev \|= revB[tmp & 3];`
`609`	`609`	`tmp >>= 2;`
`610`	`610`	`}`
`611`		`- Mmer tmp_minim(value, size);`
	`611`	`+ //Mmer tmp_minim(value, size);`
	`612`	`+ Mmer tmp_minim(rev < value ? rev : value, size);`
`612`	`613`	`if (is_valid_minimizer(tmp_minim.value(), size))`
`613`	`614`	`{`
`614`	`615`	`if (tmp_minim < minim)`
`@@ -864,8 +865,8 @@ template<> class Kmer<32>`
`864`	`865`	`rev \|= revB[tmp & 3];`
`865`	`866`	`tmp >>= 2;`
`866`	`867`	`}`
`867`		`- //Mmer tmp_minim(rev < value ? rev : value, size);`
`868`		`- Mmer tmp_minim(value, size);`
	`868`	`+ Mmer tmp_minim(rev < value ? rev : value, size);`
	`869`	`+ //Mmer tmp_minim(value, size);`
`869`	`870`	`if (is_valid_minimizer(tmp_minim.value(), size))`
`870`	`871`	`{`
`871`	`872`	`if (tmp_minim < minim)`
`@@ -1147,7 +1148,8 @@ template<> class Kmer<64>`
`1147`	`1148`	`rev \|= revB[tmp & 3];`
`1148`	`1149`	`tmp >>= 2;`
`1149`	`1150`	`}`
`1150`		`- Mmer tmp_minim(value, size);`
	`1151`	`+ //Mmer tmp_minim(value, size);`
	`1152`	`+ Mmer tmp_minim(rev < value ? rev : value, size);`
`1151`	`1153`	`if (is_valid_minimizer(tmp_minim.value(), size))`
`1152`	`1154`	`{`
`1153`	`1155`	`if (tmp_minim < minim)`