diff --git a/DESCRIPTION b/DESCRIPTION index 15d977b..6d24709 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -13,10 +13,16 @@ LazyData: true URL: http://github.com/ekothe/nzbabynames BugReports: https://github.com/ekothe/nzbabynames/issues Roxygen: list(markdown = TRUE) -RoxygenNote: 6.1.0 +RoxygenNote: 7.1.2 Suggests: knitr, - rmarkdown + rmarkdown, + dplyr, + gganimate, + ggplot2, + lubridate, + matrixStats, + stringr VignetteBuilder: knitr Depends: R (>= 2.10) diff --git a/R/data.R b/R/data.R index bb4fb19..615b890 100644 --- a/R/data.R +++ b/R/data.R @@ -38,7 +38,6 @@ #' \item{\code{sx}}{Proportion of age group x to x+5 surviving another 5 years} #' \item{\code{qx}}{Probabilty a person who reaches that age dies within the age interval} #' } - "life_tables" #' nzbirths diff --git a/man/life_tables.Rd b/man/life_tables.Rd index f879e5f..211ae31 100644 --- a/man/life_tables.Rd +++ b/man/life_tables.Rd @@ -4,7 +4,8 @@ \name{life_tables} \alias{life_tables} \title{life_tables} -\format{A data frame with nine variables: +\format{ +A data frame with nine variables: \describe{ \item{\code{yearofbirth}}{Year of birth} \item{\code{age}}{age in years} @@ -18,7 +19,8 @@ \item{\code{px}}{Probabilty a person who reaches that age lives for the age interval} \item{\code{sx}}{Proportion of age group x to x+5 surviving another 5 years} \item{\code{qx}}{Probabilty a person who reaches that age dies within the age interval} -}} +} +} \usage{ life_tables } diff --git a/man/maorinames.Rd b/man/maorinames.Rd index 73f4d3d..94a8d19 100644 --- a/man/maorinames.Rd +++ b/man/maorinames.Rd @@ -4,8 +4,10 @@ \name{maorinames} \alias{maorinames} \title{Maori names.} -\format{A data frame with 6 variables: \code{Name}, \code{Sex}, -\code{Source}, \code{Year}, \code{Born} and \code{Rank}} +\format{ +A data frame with 6 variables: \code{Name}, \code{Sex}, +\code{Source}, \code{Year}, \code{Born} and \code{Rank} +} \usage{ maorinames } diff --git a/man/nzbabynames.Rd b/man/nzbabynames.Rd index 9f492e8..b6a72fa 100644 --- a/man/nzbabynames.Rd +++ b/man/nzbabynames.Rd @@ -4,8 +4,10 @@ \name{nzbabynames} \alias{nzbabynames} \title{NZ Baby names.} -\format{A data frame with five variables: \code{Year}, \code{Sex}, -\code{Name}, \code{Count}.} +\format{ +A data frame with five variables: \code{Year}, \code{Sex}, +\code{Name}, \code{Count}. +} \usage{ nzbabynames } diff --git a/man/nzbirths.Rd b/man/nzbirths.Rd index d8df25f..0244792 100644 --- a/man/nzbirths.Rd +++ b/man/nzbirths.Rd @@ -4,12 +4,14 @@ \name{nzbirths} \alias{nzbirths} \title{nzbirths} -\format{A data frame: +\format{ +A data frame: \describe{ \item{Year}{Year} \item{Male}{Number of live births recorded as 'Male'} \item{Female}{Number of live births recorded as 'Female'} -\item{Total}{Total number of live births}}} +\item{Total}{Total number of live births}} +} \usage{ nzbirths } diff --git a/vignettes/guess_the_age.Rmd b/vignettes/guess_the_age.Rmd index be2ce25..f3421bf 100644 --- a/vignettes/guess_the_age.Rmd +++ b/vignettes/guess_the_age.Rmd @@ -6,7 +6,7 @@ output: rmarkdown::html_vignette: keep_md: yes vignette: > - %\VignetteIndexEntry{Vignette Title} + %\VignetteIndexEntry{How to Tell Someone's Age When All You Know Is Her Name} %\VignetteEngine{knitr::rmarkdown} %\VignetteEncoding{UTF-8} --- diff --git a/vignettes/popularity_over_time.Rmd b/vignettes/popularity_over_time.Rmd index ab2b350..b971c0b 100644 --- a/vignettes/popularity_over_time.Rmd +++ b/vignettes/popularity_over_time.Rmd @@ -4,7 +4,7 @@ author: "Emily Kothe" date: "`r Sys.Date()`" output: rmarkdown::html_vignette vignette: > - %\VignetteIndexEntry{Vignette Title} + %\VignetteIndexEntry{Top 10 Names} %\VignetteEngine{knitr::rmarkdown} %\VignetteEncoding{UTF-8} --- @@ -73,7 +73,7 @@ time <- ggplot(names_top_female, aes(x = Rank, y = Count, fill = Name)) + labs(title="{current_frame}") + transition_manual(Year) -animate(time, duration=120) +animate(time, duration=100) ``` ```{r} @@ -92,6 +92,6 @@ time <- ggplot(names_top_male, aes(x = Rank, y = Count, fill = Name)) + labs(title="{current_frame}") + transition_manual(Year) -animate(time, duration=120) +animate(time, duration=100) ```