Merge pull request #18 from PublicHealthEngland/Dev1_0_8_9900_SF

Dev1 0 8 9900 sf
ukhsa-collaboration · Mar 8, 2019 · 3dccb15 · 3dccb15
2 parents edc6ef0 + 854574c
commit 3dccb15
Show file tree

Hide file tree

Showing 14 changed files with 877 additions and 8 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -14,6 +14,10 @@ Description: Functions to calculate commonly used public health statistics and
     Armitage P, Berry G (2002) <doi:10.1002/9780470773666>.
     Wilson EB. (1927) <doi:10.1080/01621459.1927.10502953>.
     Altman DG et al (2000, ISBN: 978-0-727-91375-3).
+    Chiang CL. (1968, ISBN: 978-0-882-75200-6).
+    Newell C. (1994, ISBN: 978-0-898-62451-9).
+    Eayres DP, Williams ES (2004) <doi:10.1136/jech.2003.009654>.
+    Silcocks PBS et al (2001) <doi:10.1136/jech.55.1.38>.
 Authors@R: c(person("Anderson", "Georgina", , "georgina.anderson@phe.gov.uk", c("aut", "cre")),
              person("Fox", "Sebastian", , "sebastian.fox@phe.gov.uk", c("ctb")),
              person("Francis", "Matthew", , "matthew.francis@phe.gov.uk", c("ctb")),

diff --git a/NAMESPACE b/NAMESPACE
@@ -2,6 +2,7 @@
 
 export(phe_dsr)
 export(phe_isr)
+export(phe_life_expectancy)
 export(phe_mean)
 export(phe_proportion)
 export(phe_quantile)

diff --git a/NEWS.md b/NEWS.md
@@ -1,4 +1,4 @@
-## PHEindicatormethods v1.0.9
+## PHEindicatormethods v1.1.0
 
 The following changes may affect backwards compatibility with earlier versions of the package:  
 
@@ -10,6 +10,8 @@ The following changes may affect backwards compatibility with earlier versions o
 
 The following changes will not affect backwards compatibility with earlier versions of the package:  
 
+* `phe_life_expectancy()` function added which allows users to calculate life expectancy at different ages based on population and death data
+
 * Added new phe_quantile function
 
 * Enabled phe_proportion and phe_rate functions to return aggregate data when grouped data is passed

diff --git a/R/LifeExpectancy.R b/R/LifeExpectancy.R
diff --git a/R/PHEindicatormethods.R b/R/PHEindicatormethods.R
@@ -4,6 +4,7 @@
 #' @docType package
 #' @name PHEindicatormethods
 NULL
+
 globalVariables(c('esp2013',
                   'exp_x',
                   'expected',
@@ -35,6 +36,14 @@ globalVariables(c('esp2013',
                   'quantile',
                   'naflag',
                   'highergeog_column',
-                  'qinverted'
-                  )
+                  'qinverted',
+                  "ei",
+                  "l_2b_removed",
+                  "Li_2b_removed",
+                  "p_2b_removed",
+                  "qi_2b_removed",
+                  "startage_2b_removed",
+                  "STi_2b_removed",
+                  "SeSE_2b_removed",
+                  "W_spi_2b_removed")
 )
diff --git a/man/byars_lower.Rd b/man/byars_lower.Rd
diff --git a/man/byars_upper.Rd b/man/byars_upper.Rd
diff --git a/man/phe_isr.Rd b/man/phe_isr.Rd
diff --git a/man/phe_life_expectancy.Rd b/man/phe_life_expectancy.Rd
diff --git a/man/phe_mean.Rd b/man/phe_mean.Rd
diff --git a/man/phe_smr.Rd b/man/phe_smr.Rd
diff --git a/man/wilson_lower.Rd b/man/wilson_lower.Rd
diff --git a/man/wilson_upper.Rd b/man/wilson_upper.Rd