Skip to content

Commit

Permalink
replaced cat to message
Browse files Browse the repository at this point in the history
  • Loading branch information
ichcha-m committed Oct 24, 2023
1 parent bd95dc9 commit 8429a1a
Show file tree
Hide file tree
Showing 72 changed files with 110 additions and 116 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: cophescan
Title: Adaptation of the Coloc Method for PheWAS
Version: 1.3.1
Version: 1.3.2
Authors@R: c(person("Ichcha", "Manipur", role=c("aut","cre"),
email = "[email protected]"),
person("Chris", "Wallace", role=c("aut")))
Expand Down
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
## cophescan 1.3.2

- Changed one instance of print() to message()

## cophescan 1.3.1

- Changed plotting functions where querytrait and query_trait_names are now required arguments instead of optional in `prepare_plot_data`, `get_beta`, `cophe_plot`, `cophe_heatmap`.
Expand Down
5 changes: 2 additions & 3 deletions R/metrop_hier_priors.R
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
#' @param avg_pik default: FALSE, estimate the average of the pik
#' @param avg_posterior default: FALSE, estimate the average of the posterior probabilities of the hypotheses
#' @param pik default: FALSE, inferred prior probabilities
#' @param cores default: 1, number of cores
#' @param alpha_mean prior for the mean of alpha
#' @param alpha_sd prior for the standard deviation of alpha
#' @param beta_shape prior for the shape (gamma distibution) of beta
Expand All @@ -24,7 +23,7 @@
#' @export
run_metrop_priors <- function(multi.dat, covar=FALSE, covar_vec=NULL, is_covar_categorical=FALSE, nits=10000,
thin=1, posterior=FALSE, avg_pik=TRUE, avg_posterior=TRUE,
pik=FALSE, cores=1, alpha_mean =-10,
pik=FALSE, alpha_mean =-10,
alpha_sd=0.5, beta_shape=2, beta_scale=2,
gamma_shape=2, gamma_scale=2){
if (!is.data.frame(multi.dat)){
Expand Down Expand Up @@ -65,7 +64,7 @@ run_metrop_priors <- function(multi.dat, covar=FALSE, covar_vec=NULL, is_covar_c

lbf_mat <- as.matrix(pp_df[, c('lBF.Ha', 'lBF.Hc')])
nsnps <- as.vector(pp_df$nsnps)
cat(paste0('Running the cophescan hierarchical model... \nNumber of iterations: ', nits,'\nBurn-in: ', thin, '\nNumber of input QV/QT pairs: ', nrow(pp_df), '\nCovariate included: ', covar ))
message(paste0('Running the cophescan hierarchical model... \nNumber of iterations: ', nits,'\nBurn-in: ', thin, '\nNumber of input QV/QT pairs: ', nrow(pp_df), '\nCovariate included: ', covar ))

## Run hierarchical model
res.metrop <- metrop_run(lbf_mat = lbf_mat, nsnps = nsnps,
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,6 @@ tail(res.hier.predict, row.names = F)

------------------------------------------------------------------------

#### [**NEWS: cophescan 1.3.1**](https://ichcha-m.github.io/cophescan/news/index.html)
#### [NEWS: cophescan 1.3.2](https://ichcha-m.github.io/cophescan/news/index.html)

------------------------------------------------------------------------
2 changes: 1 addition & 1 deletion docs/404.html

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

4 changes: 2 additions & 2 deletions docs/articles/FixedPriors_03.html

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

Binary file modified docs/articles/HP-mcmcDiagnostics-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/HP-unnamed-chunk-8-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/HP-unnamed-chunk-8-2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified docs/articles/HP-unnamed-chunk-8-3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
69 changes: 32 additions & 37 deletions docs/articles/HierarchicalPriors_04.html

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

4 changes: 2 additions & 2 deletions docs/articles/InputData_02.html

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

10 changes: 5 additions & 5 deletions docs/articles/IntroductionCoPheScan_01.html

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

2 changes: 1 addition & 1 deletion docs/articles/index.html

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

2 changes: 1 addition & 1 deletion docs/authors.html

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

6 changes: 3 additions & 3 deletions docs/index.html

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

6 changes: 5 additions & 1 deletion docs/news/index.html

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

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ articles:
HierarchicalPriors_04: HierarchicalPriors_04.html
InputData_02: InputData_02.html
IntroductionCoPheScan_01: IntroductionCoPheScan_01.html
last_built: 2023-10-20T17:39Z
last_built: 2023-10-24T10:16Z
urls:
reference: https://ichcha-m.github.io/cophescan/reference
article: https://ichcha-m.github.io/cophescan/articles
Expand Down
2 changes: 1 addition & 1 deletion docs/reference/Hc.cutoff.fdr.html

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

2 changes: 1 addition & 1 deletion docs/reference/adjust_priors.html

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

2 changes: 1 addition & 1 deletion docs/reference/average_piks.html

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

2 changes: 1 addition & 1 deletion docs/reference/average_piks_list.html

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

Loading

0 comments on commit 8429a1a

Please sign in to comment.