Merge pull request #50 from imperialCHEPI/confidence

Modify data process to include confidence interval
imperialCHEPI · Aug 29, 2024 · 5982b76 · 5982b76
2 parents 37b0367 + 38ee782
commit 5982b76
Show file tree

Hide file tree

Showing 10 changed files with 400 additions and 237 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -12,16 +12,16 @@ Description: A collection of functions for visualising data from the
 License: MIT + file LICENSE
 Encoding: UTF-8
 LazyData: true
-RoxygenNote: 7.3.1
+RoxygenNote: 7.3.2
 Imports: 
     dplyr,
     ggplot2,
     grDevices,
     gridExtra,
     scales,
+    splines,
     stats,
-    tidyr,
-    utils
+    tidyr
 Suggests: 
     testthat (>= 3.0.0)
 Config/testthat/edition: 3

diff --git a/NAMESPACE b/NAMESPACE
@@ -3,11 +3,11 @@
 export(burden_disease)
 export(combine_plots)
 export(gen_data_le)
-export(gen_data_mean)
-export(gen_data_mean_weighted)
-export(gen_data_mean_weighted_burden_wide)
-export(gen_data_mean_weighted_inc_wide)
-export(gen_data_mean_weighted_rf_wide)
+export(gen_data_weighted)
+export(gen_data_weighted_burden)
+export(gen_data_weighted_burden_spline)
+export(gen_data_weighted_ds)
+export(gen_data_weighted_rf)
 export(hgps_theme)
 export(inc_cum)
 export(inc_diff)

diff --git a/R/data-process.R b/R/data-process.R
diff --git a/man/DataProcessing.Rd b/man/DataProcessing.Rd
diff --git a/man/gen_data_mean.Rd b/man/gen_data_mean.Rd
diff --git a/man/gen_data_mean_weighted.Rd → man/gen_data_weighted.Rd b/man/gen_data_mean_weighted.Rd → man/gen_data_weighted.Rd
diff --git a/man/gen_data_mean_weighted_burden_wide.Rd → man/gen_data_weighted_burden.Rd b/man/gen_data_mean_weighted_burden_wide.Rd → man/gen_data_weighted_burden.Rd
diff --git a/man/gen_data_weighted_burden_spline.Rd b/man/gen_data_weighted_burden_spline.Rd
diff --git a/man/gen_data_mean_weighted_inc_wide.Rd → man/gen_data_weighted_ds.Rd b/man/gen_data_mean_weighted_inc_wide.Rd → man/gen_data_weighted_ds.Rd
diff --git a/man/gen_data_mean_weighted_rf_wide.Rd → man/gen_data_weighted_rf.Rd b/man/gen_data_mean_weighted_rf_wide.Rd → man/gen_data_weighted_rf.Rd