diff --git a/DESCRIPTION b/DESCRIPTION index 389f7ec8..fbaa6e33 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,7 +1,7 @@ Type: Package Package: sitrep Title: Report templates and helper functions for EPI -Version: 0.1.3 +Version: 0.1.4 Authors@R: c(person(given = "Dirk", family = "Schumacher", @@ -66,7 +66,7 @@ Imports: stats, utils, apyramid, - msfdict + epidict Suggests: testthat (>= 2.1.0), sessioninfo, @@ -75,7 +75,7 @@ Suggests: Remotes: reconhub/linelist, R4EPI/apyramid, - R4EPI/msfdict + R4EPI/epidict Encoding: UTF-8 LazyData: true Roxygen: list(markdown = TRUE) @@ -97,7 +97,7 @@ Collate: 'helpers.R' 'inline_fun.R' 'msf_dict_rename_helper.R' - 'msfdict_exports.R' + 'epidict_exports.R' 'prettify_tabulation.R' 'relabel_proportions.R' 'sample-size.R' diff --git a/NAMESPACE b/NAMESPACE index c1ddbe44..dc6c161f 100644 --- a/NAMESPACE +++ b/NAMESPACE @@ -49,6 +49,9 @@ importFrom(dplyr,select) importFrom(dplyr,summarise) importFrom(dplyr,summarise_all) importFrom(dplyr,ungroup) +importFrom(epidict,gen_data) +importFrom(epidict,msf_dict) +importFrom(epidict,msf_dict_survey) importFrom(ggplot2,aes) importFrom(ggplot2,expand_scale) importFrom(ggplot2,geom_density) @@ -60,9 +63,6 @@ importFrom(ggplot2,scale_y_continuous) importFrom(ggplot2,stat_density) importFrom(ggplot2,stat_function) importFrom(glue,glue) -importFrom(msfdict,gen_data) -importFrom(msfdict,msf_dict) -importFrom(msfdict,msf_dict_survey) importFrom(rlang,"!!") importFrom(rlang,".data") importFrom(rlang,":=") diff --git a/NEWS.md b/NEWS.md index 6ff526d5..614ada5e 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,3 +1,8 @@ +# sitrep 0.1.4 + +* Rename import of {msfdict} to {epidict} +* Remove duplicate excel files from {epidict} + # sitrep 0.1.3 * `gen_polygon()` has been moved back into this package as it did not really diff --git a/R/msfdict_exports.R b/R/epidict_exports.R similarity index 63% rename from R/msfdict_exports.R rename to R/epidict_exports.R index c9119e95..eebbd652 100644 --- a/R/msfdict_exports.R +++ b/R/epidict_exports.R @@ -1,27 +1,27 @@ -# These functions have been re-exported from the {msfdict} package. They were +# These functions have been re-exported from the {epidict} package. They were # previously part of the sitrep package, but have been moved into their own # separate package for maintenance. By re-exporting them, the user does not # see much of a difference. This is different than the {apyramid} package where # we use the function internally as it has modified syntax. -#' Functions re-expored from {msfdict} +#' Functions re-expored from {epidict} #' -#' @seealso Dictionaries: [msfdict::msf_dict()], [msfdict::msf_dict_survey()]\cr -#' Generator: [msfdict::gen_data()] +#' @seealso Dictionaries: [epidict::msf_dict()], [epidict::msf_dict_survey()]\cr +#' Generator: [epidict::gen_data()] #' @name msf_dict_survey -#' @importFrom msfdict msf_dict_survey +#' @importFrom epidict msf_dict_survey #' @export #' @rdname msf_dict "msf_dict_survey" #' @name msf_dict -#' @importFrom msfdict msf_dict +#' @importFrom epidict msf_dict #' @export #' @rdname msf_dict "msf_dict" #' @name gen_data -#' @importFrom msfdict gen_data +#' @importFrom epidict gen_data #' @export #' @rdname msf_dict "gen_data" diff --git a/R/gen_polygon.R b/R/gen_polygon.R index 8b0cc536..2555a4c4 100644 --- a/R/gen_polygon.R +++ b/R/gen_polygon.R @@ -10,7 +10,7 @@ gen_polygon <- function(regions) { # get file path - path <- system.file("extdata", "coords.csv", package = "msfdict") + path <- system.file("extdata", "coords.csv", package = "sitrep") # read in coordinates as matrix coords <- as.matrix(read.csv(path)) diff --git a/inst/extdata/MSF-outbreak-dict.xlsx b/inst/extdata/MSF-outbreak-dict.xlsx deleted file mode 100644 index ba2f2d54..00000000 Binary files a/inst/extdata/MSF-outbreak-dict.xlsx and /dev/null differ diff --git a/inst/extdata/MSF-survey-dict.xlsx b/inst/extdata/MSF-survey-dict.xlsx deleted file mode 100644 index 12aa1ddc..00000000 Binary files a/inst/extdata/MSF-survey-dict.xlsx and /dev/null differ diff --git a/man/msf_dict.Rd b/man/msf_dict.Rd index 72be8d0c..bec46f98 100644 --- a/man/msf_dict.Rd +++ b/man/msf_dict.Rd @@ -1,11 +1,11 @@ % Generated by roxygen2: do not edit by hand -% Please edit documentation in R/msfdict_exports.R +% Please edit documentation in R/epidict_exports.R \docType{data} \name{msf_dict_survey} \alias{msf_dict_survey} \alias{msf_dict} \alias{gen_data} -\title{Functions re-expored from {msfdict}} +\title{Functions re-expored from {epidict}} \format{An object of class \code{function} of length 1.} \usage{ msf_dict_survey @@ -15,10 +15,10 @@ msf_dict gen_data } \description{ -Functions re-expored from {msfdict} +Functions re-expored from {epidict} } \seealso{ -Dictionaries: \code{\link[msfdict:msf_dict]{msfdict::msf_dict()}}, \code{\link[msfdict:msf_dict_survey]{msfdict::msf_dict_survey()}}\cr -Generator: \code{\link[msfdict:gen_data]{msfdict::gen_data()}} +Dictionaries: \code{\link[epidict:msf_dict]{epidict::msf_dict()}}, \code{\link[epidict:msf_dict_survey]{epidict::msf_dict_survey()}}\cr +Generator: \code{\link[epidict:gen_data]{epidict::gen_data()}} } \keyword{datasets}