Skip to content

Commit

Permalink
rename config.writer package to flepiconfig
Browse files Browse the repository at this point in the history
  • Loading branch information
shauntruelove committed Mar 8, 2024
1 parent d9d8ce0 commit 45e5d18
Show file tree
Hide file tree
Showing 19 changed files with 20 additions and 20 deletions.
6 changes: 3 additions & 3 deletions build/renv/renv.lock
Original file line number Diff line number Diff line change
Expand Up @@ -421,12 +421,12 @@
"Hash": "2ba81b120c1655ab696c935ef33ea716",
"Requirements": []
},
"config.writer": {
"Package": "config.writer",
"flepiconfig": {
"Package": "flepiconfig",
"Version": "1.0.0",
"Source": "Local",
"RemoteType": "local",
"RemoteUrl": "~/pkgs/config.writer/",
"RemoteUrl": "~/pkgs/flepiconfig/",
"Hash": "6926b00e7a264696bc5b5ec3147bdd6e",
"Requirements": [
"MMWRweek",
Expand Down
4 changes: 0 additions & 4 deletions flepimop/R_packages/config.writer/tests/testthat.R

This file was deleted.

2 changes: 1 addition & 1 deletion flepimop/R_packages/flepicommon/R/DataUtils.R
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
##'
##' @return a data frame with columns for state USPS, county subpop and population
##' @examples
##' geodata <- load_geodata_file(filename = system.file("extdata", "geodata_territories_2019_statelevel.csv", package = "config.writer"))
##' geodata <- load_geodata_file(filename = system.file("extdata", "geodata_territories_2019_statelevel.csv", package = "flepiconfig"))
##' geodata
##'
##' @export
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
Package: config.writer
Package: flepiconfig
Title: Config creator for flepiMoP
Version: 3.0.0
Imports:
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -681,7 +681,7 @@ set_variant_params <- function(b117_only = FALSE, variant_path, variant_path_2 =
} else {
# we can get rid of this B117 part eventually
if (b117_only) {
variant_data <- config.writer::generate_variant_b117(variant_path = variant_path,
variant_data <- flepiconfig::generate_variant_b117(variant_path = variant_path,
sim_start_date = sim_start_date, sim_end_date = sim_end_date,
variant_lb = variant_lb, variant_effect = variant_effect,
month_shift = month_shift) %>% dplyr::mutate(subpop = "all",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,8 +109,8 @@ npi_recode_scenario_mult <- function(data){
#' @export
#'
#' @examples
#' geodata <- load_geodata_file(filename = system.file("extdata", "geodata_territories_2019_statelevel.csv", package = "config.writer"))
#' npi_dat <- process_npi_shub(intervention_path = system.file("extdata", "intervention_data.csv", package = "config.writer"), geodata)
#' geodata <- load_geodata_file(filename = system.file("extdata", "geodata_territories_2019_statelevel.csv", package = "flepiconfig"))
#' npi_dat <- process_npi_shub(intervention_path = system.file("extdata", "intervention_data.csv", package = "flepiconfig"), geodata)
#'
#' npi_dat
process_npi_usa <- function (intervention_path,
Expand Down Expand Up @@ -215,7 +215,7 @@ process_npi_ca <- function(intervention_path,
#' @return
#' @examples
#'
#' variant <- generate_variant_b117(variant_path = system.file("extdata", "strain_replace_mmwr.csv", package = "config.writer"))
#' variant <- generate_variant_b117(variant_path = system.file("extdata", "strain_replace_mmwr.csv", package = "flepiconfig"))
#' variant
#'
#' @export
Expand Down Expand Up @@ -301,8 +301,8 @@ generate_variant_b117 <- function(variant_path,
#'
#' @examples
#'
#' variant <- generate_multiple_variants(variant_path_1 = system.file("extdata", "B117-fits.csv", package = "config.writer"),
#' variant_path_2 = system.file("extdata", "B617-fits.csv", package = "config.writer"))
#' variant <- generate_multiple_variants(variant_path_1 = system.file("extdata", "B117-fits.csv", package = "flepiconfig"),
#' variant_path_2 = system.file("extdata", "B617-fits.csv", package = "flepiconfig"))
#' variant
#'
generate_multiple_variants <- function(variant_path_1,
Expand Down Expand Up @@ -399,8 +399,8 @@ generate_multiple_variants <- function(variant_path_1,
#'
#' @examples
#'
#' variant <- generate_multiple_variants(variant_path_1 = system.file("extdata", "B117-fits.csv", package = "config.writer"),
#' variant_path_2 = system.file("extdata", "B617-fits.csv", package = "config.writer"))
#' variant <- generate_multiple_variants(variant_path_1 = system.file("extdata", "B117-fits.csv", package = "flepiconfig"),
#' variant_path_2 = system.file("extdata", "B617-fits.csv", package = "flepiconfig"))
#' variant
#'
generate_multiple_variants_state <- function(variant_path_1,
Expand Down Expand Up @@ -520,8 +520,8 @@ generate_multiple_variants_state <- function(variant_path_1,
#'
#' @examples
#'
#' variant <- generate_multiple_variants(variant_path_1 = system.file("extdata", "B117-fits.csv", package = "config.writer"),
#' variant_path_2 = system.file("extdata", "B617-fits.csv", package = "config.writer"))
#' variant <- generate_multiple_variants(variant_path_1 = system.file("extdata", "B117-fits.csv", package = "flepiconfig"),
#' variant_path_2 = system.file("extdata", "B617-fits.csv", package = "flepiconfig"))
#' variant
#'
generate_compartment_variant <- function(variant_path = "../COVID19_USA/data/variant/variant_props_long.csv",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -1081,7 +1081,7 @@ print_seir <- function(integration_method = "rk4",
ifelse(use_descriptions & !(is.na(seir_dat$description[i]) |
is.null(seir_dat$description[i]) | seir_dat$description[i] == ""),
paste0("# ", seir_dat$transition[i], " - ", seir_dat$description[i], "\n"), ""),
config.writer::seir_chunk(resume_modifier = resume_modifier,
flepiconfig::seir_chunk(resume_modifier = resume_modifier,
SEIR_source = strsplit(seir_dat$SEIR_source[i], ",")[[1]],
SEIR_dest = strsplit(seir_dat$SEIR_dest[i], ",")[[1]],
vaccine_compartments_source = strsplit(seir_dat$vaccine_compartments_source[i], ",")[[1]],
Expand Down
4 changes: 4 additions & 0 deletions flepimop/R_packages/flepiconfig/tests/testthat.R
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
library(testthat)
library(flepiconfig)

# test_check("flepiconfig")

0 comments on commit 45e5d18

Please sign in to comment.