Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@
^cran-comments\.md$
^LICENSE\.md$
^README\.md$
^docs$
^_pkgdown\.yml$
4 changes: 4 additions & 0 deletions .github/environment/pixi.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,11 +10,14 @@ libc = { family="glibc", version="2.17" }
devtools_document = "R -e 'devtools::document()'"
devtools_test = "R -e 'devtools::test()'"
codecov = "R -e 'covr::codecov(quiet = FALSE)'"
# build = "R -e 'devtools::build(args = c(\"--no-build-vignettes\"))'"
build = "R -e 'devtools::build()'"
# rcmdcheck = "R -e 'pkg <- list.files(\"..\", pattern = \".tar.gz\", full.names = TRUE); rcmdcheck::rcmdcheck(path = pkg[1], args = c(\"--as-cran\", \"--no-manual\", \"--ignore-vignettes\"))'"
rcmdcheck = "R -e 'pkg <- list.files(\"..\", pattern = \".tar.gz\", full.names = TRUE); rcmdcheck::rcmdcheck(path = pkg[1], args = c(\"--as-cran\", \"--no-manual\"))'"
use_major_version = "R -e 'usethis::Use_version(which = \"major\", push = FALSE)'"
use_minor_version = "R -e 'usethis::use_version(which = \"minor\", push = FALSE)'"
use_patch_version = "R -e 'usethis::use_version(which = \"patch\", push = FALSE)'"
pkgdown_build = "R -e 'pkgdown::build_site_github_pages(new_process = FALSE, install = TRUE)'"

[feature.r43]
dependencies = {"r-base" = "4.3.*"}
Expand All @@ -33,3 +36,4 @@ r44 = {features = ["r44"]}
"r-mass" = "*"
"r-rcmdcheck" = "*"
"r-tidyverse" = "*"
"qpdf" = "*"
32 changes: 30 additions & 2 deletions .github/workflows/merge.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,5 +29,33 @@ jobs:
- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.8.4

# - name: Check unit test code coverage
# run: pixi run codecov
- name: Check unit test code coverage
run: pixi run codecov

update_website:
if: github.event.pull_request.merged == true
strategy:
fail-fast: false

steps:
- name: Checkout main
uses: actions/checkout@v4
with:
ref: main

- name: Create TOML from recipe
run: .github/workflows/create_toml_from_yaml.sh ${GITHUB_WORKSPACE}

- name: Setup pixi
uses: prefix-dev/setup-pixi@v0.8.4

- name: Check unit test code coverage
run: pixi run pkgdown_build

