Skip to content

Commit

Permalink
fixes #25 , rebuilds site
Browse files Browse the repository at this point in the history
  • Loading branch information
johnmackintosh committed Sep 20, 2019
1 parent 18ed515 commit 0ae1853
Show file tree
Hide file tree
Showing 40 changed files with 52 additions and 19 deletions.
9 changes: 7 additions & 2 deletions R/runcharter.R
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@
#'direction = "above", datecol = "date", grpvar ="grp", yval ="y",
#' facet_cols = 2,chart_title = "Automated runs analysis",
#'chart_subtitle = " some runs found", chart_caption = "powered by R",
#'chart_breaks = " 6 months")
#'chart_breaks = "6 months")
#' }
#'
#'
Expand Down Expand Up @@ -75,7 +75,6 @@ runcharter <- function(df,
call. = FALSE)
}


# mising arguments
# df
if (!length(df)) {
Expand Down Expand Up @@ -120,6 +119,12 @@ runcharter <- function(df,
stop('"Please provide a value for the "yval" argument"')
}

# # datecol in wrong format
#
# if (is.character(datecol)) {
# stop("The date column is a character vector.
# Please ensure this is in a date / datetime / numeric format")
# }

start_date <- NULL
end_date <- NULL
Expand Down
2 changes: 1 addition & 1 deletion README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ runcharter(df = signals,
line_colr = "#005EB8", # blue
point_colr ="#005EB8", # blue
median_colr = "#E87722", # orange
sus_fill = "#DB1884") # magenta
highlight_fill = "#DB1884") # magenta
```

Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ runcharter(df = signals,
line_colr = "#005EB8", # blue
point_colr ="#005EB8", # blue
median_colr = "#E87722", # orange
sus_fill = "#DB1884") # magenta
highlight_fill = "#DB1884") # magenta
```

The function will return a plot and a summary table showing the original
Expand Down
2 changes: 1 addition & 1 deletion docs/404.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/articles/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added docs/articles/man/figures/analysis_off-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/both-directions-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/factor-handling-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/med_row-0-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/multiple-runs-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/pipe-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/run-below-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/runs-above-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/unnamed-chunk-2-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/unnamed-chunk-3-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/unnamed-chunk-4-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/unnamed-chunk-5-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/unnamed-chunk-6-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/unnamed-chunk-7-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/articles/man/figures/unnamed-chunk-9-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
4 changes: 2 additions & 2 deletions docs/articles/runcharter.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/authors.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions docs/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/pkgdown.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
pandoc: '2.6'
pkgdown: 1.4.0
pkgdown: 1.4.1
pkgdown_sha: ~
articles:
runcharter: runcharter.html
Expand Down
Binary file added docs/reference/figures/analysis_off-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/reference/figures/both-directions-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/reference/figures/factor-handling-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/reference/figures/med_row-0-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/reference/figures/multiple-runs-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/reference/figures/pipe-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/reference/figures/run-below-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added docs/reference/figures/runs-above-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion docs/reference/index.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/pipe.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file modified docs/reference/runcharter-1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
12 changes: 10 additions & 2 deletions docs/reference/runcharter.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion docs/reference/signals.html

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion man/runcharter.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

22 changes: 21 additions & 1 deletion tests/testthat/test_errors.R
Original file line number Diff line number Diff line change
Expand Up @@ -107,6 +107,21 @@ throws_error('"Please check and provide values for the "datecol" and "grpvar" a
throws_error('"Please check and provide values for the "datecol" and "yval" arguments"'))


#
# #wrong date format
#
# test_that("wrong dateformat causes error",{
# expect_that(runcharter(med_rows = 13,
# runlength = 9,
# direction = "both",
# datecol = as.character("date"),
# grpvar = "grp",
# yval = "y"),
# throws_error())
# })



# date , grpvar and yval all missing

expect_that(runcharter(signals,
Expand Down Expand Up @@ -153,7 +168,7 @@ expect_that(runcharter(signals,
datecol = "date",
grpvar = "grp",
yval = "y"),
throws_error("None of the groups have enough rows of data beyond the specified baseline period, for the desired runlength.
throws_error("None of the groups have enough rows of data beyond the specified baseline period, for the desired runlength.
Please check the values of the med_rows and runlength arguments.
Currently they exceed the number of rows for each group"))

Expand Down Expand Up @@ -182,3 +197,8 @@ test_that("missing df argument causes error", {


})





0 comments on commit 0ae1853

Please sign in to comment.