Browse code

Merge branch 'collab'

* collab:
update Rds
revert imputeGender to original api
bug fix for calculateRBafCNSet
update calculateRBafCNSet
Fix documentation for crlmmCopynumber -- added argument fitLinearModel
update crlmmGT2
Put rm(DD, ...) further down in crlmmGT2 function
remove message about cloning A and B
Open and close callsPr and callsGt in crlmmGT2 (when args not missing)
revert removed indices loaded in crlmmGT2
snprmaAffy no longer writes normalized intensities to calls and callProbability slots. crlmmGT2 takes arguments callsGt and callsPr. When present, crlmmGT2 will not overwrite A and B.
explicit coercion to matrix in imputeGender
Assign imputed gender to cnSet$gender within crlmmGT2 function.
Change sum(SNR > SNRmin) to sum(SNR[] > SNRmin) in imputeGender

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

Rob Scharp authored on 14/09/2012 20:07:37
Showing 1 changed files
... ...
@@ -58,10 +58,16 @@ calculateRBaf(object, batch.name, chrom)
58 58
 \author{Lynn Mireless}
59 59
 
60 60
 \examples{
61
-data(cnSetExample)
62
-baf.lrr <- calculateRBaf(cnSetExample, "SHELF")
63
-hist(baf.lrr[["baf"]][[1]]/1000, breaks=100)
64
-hist(baf.lrr[["lrr"]][[1]]/100, breaks=100)
61
+	data(cnSetExample)
62
+	baf.lrr <- suppressWarnings(calculateRBaf(cnSetExample, "SHELF"))
63
+	hist(baf.lrr[["baf"]][[1]]/1000, breaks=100)
64
+	hist(baf.lrr[["lrr"]][[1]]/100, breaks=100)
65
+	\dontrun{
66
+		library(ff)
67
+		baf.lrr <- suppressWarnings(calculateRBaf(cnSetExample, "SHELF"))
68
+		class(baf.lrr[["baf"]][[1]]) ## ff_matrix
69
+		class(baf.lrr[["lrr"]][[1]]) ## ff_matrix
70
+	}
65 71
 }
66 72
 \keyword{list}
67 73
 \keyword{methods}
Browse code

Merge branch 'collab'

* collab: (34 commits)
revert change to IlluminaPreprocessCN
fix bug in isValidCdfName
print warning when all features in a batch of probes are flagged, but allow processing to continue
add utility cleancdfnames
Add validCdfNames.Rd
export validCdfNames
imputeGender fix when chromosome Y not available
Use splitIndicesByLength(index, ocSamples/getDoParWorkers())
Can not allocate vector of size XG with genotype.Illumina. Use splitIndicesByNode() only if the length of the list is greater than the split from splitIndicesByLength(). Otherwise, split by length using ocSamples()
update .gitignore
Add make.unique for sampleSheet$Sample_ID in readIdatFiles
bug in description
ensure sample ids stored in samplesheet are unique when constructing cnSet object
update oligoClasses dependency
update unit test for genotype.Illumina
revert change in constructInf call from genotype.Illumina
Update genotype.Rd
edit ACN function
1.15.6 use make.unique(basename(arrayNames)) to allow processing of Illumina samples with duplicated barcodes
check that sample identifies are unique in crlmm function
...

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

Rob Scharp authored on 08/07/2012 19:00:03
Showing 1 changed files
... ...
@@ -5,45 +5,63 @@
5 5
 \description{Calculate log R ratios and B allele frequencies from
6 6
   a \code{CNSet} object}
7 7
 \usage{
8
-calculateRBaf(object, batch.name)
8
+calculateRBaf(object, batch.name, chrom)
9 9
 }
10 10
 
