Remove support for PopulationPyramid and TaskParameters S4 classes.

InstituteforDiseaseModeling · Dec 15, 2022 · 5d79ca9 · 5d79ca9
1 parent d4fd4e0
commit 5d79ca9
Show file tree

Hide file tree

Showing 16 changed files with 4 additions and 303 deletions.
diff --git a/pacehrh/DESCRIPTION b/pacehrh/DESCRIPTION
@@ -45,12 +45,6 @@ Collate:
     'pace_utils.R'
     'pace_lint.R'
     'pace_trace.R'
-    'pace_pop_pyramid_class.R'
-    'pace_task_params_class.R'
-    'pace_add_method.R'
-    'pace_getValue_method.R'
-    'pace_setFromVector_method.R'
-    'pace_setValue_method.R'
     'pace_config.R'
     'pace_pop_rates_config.R'
     'pace_exp_control.R'

diff --git a/pacehrh/NAMESPACE b/pacehrh/NAMESPACE
@@ -25,7 +25,6 @@ export(PlotPyramids)
 export(PlotResultsFertilityRates)
 export(PlotResultsMortalityRates)
 export(PlotResultsPopulationCurve)
-export(PopulationPyramid)
 export(ReadAndCollateSuiteResults)
 export(ReadScenario)
 export(RunExperiments)
@@ -35,11 +34,8 @@ export(SaveSuiteDemographics)
 export(SaveSuiteResults)
 export(SetGlobalStartEndYears)
 export(SetRoundingLaw)
-export(TaskParameters)
 export(Trace)
 export(UpdateScenario)
-exportClasses(PopulationPyramid)
-exportClasses(TaskParameters)
 import(data.table)
 importFrom(dplyr,group_by)
 importFrom(dplyr,summarize)

diff --git a/pacehrh/R/pace_add_method.R b/pacehrh/R/pace_add_method.R
diff --git a/pacehrh/R/pace_getValue_method.R b/pacehrh/R/pace_getValue_method.R
diff --git a/pacehrh/R/pace_pop_pyramid_class.R b/pacehrh/R/pace_pop_pyramid_class.R
diff --git a/pacehrh/R/pace_population_config.R b/pacehrh/R/pace_population_config.R
@@ -6,8 +6,8 @@
 #'
 #' @param sheetName Sheet name from the model input Excel file
 #'
-#' @return List with three \code{PopulationPyramid} objects:
-#' \code{female}, \code{male} and \code{total}
+#' @return Tibble with three population pyramid fields:
+#' \code{Female}, \code{Male} and \code{Total}
 #'
 loadInitialPopulation <- function(sheetName = "TotalPop"){
   popData <- readxl::read_xlsx(GPE$inputExcelFile, sheet = sheetName)

diff --git a/pacehrh/R/pace_setFromVector_method.R b/pacehrh/R/pace_setFromVector_method.R
diff --git a/pacehrh/R/pace_setValue_method.R b/pacehrh/R/pace_setValue_method.R
diff --git a/pacehrh/R/pace_task_params_class.R b/pacehrh/R/pace_task_params_class.R
diff --git a/pacehrh/man/PopulationPyramid-class.Rd b/pacehrh/man/PopulationPyramid-class.Rd
diff --git a/pacehrh/man/TaskParameters-class.Rd b/pacehrh/man/TaskParameters-class.Rd
diff --git a/pacehrh/man/add-PopulationPyramid-PopulationPyramid-method.Rd b/pacehrh/man/add-PopulationPyramid-PopulationPyramid-method.Rd
diff --git a/pacehrh/man/add-TaskParameters-TaskParameters-method.Rd b/pacehrh/man/add-TaskParameters-TaskParameters-method.Rd
diff --git a/pacehrh/man/loadInitialPopulation.Rd b/pacehrh/man/loadInitialPopulation.Rd
diff --git a/pacehrh/man/setFromVector-PopulationPyramid-numeric-method.Rd b/pacehrh/man/setFromVector-PopulationPyramid-numeric-method.Rd
diff --git a/pacehrh/tests/testthat/test-pace_pop_pyramid_class.R b/pacehrh/tests/testthat/test-pace_pop_pyramid_class.R