git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/trunk/madman/Rpacks/crlmm@52839 bc3139a8-67e5-0310-9ffc-ced21a209358
... | ... |
@@ -120,7 +120,7 @@ readIdatFiles = function(sampleSheet=NULL, |
120 | 120 |
} |
121 | 121 |
rm(G) |
122 | 122 |
gc() |
123 |
- if(verbose) { |
|
123 |
+ if(verbose) { |
|
124 | 124 |
cat(paste(sep, fileExt$red, sep=""), "\n") |
125 | 125 |
} |
126 | 126 |
R = readIDAT(redidats[i]) |
... | ... |
@@ -589,7 +589,7 @@ preprocessInfinium2 = function(XY, mixtureSampleSize=10^5, |
589 | 589 |
# separate out copy number probes |
590 | 590 |
npIndex = getVarInEnv("npProbesFid") |
591 | 591 |
nprobes = length(npIndex) |
592 |
- |
|
592 |
+ |
|
593 | 593 |
if(length(nprobes)>0) { |
594 | 594 |
A = matrix(as.integer(exprs(channel(XY, "X"))[npIndex,]), nprobes, narrays) |
595 | 595 |
B = matrix(as.integer(exprs(channel(XY, "Y"))[npIndex,]), nprobes, narrays) |
... | ... |
@@ -1126,7 +1126,7 @@ genotype.Illumina = function(sampleSheet=NULL, |
1126 | 1126 |
callSet <- construct.Illumina(sampleSheet=sampleSheet, arrayNames=arrayNames, |
1127 | 1127 |
ids=ids, path=path, arrayInfoColNames=arrayInfoColNames, |
1128 | 1128 |
highDensity=highDensity, sep=sep, fileExt=fileExt, |
1129 |
- cdfName=cdfName, copynumber=copynumber, verbose=verbose, batch=batch, # fns=fns, |
|
1129 |
+ cdfName=cdfName, copynumber=copynumber, verbose=verbose, batch=batch, # fns=fns, |
|
1130 | 1130 |
saveDate=saveDate) #, outdir=outdir) |
1131 | 1131 |
if(missing(sns)) sns = sampleNames(callSet) |
1132 | 1132 |
if(is.lds) { |
... | ... |
@@ -1149,7 +1149,7 @@ genotype.Illumina = function(sampleSheet=NULL, |
1149 | 1149 |
sep=sep, fileExt=fileExt, saveDate=saveDate, verbose=verbose, mixtureSampleSize=mixtureSampleSize, |
1150 | 1150 |
fitMixture=fitMixture, eps=eps, seed=seed, cdfName=cdfName, sns=sns, stripNorm=stripNorm, |
1151 | 1151 |
useTarget=useTarget, A=A(callSet), B=B(callSet), SKW=SKW, SNR=SNR, |
1152 |
- mixtureParams=mixtureParams, is.snp=is.snp, neededPkgs=c("crlmm", pkgname)) # outdir=outdir, |
|
1152 |
+ mixtureParams=mixtureParams, is.snp=is.snp, neededPkgs=c("crlmm", pkgname)) # outdir=outdir, |
|
1153 | 1153 |
|
1154 | 1154 |
open(SKW) |
1155 | 1155 |
open(SNR) |
... | ... |
@@ -1196,8 +1196,8 @@ genotype.Illumina = function(sampleSheet=NULL, |
1196 | 1196 |
open(A(callSet)) |
1197 | 1197 |
open(B(callSet)) |
1198 | 1198 |
tmpA = initializeBigMatrix(name="A", length(snp.index), narrays) |
1199 |
- tmpB = initializeBigMatrix(name="B", length(snp.index), narrays) |
|
1200 |
-# bb = getOption("ffbatchbytes") |
|
1199 |
+ tmpB = initializeBigMatrix(name="B", length(snp.index), narrays) |
|
1200 |
+# bb = getOption("ffbatchbytes") |
|
1201 | 1201 |
# bb = ocProbesets()*length(sns)*8 |
1202 | 1202 |
ffcolapply(tmpA[,i1:i2] <- A(callSet)[snp.index,i1:i2], X=A(callSet)) #, BATCHBYTES=bb) # X=A(callSet)[snp.index,] |
1203 | 1203 |
ffcolapply(tmpB[,i1:i2] <- B(callSet)[snp.index,i1:i2], X=B(callSet)) #, BATCHBYTES=bb) # X=B(callSet)[snp.index,] |
... | ... |
@@ -1293,7 +1293,7 @@ processIDAT = function(sel, sampleSheet=NULL, |
1293 | 1293 |
gc() |
1294 | 1294 |
if(verbose) message("Finished preprocessing.") |
1295 | 1295 |
snp.index = which(is.snp) |
1296 |
- np.index = which(!is.snp) |
|
1296 |
+ np.index = which(!is.snp) |
|
1297 | 1297 |
|
1298 | 1298 |
# open(res[["A"]]) |
1299 | 1299 |
# open(res[["B"]]) |
... | ... |
@@ -1309,7 +1309,7 @@ processIDAT = function(sel, sampleSheet=NULL, |
1309 | 1309 |
if(length(np.index)>0) { |
1310 | 1310 |
# for (j in 1:length(sel)) { |
1311 | 1311 |
ffcolapply(A[np.index,sel][,i1:i2] <- res[["cnAB"]]$A[,i1:i2], X=res[["cnAB"]]$A) |
1312 |
- ffcolapply(B[np.index,sel][,i1:i2] <- res[["cnAB"]]$B[,i1:i2], X=res[["cnAB"]]$B) |
|
1312 |
+ ffcolapply(B[np.index,sel][,i1:i2] <- res[["cnAB"]]$B[,i1:i2], X=res[["cnAB"]]$B) |
|
1313 | 1313 |
# A[np.index, sel[j]] = res[["cnAB"]]$A[,j] |
1314 | 1314 |
# B[np.index, sel[j]] = res[["cnAB"]]$B[,j] |
1315 | 1315 |
# } |