[MediaWiki-commits] [Gerrit] wikimedia...autoreporter[master]: Bug fixes
Chelsyx has submitted this change and it was merged. ( https://gerrit.wikimedia.org/r/383960 ) Change subject: Bug fixes .. Bug fixes Change-Id: Ifa99d8f6796a091124a0c902b8d2e370a9ec5b13 --- M report.Rmd 1 file changed, 21 insertions(+), 19 deletions(-) Approvals: Chelsyx: Verified; Looks good to me, approved diff --git a/report.Rmd b/report.Rmd index ba84ad6..50c315b 100644 --- a/report.Rmd +++ b/report.Rmd @@ -94,6 +94,8 @@ ) }) source("functions.R") +# Take all R colors from graphical devices (with grey removed) +large_color_palette = grDevices::colors()[grep('gr(a|e)y', grDevices::colors(), invert = T)] ``` `r if (!is.null(params$test_description)) { params$test_description }` @@ -514,7 +516,7 @@ ```{r event_count_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * n_wiki)} event_count_function(by_wiki = TRUE) + theme_facet() + - facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y") + facet_wrap(~ wiki, ncol = 1, scales = "free_y") ``` ```{r event_after_click_all, echo=FALSE} @@ -529,10 +531,10 @@ event_after_click_function() + theme_min() ``` -```{r event_after_click_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * n_wiki)} +```{r event_after_click_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * ceiling(n_wiki / 2))} event_after_click_function(by_wiki = TRUE) + theme_facet() + - facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y") + facet_wrap(~ wiki, ncol = 2, scales = "free_y") ``` Searches @@ -559,7 +561,7 @@ knitr::kable() ``` -```{r daily_searches, echo=FALSE} +```{r daily_searches, echo=FALSE, fig.height=(4 * n_wiki)} searches %>% group_by(group, wiki, date) %>% summarize(`All Searches` = n(), `Searches with Results` = sum(`got same-wiki results`), `Searches with Clicks` = sum(`same-wiki clickthrough`)) %>% @@ -583,7 +585,7 @@ group_by(!!! rlang::syms(c("group", "results", switch(by_wiki, "wiki", NULL %>% summarize(searches = length(unique(serp_id[!is.na(serp_id)]))) %>% bar_chart(x = "results", y = "searches", x_lab = "Number of same-wiki results returned", - y_lab = "Number of searches", title = expression(paste("Number of searches with ", italic("n"), " same-wiki result returned, by test group", switch(by_wiki, "and wiki", NULL + y_lab = "Number of searches", title = paste("Number of searches with n same-wiki result returned, by test group", switch(by_wiki, "and wiki", NULL))) } n_results_summary_function() + theme_min() ``` @@ -609,7 +611,7 @@ group_by(!!! rlang::syms(c("group", "offset", switch(by_wiki, "wiki", NULL %>% tally %>% bar_chart(x = "offset", y = "n", x_lab = "Offset", y_lab = "Number of SERPs", - title = expression(paste("Number of SERPs with ", italic("n"), " offset results, by test group", switch(by_wiki, "and wiki", NULL))), + title = paste("Number of SERPs with n offset results, by test group", switch(by_wiki, "and wiki", NULL)), caption = "This can be regarded as a proxy for users visiting additional pages of their search results.") + scale_x_discrete(limits = c("No offset (page 1)", Pluralize(c(20, 40, 60, 80), "result"), "100+ results")) } @@ -643,14 +645,15 @@ tally %>% mutate(prop = paste0(scales::percent_format()(n/sum(n)), " (", n, ")")) %>% select(-n) %>% -tidyr::spread(group, prop) +tidyr::spread(group, prop) %>% +ungroup } get_bayes_factor <- function(data) { BF <- data %>% tally %>% tidyr::spread(group, n) %>% ungroup %>% -select(params$test_group_names) %>% +select(dplyr::one_of(params$test_group_names)) %>% as.matrix() %>% # see http://bayesfactorpcl.r-forge.r-project.org/#ctables for more info BayesFactor::contingencyTableBF(sampleType = "indepMulti", fixedMargin = "cols") @@ -808,7 +811,7 @@ iwclick_position_function() + theme_min() ``` -```{r iwclick_position_wiki, eval=("iwclick" %in% events$event & n_wiki > 1), echo=FALSE, fig.height=(5 * n_wiki)} +```{r iwclick_position_wiki, eval=("iwclick" %in% events$event & n_wiki > 1), echo=FALSE, fig.height=(4 * n_wiki)} iwclick_position_function(by_wiki = TRUE) + facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y") + theme_facet() @@ -1044,7 +1047,7 @@ theme_facet() ``` -```{r engagement_OR_wiki, eval=(n_wiki > 1), echo=FALSE, results='asis', include=TRUE} +```{r engagement_OR_wiki, eval=(n_wiki > 1), echo=FALSE, fig.width=11, fig.height=10, results='asis', include=TRUE} # TODO: duplicated code engagement_OR_all control_group <- grep("control", params$`test_group_names`, value = TRUE) test_group <- setdiff(params$`test_group_names`, control_group) @@ -1063,17 +1066,16 @@ labels = c("Pr[Control Engaging]", "Pr[Test Engaging]", "Pr[Test] - Pr[Control]", "Relative Risk", "Odds Ratio") )) %>% ggplot(aes(x = 1, y = estimate, ymin = conf.
[MediaWiki-commits] [Gerrit] wikimedia...autoreporter[master]: Bug fixes
Chelsyx has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/383960 ) Change subject: Bug fixes .. Bug fixes Change-Id: Ifa99d8f6796a091124a0c902b8d2e370a9ec5b13 --- M report.Rmd 1 file changed, 21 insertions(+), 19 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/autoreporter refs/changes/60/383960/1 diff --git a/report.Rmd b/report.Rmd index ba84ad6..50c315b 100644 --- a/report.Rmd +++ b/report.Rmd @@ -94,6 +94,8 @@ ) }) source("functions.R") +# Take all R colors from graphical devices (with grey removed) +large_color_palette = grDevices::colors()[grep('gr(a|e)y', grDevices::colors(), invert = T)] ``` `r if (!is.null(params$test_description)) { params$test_description }` @@ -514,7 +516,7 @@ ```{r event_count_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * n_wiki)} event_count_function(by_wiki = TRUE) + theme_facet() + - facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y") + facet_wrap(~ wiki, ncol = 1, scales = "free_y") ``` ```{r event_after_click_all, echo=FALSE} @@ -529,10 +531,10 @@ event_after_click_function() + theme_min() ``` -```{r event_after_click_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * n_wiki)} +```{r event_after_click_wiki, echo=FALSE, eval=(n_wiki > 1), fig.height=(5 * ceiling(n_wiki / 2))} event_after_click_function(by_wiki = TRUE) + theme_facet() + - facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y") + facet_wrap(~ wiki, ncol = 2, scales = "free_y") ``` Searches @@ -559,7 +561,7 @@ knitr::kable() ``` -```{r daily_searches, echo=FALSE} +```{r daily_searches, echo=FALSE, fig.height=(4 * n_wiki)} searches %>% group_by(group, wiki, date) %>% summarize(`All Searches` = n(), `Searches with Results` = sum(`got same-wiki results`), `Searches with Clicks` = sum(`same-wiki clickthrough`)) %>% @@ -583,7 +585,7 @@ group_by(!!! rlang::syms(c("group", "results", switch(by_wiki, "wiki", NULL %>% summarize(searches = length(unique(serp_id[!is.na(serp_id)]))) %>% bar_chart(x = "results", y = "searches", x_lab = "Number of same-wiki results returned", - y_lab = "Number of searches", title = expression(paste("Number of searches with ", italic("n"), " same-wiki result returned, by test group", switch(by_wiki, "and wiki", NULL + y_lab = "Number of searches", title = paste("Number of searches with n same-wiki result returned, by test group", switch(by_wiki, "and wiki", NULL))) } n_results_summary_function() + theme_min() ``` @@ -609,7 +611,7 @@ group_by(!!! rlang::syms(c("group", "offset", switch(by_wiki, "wiki", NULL %>% tally %>% bar_chart(x = "offset", y = "n", x_lab = "Offset", y_lab = "Number of SERPs", - title = expression(paste("Number of SERPs with ", italic("n"), " offset results, by test group", switch(by_wiki, "and wiki", NULL))), + title = paste("Number of SERPs with n offset results, by test group", switch(by_wiki, "and wiki", NULL)), caption = "This can be regarded as a proxy for users visiting additional pages of their search results.") + scale_x_discrete(limits = c("No offset (page 1)", Pluralize(c(20, 40, 60, 80), "result"), "100+ results")) } @@ -643,14 +645,15 @@ tally %>% mutate(prop = paste0(scales::percent_format()(n/sum(n)), " (", n, ")")) %>% select(-n) %>% -tidyr::spread(group, prop) +tidyr::spread(group, prop) %>% +ungroup } get_bayes_factor <- function(data) { BF <- data %>% tally %>% tidyr::spread(group, n) %>% ungroup %>% -select(params$test_group_names) %>% +select(dplyr::one_of(params$test_group_names)) %>% as.matrix() %>% # see http://bayesfactorpcl.r-forge.r-project.org/#ctables for more info BayesFactor::contingencyTableBF(sampleType = "indepMulti", fixedMargin = "cols") @@ -808,7 +811,7 @@ iwclick_position_function() + theme_min() ``` -```{r iwclick_position_wiki, eval=("iwclick" %in% events$event & n_wiki > 1), echo=FALSE, fig.height=(5 * n_wiki)} +```{r iwclick_position_wiki, eval=("iwclick" %in% events$event & n_wiki > 1), echo=FALSE, fig.height=(4 * n_wiki)} iwclick_position_function(by_wiki = TRUE) + facet_wrap(~ wiki, nrow = n_wiki, scales = "free_y") + theme_facet() @@ -1044,7 +1047,7 @@ theme_facet() ``` -```{r engagement_OR_wiki, eval=(n_wiki > 1), echo=FALSE, results='asis', include=TRUE} +```{r engagement_OR_wiki, eval=(n_wiki > 1), echo=FALSE, fig.width=11, fig.height=10, results='asis', include=TRUE} # TODO: duplicated code engagement_OR_all control_group <- grep("control", params$`test_group_names`, value = TRUE) test_group <- setdiff(params$`test_group_names`, control_group) @@ -1063,17 +1066,16 @@ labels = c("Pr[Control Engaging]", "Pr[Test Engaging]", "Pr[Test] - Pr[Control]", "Relative Risk", "Odds Ratio") )) %>% ggplot(ae