Skip to content

Commit 2234f43

Browse files
committed
Resync with recent change to DelayedArray
Use getDefaultBlockLength(type(x)) instead of DelayedArray:::get_default_block_maxlength(type(x)).
1 parent 0762e6c commit 2234f43

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

DESCRIPTION

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: minfi
2-
Version: 1.27.5
2+
Version: 1.27.6
33
Title: Analyze Illumina Infinium DNA methylation arrays
44
Description: Tools to analyze & visualize Illumina Infinium methylation arrays.
55
Authors@R: c(person(c("Kasper", "Daniel"), "Hansen", role = c("cre", "aut"),
@@ -55,7 +55,7 @@ Imports: S4Vectors,
5555
grDevices,
5656
graphics,
5757
utils,
58-
DelayedArray (>= 0.7.17),
58+
DelayedArray (>= 0.7.27),
5959
HDF5Array,
6060
BiocParallel
6161
Collate: AllGenerics.R

R/DelayedArray_utils.R

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,18 @@ setMethod("dimnames", "arrayRealizationSink", function(x) {
1818
# Helper functions for setting up ArrayGrid instances --------------------------
1919

2020
colGrid <- function(x) {
21-
block_maxlen <- max(nrow(x),
22-
DelayedArray:::get_default_block_maxlength(type(x)))
23-
makeRegularArrayGridOfCappedLengthViewports(dim(x), block_maxlen,
21+
block_len <- max(nrow(x), getDefaultBlockLength(type(x)))
22+
makeRegularArrayGridOfCappedLengthViewports(dim(x), block_len,
2423
"first-dim-grows-first")
2524
}
2625

2726
rowGrid <- function(x) {
28-
block_maxlen <- max(ncol(x),
29-
DelayedArray:::get_default_block_maxlength(type(x)))
27+
block_len <- max(ncol(x), getDefaultBlockLength(type(x)))
3028
## Is the "hypercube" shape really intentional? Or should the
3129
## "last-dim-grows-first" shape be used instead? (Like in
3230
## DelayedMatrixStats:::block_APPLY() when MARGIN == 1L.)
3331
## [H.P. -- 06/29/2018]
34-
makeRegularArrayGridOfCappedLengthViewports(dim(x), block_maxlen,
32+
makeRegularArrayGridOfCappedLengthViewports(dim(x), block_len,
3533
"hypercube")
3634
}
3735

0 commit comments

Comments
 (0)