get_chunk_length is now a free function accepting a ChunkDimensionStats.

tatami-inc · May 18, 2024 · c925074 · c925074
1 parent 9f6c5bc
commit c925074
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/include/tatami_hdf5/DenseMatrix.hpp b/include/tatami_hdf5/DenseMatrix.hpp
@@ -224,7 +224,7 @@ struct MyopicBase : public Base {
                 return factory.create();
             },
             /* populate = */ [&](Index_ id, Slab& contents) -> void {
-                auto curdim = dim_stats.get_chunk_length(id);
+                auto curdim = tatami_chunked::get_chunk_length(dim_stats, id);
                 auto output = [&](){
                     if constexpr(!by_h5_row_) {
                         return transposition_buffer.data();
@@ -318,7 +318,7 @@ struct OracularBase : public Base {
 
                 serialize([&]() -> void {
                     for (const auto& c : chunks) {
-                        auto curdim = dim_stats.get_chunk_length(c.first);
+                        auto curdim = tatami_chunked::get_chunk_length(dim_stats, c.first);
                         extract(c.first * dim_stats.chunk_length, curdim, c.second->data);
                         if constexpr(!by_h5_row_) {
                             cache_transpose_info.emplace_back(c.second, curdim);

diff --git a/include/tatami_hdf5/sparse_secondary.hpp b/include/tatami_hdf5/sparse_secondary.hpp
@@ -139,7 +139,7 @@ class MyopicSecondaryBase : public SecondaryBase {
         Index_ chunk_offset = i % sec_dim_stats.chunk_length;
 
         if (chunk_id != last_chunk_id || first) { 
-            Index_ clen = sec_dim_stats.get_chunk_length(chunk_id);
+            Index_ clen = tatami_chunked::get_chunk_length(sec_dim_stats, chunk_id);
             std::fill_n(cache_count.begin(), clen, 0);
 
             serialize([&]() {