* collab_release:
update .gitignore
update .gitignore
update table in CopyNumberOverview vignette
Fix bug in calculateRBaf that can cause sample indices and batch indices to be misaligned when batch is not in alphabetical order
Update CopyNumberOverview and Infratructure vignettes
ignettes
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
git-svn-id: file:///home/git/hedgehog.fhcrc.org/bioconductor/branches/RELEASE_2_11/madman/Rpacks/crlmm@71321 bc3139a8-67e5-0310-9ffc-ced21a209358
Rob Scharp authored on 19/11/2012 04:33:45 | ... | ... |
@@ -35,3 +35,16 @@ runillumina.R |
| 35 | 35 |
inst/scripts/SmoothingRawCN.pdf |
| 36 | 36 |
inst/scripts/test |
| 37 | 37 |
.gitignore |
| 38 |
+AffyGW-snr.pdf |
|
| 39 |
+AffyGW.R |
|
| 40 |
+IlluminaPreprocessCN-snr.pdf |
|
| 41 |
+IlluminaPreprocessCN.bbl |
|
| 42 |
+IlluminaPreprocessCN.blg |
|
| 43 |
+gender.R |
|
| 44 |
+runAffy.R.sh |
|
| 45 |
+runIlluminaPreprocessCN.R.sh |
|
| 46 |
+preproc_debug.R |
|
| 47 |
+rowMediansByGenotype.c |
|
| 48 |
+SimpleUsage.R |
|
| 49 |
+copynumber.pdf |
|
| 50 |
+crlmmDownstream.Rnw |
| ... | ... |
@@ -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.16.6 |
|
| 4 |
+Version: 1.16.8 |
|
| 5 | 5 |
Author: Benilton S Carvalho, Robert Scharpf, Matt Ritchie, Ingo Ruczinski, Rafael A Irizarry |
| 6 | 6 |
Maintainer: Benilton S Carvalho <Benilton.Carvalho@cancer.org.uk>, Robert Scharpf <rscharpf@jhsph.edu>, Matt Ritchie <mritchie@wehi.EDU.AU> |
| 7 | 7 |
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 |
| ... | ... |
@@ -548,7 +548,7 @@ calculateRBafCNSet <- function(object, batch.name, chrom){
|
| 548 | 548 |
indexlist <- split(index, chr[index]) |
| 549 | 549 |
J <- which(batch(object) %in% batch.name) |
| 550 | 550 |
sns <- sampleNames(object)[J] |
| 551 |
- sampleindex <- split(J, batch(object)[J]) |
|
| 551 |
+ sampleindex <- split(J, factor(batch(object)[J], levels=unique(batch(object)[J]))) |
|
| 552 | 552 |
if(!all(valid.chrs)) warning("Only computing log R ratios and BAFs for autosomes and chr X")
|
| 553 | 553 |
## if ff package is loaded, these will be ff objects |
| 554 | 554 |
chr <- names(indexlist) |
| ... | ... |
@@ -42,11 +42,10 @@ appropriate. |
| 42 | 42 |
\begin{center}
|
| 43 | 43 |
\begin{tabular}{|lp{1.2in}p{1.5in}p{2in}|}
|
| 44 | 44 |
\hline |
| 45 |
- Vignette & Platform & Annotation package & Scope \\ |
|
| 46 |
-\hline |
|
| 47 |
-Infrastructure & Affy/Illumina & & The CNSet container / large data support using the \Rpackage{ff} package \\
|
|
| 45 |
+ Vignette & Platform & Annotation package & Scope \\ \hline |
|
| 46 |
+Infrastructure & Affy/Illumina & & The CNSet container / large data support using the \Rpackage{ff} package \\
|
|
| 48 | 47 |
AffyGW & Affy 5.0, 6.0 & genomewidesnp5Crlmm, genomewidesnp6Crlmm & Preprocessing, genotyping, CN estimation\\ |
| 49 |
- IlluminaPreprocessCN & Illumina & several$^\dagger$ & Preprocessing, genotyping, CN estimation |
|
| 48 |
+ IlluminaPreprocessCN & Illumina & several$^\dagger$ & Preprocessing, genotyping, CN estimation\\ |
|
| 50 | 49 |
\hline |
| 51 | 50 |
\end{tabular}
|
| 52 | 51 |
\end{center}
|