From b534c693acb33276e2d8c7ef348981e0cc498600 Mon Sep 17 00:00:00 2001 From: Eric Coissac Date: Mon, 20 Apr 2026 16:57:50 +0200 Subject: [PATCH] :wrench: refactor(iter): simplify minimizer access via new canonical_minimizer_raw() - Replace `canonicalMinimzer().map(|k| k.raw())` with direct call to new helper method - Add `canonical_minimizer_raw()` in RollingStat for cleaner access of raw minimizer value --- src/obiskbuilder/src/iter.rs | 2 +- src/obiskbuilder/src/rolling_stat.rs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/obiskbuilder/src/iter.rs b/src/obiskbuilder/src/iter.rs index 7f0f9d4..abb333f 100644 --- a/src/obiskbuilder/src/iter.rs +++ b/src/obiskbuilder/src/iter.rs @@ -107,7 +107,7 @@ impl Iterator for SuperKmerIter<'_> { continue; } - let min = self.stat.canonical_minimizer().map(|k| k.raw()).unwrap_or(0); + let min = self.stat.canonical_minimizer_raw().unwrap_or(0); let min_pos = self.stat.minimizer_position().unwrap_or(0); // ── 2. Minimizer change check ───────────────────────────────────── diff --git a/src/obiskbuilder/src/rolling_stat.rs b/src/obiskbuilder/src/rolling_stat.rs index 232ffed..002f52b 100644 --- a/src/obiskbuilder/src/rolling_stat.rs +++ b/src/obiskbuilder/src/rolling_stat.rs @@ -266,6 +266,14 @@ impl RollingStat { } } + pub fn canonical_minimizer_raw(&self) -> Option { + if self.ready() { + self.minimier.front().map(|it| it.canonical) + } else { + None + } + } + pub fn entropy(&self, order: usize) -> Option { if !self.ready() { return None;