Bearloga has uploaded a new change for review.
https://gerrit.wikimedia.org/r/260763
Change subject: Get data selector from polloi instead
......................................................................
Get data selector from polloi instead
Change-Id: I6fd4cdbd4406ca0eb8a3271bbb99f229e5177e2d
---
M server.R
M utils.R
2 files changed, 7 insertions(+), 13 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/wikimedia/discovery/wetzel
refs/changes/63/260763/1
diff --git a/server.R b/server.R
index 8b3b2c9..ce650f7 100644
--- a/server.R
+++ b/server.R
@@ -18,7 +18,8 @@
}
output$tiles_summary_series <- renderDygraph({
- temp <- ddply(data_select(input$tile_summary_automata_check,
new_tiles_automata, new_tiles_no_automata), .(date), summarize,
+ temp <- polloi::data_select(input$tile_summary_automata_check,
new_tiles_automata, new_tiles_no_automata) %>%
+ ddply(.(date), summarize,
`total tiles` = sum(total),
`total users` = sum(users),
`average tiles per user` = `total tiles` / `total users`)
@@ -38,8 +39,8 @@
})
output$tiles_style_series <- renderDygraph({
- ddply(data_select(input$tile_style_automata_check, new_tiles_automata,
new_tiles_no_automata),
- .(date, style), summarize, `total tiles` = sum(total)) %>%
+ polloi::data_select(input$tile_style_automata_check, new_tiles_automata,
new_tiles_no_automata) %>%
+ ddply(.(date, style), summarize, `total tiles` = sum(total)) %>%
tidyr::spread(style, `total tiles`) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_tiles_style_series)) %>%
polloi::subset_by_date_range(time_frame_range(input$tiles_style_series_timeframe,
input$tiles_style_series_timeframe_daterange)) %>%
@@ -51,8 +52,8 @@
})
output$tiles_users_series <- renderDygraph({
- ddply(data_select(input$tile_users_automata_check, new_tiles_automata,
new_tiles_no_automata),
- .(date, style), summarize, `total users` = sum(users)) %>%
+ polloi::data_select(input$tile_users_automata_check, new_tiles_automata,
new_tiles_no_automata) %>%
+ ddply(.(date, style), summarize, `total users` = sum(users)) %>%
tidyr::spread(style, `total users`) %>%
polloi::smoother(smooth_level =
polloi::smooth_switch(input$smoothing_global,
input$smoothing_tiles_users_series)) %>%
polloi::subset_by_date_range(time_frame_range(input$tiles_users_series_timeframe,
input$tiles_users_series_timeframe_daterange)) %>%
@@ -70,7 +71,7 @@
})
output$tiles_zoom_series <- renderDygraph({
- data_select(input$tile_zoom_automata_check, new_tiles_automata,
new_tiles_no_automata) %>%
+ polloi::data_select(input$tile_zoom_automata_check, new_tiles_automata,
new_tiles_no_automata) %>%
subset(zoom %in% as.numeric(input$zoom_level_selector)) %>%
ddply(.(date, zoom), summarize, `total tiles` = sum(total)) %>%
tidyr::spread(zoom, `total tiles`) %>%
diff --git a/utils.R b/utils.R
index 37a715e..633806e 100644
--- a/utils.R
+++ b/utils.R
@@ -33,10 +33,3 @@
return(invisible())
}
-
-data_select <- function(condition, true_set, false_set){
- if(condition){
- return(true_set)
- }
- return(false_set)
-}
--
To view, visit https://gerrit.wikimedia.org/r/260763
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6fd4cdbd4406ca0eb8a3271bbb99f229e5177e2d
Gerrit-PatchSet: 1
Gerrit-Project: wikimedia/discovery/wetzel
Gerrit-Branch: master
Gerrit-Owner: Bearloga <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
