Skip to content

Commit 587471f

Browse files
committed
add beta.proposal in MH sampler
1 parent 90c8d73 commit 587471f

File tree

9 files changed

+267
-66
lines changed

9 files changed

+267
-66
lines changed

NEWS.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,11 @@
11
<div style="text-align: left;">
22

3-
### GPTCM 1.1.4 (2025-10-31)
3+
### GPTCM 1.1.4 (2025-11-21)
44

55
* Update survival curve's ylab in vignette
6+
* Add option for using coefficients' proposals in the MH's proposal ratio
67

7-
### GPTCM 1.1.3 (2025-10-31)
8+
### GPTCM 1.1.3 (2025-11-01)
89

910
* Remove redundant variables `logPosteriorZeta` and `logPosteriorBeta` in cpp files
1011
* Remove partial likelihood `loglikelihood0()`, and always use joint likelihood

R/GPTCM.R

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,8 @@
2727
#' parametrization of the Dirichlet regression model
2828
#' @param hyperpar a list of relevant hyperparameters
2929
#' @param BVS logical value for implementing Bayesian variable selection
30+
#' @param beta.proposal logical value to determine if betas' proposal is used in MH's proposal ratio for gammas
31+
#' @param zeta.proposal logical value to determine if zetas' proposal is used in MH's proposal ratio for etas
3032
#' @param threads maximum threads used for parallelization. Default is 1
3133
#' @param kappaIGamma logical value for using inverse-gamma prior (\code{TRUE})
3234
#' or gamma prior (\code{FALSE}) for Weibull's shape parameter
@@ -90,6 +92,8 @@ GPTCM <- function(dat,
9092
dirichlet = TRUE,
9193
hyperpar = NULL,
9294
BVS = TRUE,
95+
beta.proposal = FALSE,
96+
zeta.proposal = FALSE,
9397
threads = 1,
9498
kappaIGamma = FALSE,
9599
kappaSampler = "arms",
@@ -317,6 +321,8 @@ GPTCM <- function(dat,
317321
dirichlet,
318322
proportion.model,
319323
BVS,
324+
beta.proposal,
325+
zeta.proposal,
320326
threads,
321327
gammaPrior,
322328
gammaSampler,

R/RcppExports.R

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@
1616
#' @param dirichlet not yet implemented
1717
#' @param proportion_model logical value for modeling the proportions data
1818
#' @param BVS logical value for implementing Bayesian variable selection
19+
#' @param beta_proposal logical value to determine if betas' proposal is used in MH's proposal ratio for gammas
20+
#' @param zeta_proposal logical value to determine if zetas' proposal is used in MH's proposal ratio for etas
1921
#' @param threads maximum threads used for parallelization. Default is 1
2022
#' @param gamma_prior one of \code{c("bernoulli", "MRF")}
2123
#' @param gamma_sampler one of \code{c("mc3", "bandit")}
@@ -30,7 +32,7 @@
3032
#' @param datX0 a matrix of mandatory variables
3133
#' @param datProportionConst an array of cluster-specific proportions
3234
#'
33-
run_mcmc <- function(nIter, burnin, thin, n, nsamp, ninit, convex, npoint, dirichlet, proportion_model, BVS, threads, gamma_prior, gamma_sampler, eta_prior, eta_sampler, initList, rangeList, hyperparList, datEvent, datTime, datX, datX0, datProportionConst) {
34-
.Call(`_GPTCM_run_mcmc`, nIter, burnin, thin, n, nsamp, ninit, convex, npoint, dirichlet, proportion_model, BVS, threads, gamma_prior, gamma_sampler, eta_prior, eta_sampler, initList, rangeList, hyperparList, datEvent, datTime, datX, datX0, datProportionConst)
35+
run_mcmc <- function(nIter, burnin, thin, n, nsamp, ninit, convex, npoint, dirichlet, proportion_model, BVS, beta_proposal, zeta_proposal, threads, gamma_prior, gamma_sampler, eta_prior, eta_sampler, initList, rangeList, hyperparList, datEvent, datTime, datX, datX0, datProportionConst) {
36+
.Call(`_GPTCM_run_mcmc`, nIter, burnin, thin, n, nsamp, ninit, convex, npoint, dirichlet, proportion_model, BVS, beta_proposal, zeta_proposal, threads, gamma_prior, gamma_sampler, eta_prior, eta_sampler, initList, rangeList, hyperparList, datEvent, datTime, datX, datX0, datProportionConst)
3537
}
3638

man/GPTCM.Rd

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

man/run_mcmc.Rd

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)