Browse code

merging NAMESPACE with AnnotatedDataFrame import

git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_13/madman/Rpacks/crlmm@86688 bc3139a8-67e5-0310-9ffc-ced21a209358

Rob Scharp authored on 21/02/2014 19:08:02
Showing2 changed files

... ...
@@ -1,8 +1,8 @@
1 1
 Package: crlmm
2 2
 Type: Package
3 3
 Title: Genotype Calling (CRLMM) and Copy Number Analysis tool for Affymetrix SNP 5.0 and 6.0 and Illumina arrays.
4
-Version: 1.20.2
5
-Date: Wed Oct 30 21:59:28 EDT 2013
4
+Version: 1.20.4
5
+Date: Fri Feb 21 14:04:52 EST 2014
6 6
 Author: Benilton S Carvalho, Robert Scharpf, Matt Ritchie, Ingo Ruczinski, Rafael A Irizarry
7 7
 Maintainer: Benilton S Carvalho <Benilton.Carvalho@cancer.org.uk>, Robert Scharpf <rscharpf@jhsph.edu>, Matt Ritchie <mritchie@wehi.EDU.AU>
8 8
 Description: Faster implementation of CRLMM specific to SNP 5.0 and 6.0 arrays, as well as a copy number tool specific to 5.0, 6.0, and Illumina platforms
... ...
@@ -17,7 +17,8 @@ importClassesFrom(oligoClasses, CNSet, oligoSnpSet, ff_or_matrix)
17 17
 ##setOldClass(ff_or_matrix)
18 18
 import(matrixStats)
19 19
 
20
-importMethodsFrom(Biobase, annotatedDataFrameFrom, annotation,
20
+importMethodsFrom(Biobase, AnnotatedDataFrame,
21
+									annotatedDataFrameFrom, annotation,
21 22
                   assayData, experimentData, featureData,
22 23
                   "featureData<-", featureNames, "featureNames<-",
23 24
                   pData, "pData<-", phenoData, "phenoData<-",