Browse code

Re-sync with DelayedArray

Peter Hickey authored on 08/04/2018 18:47:50
Showing 2 changed files

... ...
@@ -1,5 +1,5 @@
1 1
 Package: bsseq
2
-Version: 1.13.9
2
+Version: 1.13.10
3 3
 Encoding: UTF-8
4 4
 Title: Analyze, manage and store bisulfite sequencing data
5 5
 Description: A collection of tools for analyzing and visualizing bisulfite
... ...
@@ -29,7 +29,7 @@ Imports:
29 29
     matrixStats (>= 0.50.0),
30 30
     permute,
31 31
     limma,
32
-    DelayedArray,
32
+    DelayedArray (>= 0.5.27),
33 33
     HDF5Array
34 34
 Suggests:
35 35
     RUnit,
... ...
@@ -4,8 +4,12 @@
4 4
 #
5 5
 
6 6
 .getSeedClasses <- function(seed) {
7
-    if (is(seed, "SeedBinder") || is(seed, "ConformableSeedCombiner")) {
8
-        seeds <- seed@seeds
7
+    if (is(seed, "DelayedOp")) {
8
+        seeds <- try(seed@seeds, silent = TRUE)
9
+        if (is(seeds, "try-error")) {
10
+            seed <- seed@seed
11
+            return(.getSeedClasses(seed))
12
+        }
9 13
         return(lapply(seeds, .getSeedClasses))
10 14
     } else if (is(seed, "DelayedArray")) {
11 15
         # A DelayedArray can have another DelayedArray as a seed