Browse code

Fixes as per Nishant recommendation: imports/registration of relevant C functions/version numbering/examples in man

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

Benilton Carvalho authored on 15/01/2009 23:17:16
Showing 6 changed files

... ...
@@ -1,13 +1,13 @@
1 1
 Package: crlmm
2 2
 Type: Package
3 3
 Title: Genotype Calling via CRLMM Algorithm
4
-Version: 1.27
4
+Version: 1.0.29
5 5
 Date: 2008-12-28
6 6
 Author: Rafael A Irizarry
7 7
 Maintainer: Benilton S Carvalho <bcarvalh@jhsph.edu>
8 8
 Description: Faster implementation of CRLMM specific to SNP 5.0 and 6.0 arrays.
9
-License: Artistic-2.0
10 9
 Depends: methods, affyio, preprocessCore, utils
10
+License: Artistic-2.0
11 11
 Suggests: hapmapsnp5, genomewidesnp5Crlmm
12 12
 Collate: crlmmGT.R
13 13
          crlmm.R
... ...
@@ -1,4 +1,8 @@
1 1
 useDynLib("crlmm")
2
-import(methods)
2
+import(methods, utils)
3 3
 export("crlmm",
4 4
        "list.celfiles")
5
+
6
+importFrom(affyio, read.celfile.header, read.celfile)
7
+
8
+importFrom(preprocessCore, normalize.quantiles.use.target)
... ...
@@ -1,4 +1,5 @@
1 1
 snprma <- function(filenames, mixtureSampleSize=10^5, fitMixture=FALSE, eps=0.1, verbose=TRUE, seed=1, cdfName, sns){
2
+  if (missing(sns)) sns <- basename(filenames)
2 3
   ##ADD CHECK TO SEE IF LOADED
3 4
   if (missing(cdfName))
4 5
     cdfName <- read.celfile.header(filenames[1])$cdfName
5 6
Binary files a/inst/doc/crlmm.pdf and b/inst/doc/crlmm.pdf differ
... ...
@@ -58,6 +58,18 @@ recallRegMin = 1000, returnParams = FALSE, badSNP = 0.7)
58 58
   Carvalho B, Louis TA, Irizarry RA. Describing Uncertainty in
59 59
   Genome-wide Genotype Calling. (in prep)
60 60
 }
61
+\examples{
62
+## this can be slow
63
+if (require(genomewidesnp5Crlmm) & require(hapmapsnp5)){
64
+  path <- system.file("celFiles", package="hapmapsnp5")
61 65
 
66
+  ## the filenames with full path...
67
+  ## very useful when genotyping samples not in the working directory
68
+  cels <- list.celfiles(path, full.names=TRUE)
69
+  crlmmOutput <- crlmm(cels)
70
+  crlmmOutput[["calls"]][1:10, 1:2]
71
+  crlmmOutput[["confs"]][1:10, 1:2]
72
+}
73
+}
62 74
 \keyword{classif}
63 75
 
... ...
@@ -25,5 +25,21 @@ list.celfiles(...)
25 25
   methods. In this situations, it is safer to use the argument 'full.names=TRUE'.
26 26
 }
27 27
 \seealso{\code{\link{list.files}}}
28
+\examples{
29
+if (require(hapmapsnp5)){
30
+  path <- system.file("celFiles", package="hapmapsnp5")
31
+
32
+  ## only the filenames
33
+  list.celfiles(path)
34
+
35
+  ## the filenames with full path...
36
+  ## very useful when genotyping samples not in the working directory
37
+  list.celfiles(path, full.names=TRUE)
38
+}else{
39
+  ## this won't return anything
40
+  ## if in the working directory there isn't any CEL
41
+  list.celfiles(getwd())
42
+}
43
+}
28 44
 \keyword{IO}
29 45
 \keyword{utilities}