Skip to content

Commit

Permalink
Merge branch 'hotfix/v1.0.2' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
JaeyeongYang committed Nov 15, 2019
2 parents e7ed795 + 03a6a67 commit 6de1274
Show file tree
Hide file tree
Showing 85 changed files with 2,215 additions and 1,035 deletions.
4 changes: 2 additions & 2 deletions R/DESCRIPTION
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Package: hBayesDM
Title: Hierarchical Bayesian Modeling of Decision-Making Tasks
Version: 1.0.1.9000
Date: 2019-09-01
Version: 1.0.2.9000
Date: 2019-11-13
Author:
Woo-Young Ahn [aut, cre],
Nate Haines [aut],
Expand Down
4 changes: 4 additions & 0 deletions R/NEWS.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
# hBayesDM 1.0.2

- Fix an error on using data.frame objects as data (#112).

# hBayesDM 1.0.1

- Minor fix on the plotting function.
Expand Down
5 changes: 3 additions & 2 deletions R/R/HDIofMCMC.R
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
#' Compute Highest-Density Interval
#'
#' @description
#' Computes the highest density interval from a sample of representative values, estimated as shortest credible interval.
#' Downloaded from John Kruschke's website \url{http://www.indiana.edu/~kruschke/DoingBayesianDataAnalysis/}
#' Computes the highest density interval from a sample of representative values,
#' estimated as shortest credible interval.
#' Based on John Kruschke's codes.
#'
#' @param sampleVec A vector of representative values from a probability distribution (e.g., MCMC samples).
#' @param credMass A scalar between 0 and 1, indicating the mass within the credible interval that is to be estimated.
Expand Down
3 changes: 2 additions & 1 deletion R/R/hBayesDM_model.R
Original file line number Diff line number Diff line change
Expand Up @@ -306,7 +306,8 @@ hBayesDM_model <- function(task_name,
############### Print for user ###############
cat("\n")
cat("Model name =", model, "\n")
cat("Data file =", data, "\n")
if (is.character(data))
cat("Data file =", data, "\n")
cat("\n")
cat("Details:\n")
if (vb) {
Expand Down
5 changes: 3 additions & 2 deletions R/R/plotHDI.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
#' Plots highest density interval (HDI) from (MCMC) samples and prints HDI in the R console. HDI is indicated by a red line.
#' Plots highest density interval (HDI) from (MCMC) samples and prints HDI in the R console.
#' HDI is indicated by a red line.
#' Based on John Kruschke's codes.
#'
#' Based on John Kruschke's codes \url{http://www.indiana.edu/~kruschke/DoingBayesianDataAnalysis/}
#' @param sample MCMC samples
#' @param credMass A scalar between 0 and 1, indicating the mass within the credible interval that is to be estimated.
#' @param Title Character value containing the main title for the plot
Expand Down
152 changes: 152 additions & 0 deletions R/docs/404.html

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

0 comments on commit 6de1274

Please sign in to comment.