diff --git a/src/libhictk/balancing/include/hictk/balancing/ice.hpp b/src/libhictk/balancing/include/hictk/balancing/ice.hpp index ce492da6a..021745e0c 100644 --- a/src/libhictk/balancing/include/hictk/balancing/ice.hpp +++ b/src/libhictk/balancing/include/hictk/balancing/ice.hpp @@ -139,18 +139,18 @@ class ICE { static void min_count_filtering(nonstd::span biases, std::size_t min_count, nonstd::span marg); - static void mad_max_filtering(nonstd::span chrom_offsets, + static void mad_max_filtering(nonstd::span chrom_offsets, nonstd::span biases, nonstd::span marg, double mad_max); template static void initialize_biases(const MatrixT& matrix, nonstd::span biases, - nonstd::span chrom_bin_offsets, + nonstd::span chrom_bin_offsets, std::size_t min_nnz, std::size_t min_count, double mad_max, BS::thread_pool* tpool); [[nodiscard]] static std::vector compute_weights_from_chromosome_sizes( - const BinTable& bins, nonstd::span chrom_bin_offsets); + const BinTable& bins, nonstd::span chrom_bin_offsets); }; } // namespace hictk::balancing diff --git a/src/libhictk/balancing/include/hictk/balancing/impl/ice_impl.hpp b/src/libhictk/balancing/include/hictk/balancing/impl/ice_impl.hpp index db036cb40..408cbeadc 100644 --- a/src/libhictk/balancing/include/hictk/balancing/impl/ice_impl.hpp +++ b/src/libhictk/balancing/include/hictk/balancing/impl/ice_impl.hpp @@ -421,7 +421,7 @@ inline void ICE::min_count_filtering(nonstd::span biases, std::size_t mi } } -inline void ICE::mad_max_filtering(nonstd::span chrom_offsets, +inline void ICE::mad_max_filtering(nonstd::span chrom_offsets, nonstd::span biases, nonstd::span marg, double mad_max) { auto median = [](auto v) { @@ -601,7 +601,7 @@ inline double ICE::compute_ssq_nzmarg(nonstd::span marg, double av template inline void ICE::initialize_biases(const MatrixT& matrix, nonstd::span biases, - nonstd::span chrom_bin_offsets, + nonstd::span chrom_bin_offsets, std::size_t min_nnz, std::size_t min_count, double mad_max, BS::thread_pool* tpool) { if (min_nnz == 0 && min_count == 0 && mad_max == 0) { @@ -631,7 +631,7 @@ inline void ICE::initialize_biases(const MatrixT& matrix, nonstd::span b } inline std::vector ICE::compute_weights_from_chromosome_sizes( - const BinTable& bins, nonstd::span chrom_bin_offsets) { + const BinTable& bins, nonstd::span chrom_bin_offsets) { std::vector weights(bins.size()); for (std::uint32_t i = 1; i < chrom_bin_offsets.size(); ++i) { const auto& chrom = bins.chromosomes().at(i - 1); diff --git a/src/libhictk/balancing/include/hictk/balancing/impl/sparse_matrix_impl.hpp b/src/libhictk/balancing/include/hictk/balancing/impl/sparse_matrix_impl.hpp index 412b84407..1cc20a7bf 100644 --- a/src/libhictk/balancing/include/hictk/balancing/impl/sparse_matrix_impl.hpp +++ b/src/libhictk/balancing/include/hictk/balancing/impl/sparse_matrix_impl.hpp @@ -80,7 +80,7 @@ constexpr std::size_t MargsVector::compute_number_of_mutexes(std::size_t size) n } template -constexpr I MargsVector::next_pow2(I n) noexcept { +inline I MargsVector::next_pow2(I n) noexcept { using ull = unsigned long long; if constexpr (std::is_signed_v) { assert(n >= 0); diff --git a/src/libhictk/balancing/include/hictk/balancing/sparse_matrix.hpp b/src/libhictk/balancing/include/hictk/balancing/sparse_matrix.hpp index 2f150ddc6..4a00fb912 100644 --- a/src/libhictk/balancing/include/hictk/balancing/sparse_matrix.hpp +++ b/src/libhictk/balancing/include/hictk/balancing/sparse_matrix.hpp @@ -62,7 +62,7 @@ class MargsVector { private: static constexpr std::size_t compute_number_of_mutexes(std::size_t size) noexcept; template >> - [[nodiscard]] static constexpr I next_pow2(I n) noexcept; + [[nodiscard]] static I next_pow2(I n) noexcept; [[nodiscard]] std::size_t get_mutex_idx(std::size_t i) const noexcept; };