Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Matrix #39

Open
wants to merge 41 commits into
base: dev
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
24bb992
Starting code for COCOA scoring via matrix methods
j-lawson Jan 14, 2021
a1f6682
Update matrix scoring
j-lawson Jan 23, 2021
7281c77
Function to make region set overlap matrix and matrix related changes
j-lawson Feb 7, 2021
682daee
Fix bugs matrix scoring
j-lawson Feb 11, 2021
fb6da71
code to support matrix calculations
j-lawson Feb 12, 2021
6719706
Fix typo
j-lawson Feb 12, 2021
172948b
Fix typo
j-lawson Feb 12, 2021
15ccc6d
Fix bug
j-lawson Feb 12, 2021
9a02d29
Fix typo
j-lawson Feb 12, 2021
e899e5f
Fix param name
j-lawson Feb 12, 2021
aeb0447
Fix typo
j-lawson Feb 12, 2021
109d666
Fix bug
j-lawson Feb 12, 2021
e01d211
Merge pull request #37 from databio/dev
j-lawson Feb 12, 2021
d31c404
Function to make region set overlap matrix and matrix related changes
j-lawson Feb 7, 2021
b13acd2
Fix bugs matrix scoring
j-lawson Feb 11, 2021
4c9cfa7
code to support matrix calculations
j-lawson Feb 12, 2021
8c929fb
Fix typo
j-lawson Feb 12, 2021
6d42bd3
Fix typo
j-lawson Feb 12, 2021
a7a9c6c
Fix bug
j-lawson Feb 12, 2021
ca515bc
Fix typo
j-lawson Feb 12, 2021
1c7924d
Fix param name
j-lawson Feb 12, 2021
cef9801
Fix typo
j-lawson Feb 12, 2021
851b2c3
Fix bug
j-lawson Feb 12, 2021
b10062a
Merge to update branch
j-lawson Feb 13, 2021
fc777b1
Merge pull request #38 from databio/master
j-lawson Feb 13, 2021
dd15a10
Make new vignette and update main COCOA function
j-lawson Feb 14, 2021
f5f232b
Add unit tests, modify code to prevent extra copying
j-lawson Feb 16, 2021
bad8b00
Fix bug: mismatched dimensions
j-lawson Feb 17, 2021
e4997c6
Start making correlation more efficient, change cache names
j-lawson Feb 18, 2021
47fadb0
Remove low cov region sets when making rs ol mat
j-lawson Feb 18, 2021
0f6a0fa
Use matrix calculations for correlation/covariance
j-lawson Feb 19, 2021
4467317
Fix bug: wrong object class
j-lawson Feb 19, 2021
61d8fca
Fix normalization bug, divide by n-1 for cor/cov
j-lawson Feb 23, 2021
7408cc3
Fix error
j-lawson Feb 23, 2021
10c4411
Add COCOA score normalization
j-lawson Feb 25, 2021
c0657c1
Fix bug
j-lawson Feb 25, 2021
6ae1e84
Account for other cases
j-lawson Mar 6, 2021
2576270
Fix error
j-lawson Mar 6, 2021
e307bd9
Take out gamma normalization
j-lawson Mar 23, 2021
0b48ef6
Add rs names if missing
j-lawson Apr 9, 2021
f1d1398
Old updates
j-lawson Oct 15, 2021
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@ export(regionQuantileByTargetVar)
export(rsRankingIndex)
export(rsScoreHeatmap)
export(runCOCOA)
export(runCOCOAPerm)
export(signalAlongAxis)
import(BiocGenerics)
import(GenomicRanges)
Expand Down
627 changes: 411 additions & 216 deletions R/COCOA.R

Large diffs are not rendered by default.

663 changes: 353 additions & 310 deletions R/permutation.R

Large diffs are not rendered by default.

6 changes: 5 additions & 1 deletion R/visualization.R
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,8 @@
#' @param decreasing Logical. Whether samples should be sorted in
#' decreasing order of `orderByCol` or not (FALSE is increasing order).
#' @param regionAnnoGRList GRangesList. Each GRanges in the list should be
#' a genomic annotation. These will be displayed above or below the heatmap.
#' a genomic annotation. These will be displayed above or below the heatmap.
#' Should be a named list. Names will be displayed on plot.
#' @param plotRegionMean Logical. If TRUE, the genomicSignal will be averaged
#' for each region in regionSet and those region averages
#' will be plotted instead of the
Expand Down Expand Up @@ -219,6 +220,9 @@ signalAlongAxis <- function(genomicSignal, signalCoord, regionSet,
if (!is.null(regionAnnoGRList)) {
regionAnno <- data.frame(tmp=rep(0, length(coordGR)))
annoNames <- names(regionAnnoGRList)
if (is.null(annoNames)) {
annoNames <- paste0("Region set ", seq_along(regionAnnoGRList))
}
for (i in seq_along(regionAnnoGRList)) {

################# need to make these factors
Expand Down
5 changes: 5 additions & 0 deletions man-roxygen/rsMatList.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
#' @param rsMatList list of matrices or data.frames. Rows should be .
#' Columns should be

# (aggregateSignalGRList)
#
2 changes: 1 addition & 1 deletion man/aggregateSignal.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

32 changes: 5 additions & 27 deletions man/aggregateSignalGRList.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/getMetaRegionProfile.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

228 changes: 113 additions & 115 deletions man/runCOCOA.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading