Browse code

Edit genotypeAffy wrapper for crlmmGT2 (snp.names no longer an argument to crlmmGT2)

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

Rob Scharp authored on 01/10/2011 04:50:12
Showing 2 changed files

... ...
@@ -1,7 +1,7 @@
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.11.38
4
+Version: 1.11.39
5 5
 Date: 2010-12-10
6 6
 Author: Benilton S Carvalho <Benilton.Carvalho@cancer.org.uk>, 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 <Benilton.Carvalho@cancer.org.uk>, Robert Scharpf <rscharpf@jhsph.edu>, Matt Ritchie <mritchie@wehi.EDU.AU>
... ...
@@ -248,7 +248,7 @@ genotypeAffy <- function(cnSet, mixtureParams, SNRMin=5, recallMin=10,
248 248
 			 recallRegMin=1000,
249 249
 			 gender=NULL, badSNP=0.7, returnParams=TRUE,
250 250
 			 verbose=TRUE){
251
-	snp.index <- which(isSnp(cnSet))
251
+	##snp.index <- which(isSnp(cnSet))
252 252
 	tmp <- crlmmGT2(A=calls(cnSet),
253 253
 			B=snpCallProbability(cnSet),
254 254
 			SNR=cnSet$SNR,
... ...
@@ -262,8 +262,8 @@ genotypeAffy <- function(cnSet, mixtureParams, SNRMin=5, recallMin=10,
262 262
 			gender=gender,
263 263
 			verbose=verbose,
264 264
 			returnParams=returnParams,
265
-			badSNP=badSNP,
266
-			snp.names=featureNames(cnSet)[snp.index])
265
+			badSNP=badSNP)
266
+##			snp.names=featureNames(cnSet)[snp.index])
267 267
 	if(verbose) message("Genotyping finished.  Updating container with genotype calls and confidence scores.")
268 268
 	open(cnSet$gender)
269 269
 	cnSet$gender[,] <- tmp[["gender"]]