diff --git a/include/tatami_chunked/CustomDenseChunkedMatrix.hpp b/include/tatami_chunked/CustomDenseChunkedMatrix.hpp index 4ce8543..4c0348a 100644 --- a/include/tatami_chunked/CustomDenseChunkedMatrix.hpp +++ b/include/tatami_chunked/CustomDenseChunkedMatrix.hpp @@ -309,11 +309,11 @@ class CustomDenseChunkedMatrix : public tatami::Matrix { return static_cast(coordinator.prefer_rows_internal()); } - bool sparse() const { + bool is_sparse() const { return false; } - double sparse_proportion() const { + double is_sparse_proportion() const { return 0; } diff --git a/include/tatami_chunked/CustomSparseChunkedMatrix.hpp b/include/tatami_chunked/CustomSparseChunkedMatrix.hpp index 66074ab..ea9b905 100644 --- a/include/tatami_chunked/CustomSparseChunkedMatrix.hpp +++ b/include/tatami_chunked/CustomSparseChunkedMatrix.hpp @@ -482,11 +482,11 @@ class CustomSparseChunkedMatrix : public tatami::Matrix { return static_cast(coordinator.prefer_rows_internal()); } - bool sparse() const { + bool is_sparse() const { return true; } - double sparse_proportion() const { + double is_sparse_proportion() const { return 1; } diff --git a/tests/src/mock_sparse_chunk.cpp b/tests/src/mock_sparse_chunk.cpp index 764c2ba..845beb5 100644 --- a/tests/src/mock_sparse_chunk.cpp +++ b/tests/src/mock_sparse_chunk.cpp @@ -38,7 +38,7 @@ class MockSimpleSparseChunkUtils { auto full = tatami_test::simulate_sparse_vector(dim.first * dim.second, 0.2, -10, 10, /* seed = */ dim.first * dim.second); tatami::DenseRowMatrix tmp(dim.first, dim.second, std::move(full)); - auto compressed = tatami::retrieve_compressed_sparse_contents(&tmp, true); + auto compressed = tatami::retrieve_compressed_sparse_contents(&tmp, true, true); mock = tatami_chunked::MockSimpleSparseChunk( dim.first, dim.second, @@ -57,7 +57,7 @@ class MockSimpleSparseChunkUtils { ref.reset(new tatami::CompressedSparseRowMatrix(dim.first, dim.second, std::move(compressed.value), std::move(compressed.index), std::move(compressed.pointers))); - auto compressed2 = tatami::retrieve_compressed_sparse_contents(ref.get(), true); + auto compressed2 = tatami::retrieve_compressed_sparse_contents(ref.get(), false, true); dcm_chunk = tatami_chunked::SimpleSparseChunkWrapper >(MockSparseBlob( dim.first, dim.second, @@ -484,7 +484,7 @@ class MockSubsettedSparseChunkUtils { auto full = tatami_test::simulate_sparse_vector(dim.first * dim.second, 0.2, -10, 10, /* seed = */ dim.first * dim.second + 1); tatami::DenseRowMatrix tmp(dim.first, dim.second, std::move(full)); - auto compressed = tatami::retrieve_compressed_sparse_contents(&tmp, true); + auto compressed = tatami::retrieve_compressed_sparse_contents(&tmp, true, true); mock = tatami_chunked::MockSubsettedSparseChunk( dim.first, dim.second,