- name: Deploy to GitHub pages 🚀
if: github.event_name != 'pull_request'
uses: JamesIves/github-pages-deploy-action@v4.5.0
with:
clean: false
branch: gh-pages
folder: docs
1 change: 1 addition & 0 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ Authors@R: c(
Maintainer: Xuewei Cao <xc2270@cumc.columbia.edu>
Description: This R package implements ColocBoost --- motivated and designed for colocalization analysis of multiple genetic association studies --- as a multi-task learning approach to variable selection regression with highly correlated predictors and sparse effects, based on frequentist statistical inference. It provides statistical evidence to identify which subsets of predictors have non-zero effects on which subsets of response variables.
Encoding: UTF-8
LazyDataCompression: xz
LazyData: true
RoxygenNote: 7.3.2
URL: https://github.com/StatFunGen/colocboost
Expand Down
5 changes: 0 additions & 5 deletions NAMESPACE
Original file line number Diff line number Diff line change
@@ -1,12 +1,7 @@
# Generated by roxygen2: do not edit by hand

export(colocboost)
export(colocboost_assemble)
export(colocboost_check_update_jk)
export(colocboost_inits)
export(colocboost_plot)
export(colocboost_update)
export(colocboost_workhorse)
export(get_cos_summary)
export(get_strong_colocalization)
importFrom(grDevices,adjustcolor)
Expand Down
2 changes: 1 addition & 1 deletion R/colocboost_assemble.R
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
#'
#' Summary of the colocboost results and get the output of colocboost (TO-DO-LIST)
#'
#' @export
#' @noRd
colocboost_assemble <- function(cb_obj,
coverage = 0.95,
weight_fudge_factor = 1.5,
Expand Down
8 changes: 2 additions & 6 deletions R/colocboost_check_update_jk.R
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@




#' Model selection scheme in ColocBoost
#' @title Model selection scheme in ColocBoost
#'
#' @details
#' Model selection scheme in proximity smoothed gradient boosting algorithm to select update traits and update variants at each iteration.
#'
#' @return update_status and real_update_jk for each trait
#' @export
#' @noRd
colocboost_check_update_jk <- function(cb_model, cb_model_para, cb_data,
prioritize_jkstar = TRUE,
jk_equiv_corr = 0.8, ##### more than 2 traits
Expand Down
4 changes: 1 addition & 3 deletions R/colocboost_init.R
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@


#' @title Set of Internal functions for initial colocboost objects
#'
#' @description
Expand All @@ -21,7 +19,7 @@
#'
#' @keywords cb_objects
#' @rdname colocboost_objects
#' @export
#' @noRd
colocboost_inits <- function() {
message("This function initializes colocboost objects. See details for more information.")
}
Expand Down
2 changes: 1 addition & 1 deletion R/colocboost_plot.R
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
#'
#' @description `colocboost_plot` generates visualization plots for colocalization events from a ColocBoost analysis.
#'
#' @param Output object from `colocboost` analysis
#' @param cb_output Output object from `colocboost` analysis
#' @param y Specifies the y-axis values, default is "log10p" for -log10 transformed marginal association p-values.
#' @param pos Optional plotting range of x-axis to zoom in to a specific region.
#' @param plot_target_only Logical, if TRUE only plots colocalization with target outcome, default is FALSE.
Expand Down
4 changes: 1 addition & 3 deletions R/colocboost_update.R
Original file line number Diff line number Diff line change
@@ -1,13 +1,11 @@


#' Joint boosting algorithm in ColocBoost
#'
#' @details
#' The gradient boosting algorithm for multiple outcomes
#'
#' @importFrom utils head tail
#' @return colocboost object after gradient boosting update
#' @export
#' @noRd
colocboost_update <- function(cb_model, cb_model_para, cb_data,
tau = 0.01,
learning_rate_decay = 1,
Expand Down
2 changes: 1 addition & 1 deletion R/colocboost_workhorse.R
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
#'
#' There is a version for LD free version with one causal assumption, implemented in `colocboost_one_causal`.
#'
#' @export
#' @noRd
colocboost_workhorse <- function(cb_data,
M=NULL,
tau = 0.01,
Expand Down
4 changes: 4 additions & 0 deletions _pkgdown.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
url: https://statfungen.github.io/colocboost

template:
bootstrap: 5
Binary file modified data/Ind_5traits.rda
Binary file not shown.
Binary file modified data/Sumstat_5traits.rda
Binary file not shown.
48 changes: 0 additions & 48 deletions man/colocboost_assemble.Rd

This file was deleted.

26 changes: 0 additions & 26 deletions man/colocboost_check_update_jk.Rd

This file was deleted.

23 changes: 0 additions & 23 deletions man/colocboost_objects.Rd

This file was deleted.

4 changes: 2 additions & 2 deletions man/colocboost_plot.Rd

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

28 changes: 0 additions & 28 deletions man/colocboost_update.Rd

This file was deleted.

47 changes: 0 additions & 47 deletions man/colocboost_workhorse.Rd

This file was deleted.

4 changes: 2 additions & 2 deletions vignettes/Install.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ vignette: >
%\VignetteEncoding{UTF-8}
---

To install Seurat, [R](https://www.r-project.org/) version 4.0 or greater is required. We also recommend installing [R Studio](https://www.rstudio.com/).
To install Seurat, [R](https://www.r-project.org/) version 4.0 or greater is required. We also recommend installing [R Studio](https://posit.co/).


Seurat is available on [CRAN](https://cran.r-project.org/package=colocboost)??? for all platforms. To install, run:
Expand All @@ -33,7 +33,7 @@ BiocManager::install("qvalue")

# Install the development version of ColocBoost from GitHub

Install the development version of ColocBoost - directly from [GitHub](https://github.com/xueweic/colocboost).
Install the development version of ColocBoost - directly from [GitHub](https://github.com/StatFunGen/colocboost).

```{r eval = FALSE}
# Enter commands in R (or R studio, if installed)
Expand Down
10 changes: 6 additions & 4 deletions vignettes/announcements.Rmd
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
---
title: "News"
output:
html_document:
theme: united
df_print: kable
output: rmarkdown::html_vignette
vignette: >
%\VignetteIndexEntry{News}
%\VignetteEngine{knitr::rmarkdown}
%\VignetteEncoding{UTF-8}

---

## **Initial release in ColocBoost**
Expand Down