Skip to content

Commit 7195e72

Browse files
committed
Merge upstream/master and resolve NEWS.md conflict
2 parents a8260cf + 93cc02d commit 7195e72

13 files changed

+91
-88
lines changed

NEWS.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
# bayesplot (development version)
22

33
* Documentation added for `ppc_data()` and `ppc_loo_pit_data()` functions (#209)
4+
* Improved documentation for `binwidth`, `bins`, and `breaks` arguments to clarify they are passed to `ggplot2::geom_area()` and `ggdist::stat_dots()` in addition to `ggplot2::geom_histogram()`
5+
* Improved documentation for `freq` argument to clarify it applies to frequency polygons in addition to histograms
6+
* Fixed test in `test-ppc-distributions.R` that incorrectly used `ppc_dens()` instead of `ppd_dens()` when testing PPD functions
47
* New functions `mcmc_dots` and `mcmc_dots_by_chain` for dot plots of MCMC draws by @behramulukir (#402)
58
* Default to `quantiles=100` for all dot plots by @behramulukir (#402)
69

man-roxygen/args-hist-freq.R

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
#' @param freq For histograms, `freq=TRUE` (the default) puts count on the
2-
#' y-axis. Setting `freq=FALSE` puts density on the y-axis. (For many
3-
#' plots the y-axis text is off by default. To view the count or density
4-
#' labels on the y-axis see the [yaxis_text()] convenience
1+
#' @param freq For histograms and frequency polygons, `freq=TRUE` (the default)
2+
#' puts count on the y-axis. Setting `freq=FALSE` puts density on the y-axis.
3+
#' (For many plots the y-axis text is off by default. To view the count or
4+
#' density labels on the y-axis see the [yaxis_text()] convenience
55
#' function.)

man-roxygen/args-hist.R

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
#' @param binwidth Passed to [ggplot2::geom_histogram()] to override
2-
#' the default binwidth.
3-
#' @param bins Passed to [ggplot2::geom_histogram()] to override
4-
#' the default binwidth.
5-
#' @param breaks Passed to [ggplot2::geom_histogram()] as an
6-
#' alternative to `binwidth`.
1+
#' @param binwidth Passed to [ggplot2::geom_histogram()], [ggplot2::geom_area()],
2+
#' and [ggdist::stat_dots()] to override the default binwidth.
3+
#' @param bins Passed to [ggplot2::geom_histogram()] and [ggplot2::geom_area()]
4+
#' to override the default binning.
5+
#' @param breaks Passed to [ggplot2::geom_histogram()] as an alternative to
6+
#' `binwidth`.
77
#'

man/MCMC-diagnostics.Rd

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

man/MCMC-distributions.Rd

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

man/MCMC-nuts.Rd

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

man/MCMC-recover.Rd

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

man/PPC-distributions.Rd

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

man/PPC-errors.Rd

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

man/PPC-test-statistics.Rd

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

0 commit comments

Comments
 (0)