Merge pull request #27 from PublicHealthEngland/Dev_SF

Minor minor changes
ukhsa-collaboration · Jul 26, 2019 · 39d52c1 · 39d52c1
2 parents ca92cb3 + a4ed61c
commit 39d52c1
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,6 +1,6 @@
 Package: PHEindicatormethods
 Type: Package
-Version: 1.1.3
+Version: 1.1.3.9000
 Title: Common Public Health Statistics and their Confidence Intervals 
 Description: Functions to calculate commonly used public health statistics and 
     their confidence intervals using methods approved for use in the production  

diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+## PHEindicatormethods v1.1.3.9000
+
+
+
 ## PHEindicatormethods v1.1.3
 
 Minor amendments to package testing scripts to work on platforms using clang as compiler.  

diff --git a/R/LifeExpectancy.R b/R/LifeExpectancy.R
@@ -137,9 +137,6 @@ phe_life_expectancy <- function(data, deaths, population, startage,
     stop("function life_expectancy requires at least 4 arguments: data, deaths, population, startage")
   }
 
-  # check for 20 age bands
-  #if (length(age_contents) != 20) stop("this function requires 20 age bands to work (0, 1-4, 5-9, 10-14, ..., 85-89, 90+)")
-
   # check that min age  is 0
   stripped_age_contents <- as.integer(sub("\\D*(\\d+).*", "\\1", age_contents))
   if (stripped_age_contents[1] != 0) stop("first age band in age_contents must be 0")

diff --git a/vignettes/Introduction_to_PHEindicatormethods.Rmd b/vignettes/Introduction_to_PHEindicatormethods.Rmd
@@ -1,5 +1,5 @@
 ---
-title: "Introduction_to_PHEindicatormethods"
+title: "Introduction to PHEindicatormethods"
 author: "Georgina Anderson"
 date: "`r Sys.Date()`"
 output: