Skip to content

Commit f76b29e

Browse files
authored
issues-48 (#50)
* First * Update
1 parent 6a35287 commit f76b29e

20 files changed

+100
-72
lines changed

NAMESPACE

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ export(add)
44
export(define)
55
export(disaggregate)
66
export(gmutate)
7+
export(gsummarise)
78
export(gsummarize)
89
export(mfilter)
910
export(mplot_bar)

R/metrics_definition.R

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ NULL
33

44
# Advertisng world metrics
55
ad_metrics <- define(
6+
count = n(),
67
cost = sum(cost),
78
impression = sum(impression),
89
click = sum(click),

R/mmetrics.R

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -80,15 +80,16 @@ gmutate <- function(df, ..., metrics) gprocess(dplyr::mutate, df, ..., metrics =
8080

8181
#' Pick evaluable metrics in the given data frame
8282
#'
83-
#' @param metrics Metrics
8483
#' @param df Data frame
84+
#' @param metrics Metrics
8585
#'
8686
#' @return Evaluable metrics
8787
#'
8888
#' @export
89-
mfilter <- function(metrics, df) {
89+
mfilter <- function(df, metrics) {
9090
is_evaluatable <- function(metrics, df) {
91-
out <- tryCatch(eval(rlang::quo_squash(metrics), envir = df), error = function(e) e, silent = TRUE)
91+
# Adhoc code
92+
out <- tryCatch(dplyr::mutate(df[1, ], !!rlang::quo_squash(metrics)), error = function(e) e, silent = TRUE)
9293
!(any(class(out) == "error"))
9394
}
9495
is_effective <- unlist(purrr::map(metrics, ~ is_evaluatable(.x, df)))
@@ -98,7 +99,7 @@ mfilter <- function(metrics, df) {
9899
# Internal function for data process with group
99100
gprocess <- function(fun, df, ..., metrics) {
100101
group_vars <- rlang::enquos(...)
101-
metrics <- mfilter(metrics, df)
102+
metrics <- mfilter(df, metrics)
102103
df %>%
103104
dplyr::group_by(!!!group_vars) %>%
104105
fun(!!!metrics) %>%

README.Rmd

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,8 @@ options(knitr.table.format = 'markdown')
1818
[![Travis-CI Build Status](https://api.travis-ci.com/y-bar/mmetrics.svg?branch=master)](https://travis-ci.com/y-bar/mmetrics)
1919
[![CRAN_Status_Badge](https://www.r-pkg.org/badges/version/mmetrics)](https://cran.r-project.org/package=mmetrics)
2020
[![codecov](https://codecov.io/github/y-bar/mmetrics/branch/master/graphs/badge.svg)](https://codecov.io/github/y-bar/mmetrics)
21-
[![minimal R version](https://img.shields.io/badge/R%3E%3D-3.4.0-6666ff.svg)](https://cran.r-project.org/)
2221
[![Licence](https://img.shields.io/cran/l/mmetrics.svg)](https://github.com/y-bar/mmetrics/blob/master/LICENSE)
2322
[![Lifecycle: experimental](https://img.shields.io/badge/lifecycle-experimental-orange.svg)](https://www.tidyverse.org/lifecycle/#experimental)
24-
[![Last-changedate](https://img.shields.io/badge/last%20change-`r gsub('-', '--', Sys.Date())`-yellowgreen.svg)](/commits/master)
2523

2624

2725
Easy Computation of Marketing Metrics with Different Analysis Axis.

docs/LICENSE-text.html

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

docs/articles/index.html

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

docs/articles/introduction.html

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

docs/authors.html

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

docs/index.html

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

docs/reference/add.html

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

docs/reference/define.html

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

docs/reference/disaggregate.html

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

docs/reference/dummy_data.html

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

docs/reference/index.html

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

0 commit comments

Comments
 (0)