Browse code

The dims() generic now is defined in the BiocGenerics package

Hervé Pagès authored on 15/06/2018 23:10:13
Showing 6 changed files

... ...
@@ -1,11 +1,11 @@
1 1
 Package: Biobase
2 2
 Title: Biobase: Base functions for Bioconductor
3
-Version: 2.41.0
3
+Version: 2.41.1
4 4
 Author: R. Gentleman, V. Carey, M. Morgan, S. Falcon
5 5
 Description: Functions that are needed by many other packages or which
6 6
         replace R functions.
7 7
 Suggests: tools, tkWidgets, ALL, RUnit, golubEsets
8
-Depends: R (>= 2.10), BiocGenerics (>= 0.3.2), utils
8
+Depends: R (>= 2.10), BiocGenerics (>= 0.27.1), utils
9 9
 Imports: methods
10 10
 Maintainer: Bioconductor Package Maintainer
11 11
         <[email protected]>
... ...
@@ -3,6 +3,7 @@ useDynLib(Biobase, copyEnv_sym=copyEnv, sublist_extract)
3 3
 import(methods)
4 4
 
5 5
 importFrom(BiocGenerics,
6
+    dims,
6 7
     combine,
7 8
     updateObject, updateObjectFromSlots, getObjectSlots,
8 9
     annotation, "annotation<-"
... ...
@@ -10,7 +10,6 @@ setGeneric("content",         function(object) standardGeneric("content"))
10 10
 setGeneric("description",     function(object, ...)
11 11
            standardGeneric("description"))
12 12
 setGeneric("description<-",   function(object, value) standardGeneric("description<-"))
13
-setGeneric("dims",            function(object) standardGeneric("dims"))
14 13
 setGeneric("dimnames")
15 14
 setGeneric("dimnames<-")
16 15
 setGeneric("dimLabels",       function(object) standardGeneric("dimLabels"))
... ...
@@ -349,7 +349,7 @@ setReplaceMethod("dimnames", "eSet", function(x, value) {
349 349
 
350 350
 setMethod("dim", "eSet", function(x) assayDataDim(assayData(x)))
351 351
 
352
-setMethod("dims", "eSet", function(object) assayDataDims(assayData(object)))
352
+setMethod("dims", "eSet", function(x) assayDataDims(assayData(x)))
353 353
 
354 354
 setMethod("[", "eSet", function(x, i, j, ..., drop = FALSE) {
355 355
   if (missing(drop))
... ...
@@ -27,6 +27,7 @@
27 27
 \alias{dimnames,eSet-method}
28 28
 \alias{dimnames<-,eSet-method}
29 29
 \alias{dim,eSet-method}
30
+\alias{dims}
30 31
 \alias{dims,eSet-method}
31 32
 \alias{experimentData,eSet-method}
32 33
 \alias{experimentData<-,eSet,MIAME-method}
33 34
deleted file mode 100644
... ...
@@ -1,23 +0,0 @@
1
-\name{dims}
2
-\alias{dims}
3
-
4
-\title{Retrieve dimensions of all elements in a list or environment}
5
-\description{
6
-  This function returns the dimensions of element members in lists or
7
-  environments such as \code{AssayData-class}.
8
-}
9
-\usage{
10
-dims(object)
11
-}
12
-\arguments{
13
-  \item{object}{List or environment object containing one or several matrices}
14
-}
15
-\value{
16
-  matrix of row and column dimensions, (in rows) for each element in
17
-  \code{object} (columns). 
18
-}
19
-\author{Biocore}
20
-
21
-\seealso{\code{\link{eSet-class}}}
22
-
23
-\keyword{manip}