Browse code

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

unknown authored on 16/10/2010 13:23:54
Showing4 changed files

... ...
@@ -573,3 +573,6 @@ function (which expects ff objects and supports parallel processing)
573 573
 2010-10-11 M. Ritchie 1.7.21
574 574
 ** fixed bug with indexes for ffrowapply() in genotype.Illumina()
575 575
 
576
+2010-10-17 M. Ritchie 1.7.22
577
+**  added "humanomni25quadv1b" to validCdfName() in utils.R and RGtoXY() in crlmm-illumina.R
578
+
... ...
@@ -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.7.21
5
-Date: 2010-10-11
4
+Version: 1.7.22
5
+Date: 2010-10-17
6 6
 Author: Benilton S Carvalho <carvalho@bclab.org>, Robert Scharpf <rscharpf@jhsph.edu>, Matt Ritchie <mritchie@wehi.edu.au>, Ingo Ruczinski <iruczins@jhsph.edu>, Rafael A Irizarry
7 7
 Maintainer: Benilton S Carvalho <carvalho@bclab.org>, 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
... ...
@@ -420,6 +420,7 @@ RGtoXY = function(RG, chipType, verbose=TRUE) {
420 420
                "human550v3b",            # 550K
421 421
                "human1mduov3b",          # 1M Duo
422 422
                "humanomni1quadv1b",      # Omni1 quad
423
+               "humanomni25quadv1b",     # Omni2.5 quad
423 424
 	       "humanomniexpress12v1b",  # Omni express 12
424 425
                "humanimmuno12v1b")       # Immuno chip 12
425 426
   if(missing(chipType)){
... ...
@@ -168,6 +168,7 @@ validCdfNames <- function(){
168 168
 	  "human1mduov3b",
169 169
 	  "humanomni1quadv1b",
170 170
           "humanomniexpress12v1b",
171
+	  "humanomni25quadv1b",
171 172
           "humanimmuno12v1b")
172 173
 }
173 174
 isValidCdfName <- function(cdfName){