-
Notifications
You must be signed in to change notification settings - Fork 25
BOT: Fix #942: Add plot_discrimination() for binary forecasts #1079
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
nikosbosse
wants to merge
7
commits into
main
Choose a base branch
from
fix/942-discrimination-plot-binary
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Changes from all commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
cc0dbc2
Fixes #942: Add plot_discrimination() for binary forecasts
nikosbosse 9045ef1
Fix lint and test failures in plot_discrimination tests
nikosbosse afb5a5a
Add histogram/density type option to plot_discrimination
nikosbosse a128484
Merge branch 'main' into fix/942-discrimination-plot-binary
nikosbosse 392220e
Pass ... to geom in plot_discrimination for customisation
nikosbosse 1dbdfee
Use per-group proportions for histogram y-axis
nikosbosse 8dfd005
Fix lint warnings in plot_discrimination
nikosbosse File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| #' @title Plot discrimination for binary forecasts | ||
| #' | ||
| #' @description | ||
| #' Visualise the discrimination ability of binary forecasts by plotting the | ||
| #' distribution of predicted probabilities, stratified by the observed outcome. | ||
| #' A well-discriminating model will show clearly separated distributions for | ||
| #' the two observed levels. | ||
| #' | ||
| #' @param forecast A data.table (or data.frame) containing at least columns | ||
| #' `observed` (factor with two levels) and `predicted` (numeric probabilities | ||
| #' between 0 and 1). Typically a `forecast_binary` object or the output of | ||
| #' [as_forecast_binary()]. | ||
| #' @param type Character, either `"histogram"` (default) or `"density"`. | ||
| #' `"histogram"` shows a histogram with proportions on the y-axis; | ||
| #' `"density"` shows kernel density curves. | ||
| #' @param ... Additional arguments passed to [ggplot2::geom_histogram()] or | ||
| #' [ggplot2::geom_density()], depending on `type`. For example, `bins` or | ||
| #' `binwidth` for histograms, or `bw` and `adjust` for density plots. | ||
| #' @returns A ggplot object showing the distribution of predicted | ||
| #' probabilities, coloured by observed outcome level. | ||
| #' @importFrom ggplot2 ggplot aes geom_density geom_histogram | ||
| #' after_stat labs .data | ||
| #' @importFrom checkmate assert assert_data_frame assert_choice | ||
| #' @export | ||
| #' @examples | ||
| #' library(ggplot2) | ||
| #' plot_discrimination(na.omit(example_binary)) | ||
| #' | ||
| #' plot_discrimination(na.omit(example_binary), type = "density") | ||
| #' | ||
| #' plot_discrimination(na.omit(example_binary), bins = 10) | ||
| #' | ||
| #' plot_discrimination(na.omit(example_binary)) + | ||
| #' facet_wrap(~model) | ||
|
|
||
| plot_discrimination <- function(forecast, type = c("histogram", "density"), ...) { | ||
| forecast <- ensure_data.table(forecast) | ||
| assert(check_columns_present(forecast, c("observed", "predicted"))) | ||
| type <- match.arg(type) | ||
|
|
||
| plot <- ggplot( | ||
| forecast, | ||
| aes(x = .data[["predicted"]], fill = .data[["observed"]]) | ||
| ) | ||
|
|
||
| if (type == "density") { | ||
| plot <- plot + | ||
| geom_density(alpha = 0.5, ...) + # nolint object_usage_linter | ||
| labs(y = "Density") | ||
| } else { | ||
| plot <- plot + | ||
| geom_histogram( # nolint object_usage_linter | ||
|
Contributor
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. lintr really works this badly with standard dply? |
||
| aes(y = after_stat( # nolint object_usage_linter | ||
| ave(count, group, FUN = function(x) x / sum(x)) # nolint object_usage_linter | ||
| )), | ||
| position = "identity", alpha = 0.5, ... | ||
| ) + | ||
| labs(y = "Proportion") | ||
| } | ||
|
|
||
| plot <- plot + | ||
| labs( | ||
| x = "Predicted probability", | ||
| fill = "Observed" | ||
| ) + | ||
| theme_scoringutils() | ||
|
|
||
| return(plot) | ||
| } | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -36,6 +36,7 @@ globalVariables(c( | |
| "fill_col", | ||
| "forecast_id", | ||
| "g", | ||
| "group", | ||
| "hist", | ||
| "identifCol", | ||
| "Interval_Score", | ||
|
|
||
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
or? it is the output? Do we want to support input that isn't a forecast binary object? Based on package flow I would assume we are mving towards not doing so.