Skip to content

Commit b11dbb9

Browse files
Merge pull request #276 from chitrams/fix/lost-braces
Fix instances where error for "lost braces" appear
2 parents f65cf7c + e5ec862 commit b11dbb9

4 files changed

Lines changed: 10 additions & 10 deletions

File tree

BayesianTools/R/BayesianSetupGenerateParallel.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#' @author Florian Hartig
33
#' @param fun function to be changed to parallel execution
44
#' @param parallel should a parallel R cluster be used? If set to T, the operating system will automatically detect the available cores and n-1 of the available n cores will be used. Alternatively, you can manually set the number of cores to be used
5-
#' @param parallelOptions a list containing three lists. \itemize{\item First, "packages": determines the R packages required to run the likelihood function. \item Second, "variables": the objects in the global environment needed to run the likelihood function. \item Third, "dlls": the DLLs needed to run the likelihood function (see Details).}
5+
#' @param parallelOptions a list containing three lists. \describe{\item First, "packages": determines the R packages required to run the likelihood function. \item Second, "variables": the objects in the global environment needed to run the likelihood function. \item Third, "dlls": the DLLs needed to run the likelihood function (see Details).}
66
#' @note can be used to make functions compatible with library sensitivity
77
#' @details For parallelization, if option T is selected, an automatic parallelization is tried via R. Alternatively, "external" can be selected on the assumption that the likelihood has already been parallelized. In the latter case, a matrix with parameters as columns must be accepted. You can also specify which packages, objects and DLLs are exported to the cluster. By default, a copy of your workspace is exported, but depending on your workspace, this can be inefficient. As an alternative, you can specify the environments and packages in the likelihood function (e.g. BayesianTools::VSEM() instead of VSEM()).
88
#' @export

BayesianTools/R/mcmcDEzs.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -26,11 +26,11 @@
2626
#'
2727
#' For blockUpdate the first element in the list determines the type of blocking.
2828
#' Possible choices are
29-
#' \itemize{
29+
#' \describe{
3030
#' \item{"none"}{ (default), no blocking of parameters}
31-
#' \item{"correlation"} { blocking based on correlation of parameters. Using h or k (see below)}
32-
#' \item{"random"} { random blocking. Using k (see below)}
33-
#' \item{"user"} { user defined groups. Using groups (see below)}
31+
#' \item{"correlation"}{ blocking based on correlation of parameters. Using h or k (see below)}
32+
#' \item{"random"}{ random blocking. Using k (see below)}
33+
#' \item{"user"}{ user defined groups. Using groups (see below)}
3434
#' }
3535
#' Further, seven parameters can be specified. "k" defines the number of groups, "h" the strength
3636
#' of the correlation used to group parameter and "groups" is used for user defined groups.

BayesianTools/man/DEzs.Rd

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

BayesianTools/man/generateParallelExecuter.Rd

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)