review updates

seqan · Aug 12, 2024 · fb2b053 · fb2b053
1 parent 2bd3db6
commit fb2b053
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 19 deletions.
diff --git a/include/hibf/sketch/compute_sketches.hpp b/include/hibf/sketch/compute_sketches.hpp
@@ -26,10 +26,4 @@ void compute_sketches(config const & config,
                       std::vector<sketch::hyperloglog> & hll_sketches,
                       std::vector<sketch::minhashes> & minhash_sketches);
 
-//!\overload
-void compute_sketches(config const & config,
-                      std::vector<size_t> & kmer_counts,
-                      std::vector<sketch::hyperloglog> & hll_sketches,
-                      std::vector<sketch::minhashes> & minhash_sketches);
-
 } // namespace seqan::hibf::sketch
diff --git a/src/hierarchical_interleaved_bloom_filter.cpp b/src/hierarchical_interleaved_bloom_filter.cpp
@@ -206,10 +206,10 @@ hierarchical_interleaved_bloom_filter::hierarchical_interleaved_bloom_filter(con
     configuration.validate_and_set_defaults();
 
     std::vector<sketch::hyperloglog> sketches{};
+    std::vector<size_t> kmer_counts{};
+
     layout_compute_sketches_timer.start();
     sketch::compute_sketches(configuration, sketches);
-    std::vector<size_t> kmer_counts{};
-    kmer_counts.resize(configuration.number_of_user_bins);
     hibf::sketch::estimate_kmer_counts(sketches, kmer_counts);
     layout_compute_sketches_timer.stop();
 

diff --git a/src/sketch/compute_sketches.cpp b/src/sketch/compute_sketches.cpp
@@ -159,14 +159,4 @@ void compute_sketches(config const & config,
     too_few_kmers.check_and_throw();
 }
 
-void compute_sketches(config const & config,
-                      std::vector<size_t> & kmer_counts,
-                      std::vector<sketch::hyperloglog> & hll_sketches,
-                      std::vector<sketch::minhashes> & minhash_sketches)
-{
-    compute_sketches(config, hll_sketches, minhash_sketches);
-    kmer_counts.resize(config.number_of_user_bins);
-    sketch::estimate_kmer_counts(hll_sketches, kmer_counts);
-}
-
 } // namespace seqan::hibf::sketch
diff --git a/test/unit/hibf/layout/compute_layout_test.cpp b/test/unit/hibf/layout/compute_layout_test.cpp
@@ -35,7 +35,6 @@ TEST(compute_layout, dispatch)
     std::vector<size_t> kmer_counts;
 
     seqan::hibf::sketch::compute_sketches(config, sketches);
-    kmer_counts.resize(sketches.size());
     seqan::hibf::sketch::estimate_kmer_counts(sketches, kmer_counts);
 
     auto layout1 = seqan::hibf::layout::compute_layout(config, kmer_counts, sketches);