11 11
 \arguments{
12
+
12 13
   \item{object}{A \code{CNSet} object.}
13
-  \item{batch.name}{A character string.  See details.}
14
+
15
+  \item{batch.name}{A character string indicating the batch.  If
16
+  missing, log R ratios and B allele frequencies are calculated for all
17
+  batches in the \code{object}.}
18
+
19
+  \item{chrom}{Integer indicating which chromosome to process. If
20
+  missing, B allele frequencies and log R ratios are calculated for all
21
+  autosomal chromosomes and chromosome X that are included in
22
+  \code{object}.}
23
+
14 24
 }
15
-\details{\code{batch.name} must be a value in
16
-  \code{batch(object)}. Currently, one must specify a single
17
-  \code{batch.name}. If a character vector for \code{batch.name} is
18
-  supplied, only the first is evaluated.
25
+
26
+\details{
27
+
28
+  \code{batch.name} must be a value in \code{batch(object)}. Currently,
29
+  one must specify a single \code{batch.name}. If a character vector for
30
+  \code{batch.name} is supplied, only the first is evaluated.
19 31
 
20 32
   TODO: A description of how these values are calculated.
21 33
 
22 34
 }
23 35
 
24 36
 \value{
25
-  A list.
37
+  A named list.
26 38
 
27
-  \code{baf}: A matrix of B allele frequencies.
39
+  \code{baf}: Each element in the baf list is a matrix of B allele
40
+  frequencies (one matrix for each chromosome).
28 41
 
29
-  \code{lrr}: A matrix of log R ratios.
42
+  \code{lrr}: Each element in the lrr list is a matrix of log R ratios
43
+  (one matrix for each chromosome).
44
+
45
+  The log R ratios were scaled by a factor of 100 and stored as an
46
+  integer.  B allele frequencies were scaled by a factor of 1000 and
47
+  stored as an integer.
30 48
 
31 49
 }
32 50
 
33 51
 \references{
34 52
 
35
-  Reference for BAFs, LRRs.
53
+  Peiffer et al., High-resolution genomic profiling of chromosomal aberrations using
54
+  Infinium whole-genome genotyping (2006), Genome Research
36 55
 
37 56
 }
57
+
38 58
 \author{Lynn Mireless}
39 59
 
40 60
 \examples{
41 61
 data(cnSetExample)
42 62
 baf.lrr <- calculateRBaf(cnSetExample, "SHELF")
43
-hist(baf.lrr[["baf"]], breaks=100)
44
-hist(baf.lrr[["lrr"]], breaks=100)
63
+hist(baf.lrr[["baf"]][[1]]/1000, breaks=100)
64
+hist(baf.lrr[["lrr"]][[1]]/100, breaks=100)
45 65
 }
46
-% Add one or more standard keywords, see file 'KEYWORDS' in the
47
-% R documentation directory.
48 66
 \keyword{list}
49
-\keyword{methods}
50 67
\ No newline at end of file
68
+\keyword{methods}
Browse code

Merge branch 'mymac'

* mymac:
add AffyGW.pdf
update vignettes in inst/scripts
Change argument of validCEL to celfiles
Update constructInf to accommodate GenomeDataFrame class for featureData
bump version to 1.13.7
Add doRUnit.R
Add celfile-utils.Rd
Streamlne some of the Rd files
add validCEL function that checks whether all celfiles can be read
getFeatureData returns GenomeAnnotatedDataFrame
Remove imports from methods. Remove pdf of illumina_copynumber.pdf (large file) and copynumber.pdf
getFeatureDAta returns GenomeAnnotatedDataFrame
Remove separate vignette for copy number in inst/scripts. Include copynumber section in both affy and illumina pipelines.
update documentation files for genotype.Illumina, preprocessInf, and genotypeInf (cdfName added as argument. Indicate that 'batch' should be a character string)
pass cdfName to genotypeInf and preprocessInf
add unitTests and cn-functions for 'simple usage'
Combine AffyPreprocess and copynumber. Combine IlluminaPreprocess and copynumber
remove depency on ff to allow installation on my mac

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

Rob Scharp authored on 17/01/2012 19:13:44
Showing 1 changed files
... ...
@@ -38,13 +38,10 @@ calculateRBaf(object, batch.name)
38 38
 \author{Lynn Mireless}
39 39
 
40 40
 \examples{
41
-
42 41
 data(cnSetExample)
43 42
 baf.lrr <- calculateRBaf(cnSetExample, "SHELF")
44 43
 hist(baf.lrr[["baf"]], breaks=100)
45 44
 hist(baf.lrr[["lrr"]], breaks=100)
46
-
47
-
48 45
 }
49 46
 % Add one or more standard keywords, see file 'KEYWORDS' in the
50 47
 % R documentation directory.
Browse code

Replace sample.CNSet and sample.CNSet2 with cnSetExample and cnSetExample2

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

Rob Scharp authored on 11/10/2011 12:17:42
Showing 1 changed files
... ...
@@ -39,8 +39,8 @@ calculateRBaf(object, batch.name)
39 39
 
40 40
 \examples{
41 41
 
42
-data(sample.CNSet)
43
-baf.lrr <- calculateRBaf(sample.CNSet, "SHELF")
42
+data(cnSetExample)
43
+baf.lrr <- calculateRBaf(cnSetExample, "SHELF")
44 44
 hist(baf.lrr[["baf"]], breaks=100)
45 45
 hist(baf.lrr[["lrr"]], breaks=100)
46 46
 
Browse code

bringing changes from GitHub; from now on, keeping code on BioC servers

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

Benilton Carvalho authored on 03/10/2011 18:12:55
Showing 1 changed files
... ...
@@ -43,6 +43,8 @@ data(sample.CNSet)
43 43
 baf.lrr <- calculateRBaf(sample.CNSet, "SHELF")
44 44
 hist(baf.lrr[["baf"]], breaks=100)
45 45
 hist(baf.lrr[["lrr"]], breaks=100)
46
+
47
+
46 48
 }
47 49
 % Add one or more standard keywords, see file 'KEYWORDS' in the
48 50
 % R documentation directory.
Browse code

Add calculateRBaf.Rd

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

Rob Scharp authored on 01/10/2011 04:50:44
Showing 1 changed files
1 1
new file mode 100644
... ...
@@ -0,0 +1,50 @@
1
+\name{calculateRBaf}
2
+\alias{calculateRBaf}
3
+\alias{calculateRBaf,CNSet-method}
4
+\title{Calculate log R ratios and B allele frequencies.}
5
+\description{Calculate log R ratios and B allele frequencies from
6
+  a \code{CNSet} object}
7
+\usage{
8
+calculateRBaf(object, batch.name)
9
+}
10
+
11
+\arguments{
12
+  \item{object}{A \code{CNSet} object.}
13
+  \item{batch.name}{A character string.  See details.}
14
+}
15
+\details{\code{batch.name} must be a value in
16
+  \code{batch(object)}. Currently, one must specify a single
17
+  \code{batch.name}. If a character vector for \code{batch.name} is
18
+  supplied, only the first is evaluated.
19
+
20
+  TODO: A description of how these values are calculated.
21
+
22
+}
23
+
24
+\value{
25
+  A list.
26
+
27
+  \code{baf}: A matrix of B allele frequencies.
28
+
29
+  \code{lrr}: A matrix of log R ratios.
30
+
31
+}
32
+
33
+\references{
34
+
35
+  Reference for BAFs, LRRs.
36
+
37
+}
38
+\author{Lynn Mireless}
39
+
40
+\examples{
41
+
42
+data(sample.CNSet)
43
+baf.lrr <- calculateRBaf(sample.CNSet, "SHELF")
44
+hist(baf.lrr[["baf"]], breaks=100)
45
+hist(baf.lrr[["lrr"]], breaks=100)
46
+}
47
+% Add one or more standard keywords, see file 'KEYWORDS' in the
48
+% R documentation directory.
49
+\keyword{list}
50
+\keyword{methods}
0 51
\ No newline at end of file