nice legend for graphs

.Rbuildignore

@@ -0,0 +1,11 @@
+^cran-comments\.md$
+^.*\.Rproj$
+^\.Rproj\.user$
+^revdep$
+^\.github$
+^LICENSE\.md$
+README.Rmd
+rstudio
+Makefile
+^pkgdown$
+_pkgdown.yml

.github/.gitignore

@@ -0,0 +1 @@
+*.html

.github/workflows/R-CMD-check.yaml

@@ -0,0 +1,49 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+
+name: R-CMD-check
+
+jobs:
+  R-CMD-check:
+    runs-on: ${{ matrix.config.os }}
+
+    name: ${{ matrix.config.os }} (${{ matrix.config.r }})
+
+    strategy:
+      fail-fast: false
+      matrix:
+        config:
+          - {os: macos-latest,   r: 'release'}
+          - {os: windows-latest, r: 'release'}
+          - {os: ubuntu-latest,   r: 'devel', http-user-agent: 'release'}
+          - {os: ubuntu-latest,   r: 'release'}
+          - {os: ubuntu-latest,   r: 'oldrel-1'}
+
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+      R_KEEP_PKG_SOURCE: yes
+
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          r-version: ${{ matrix.config.r }}
+          http-user-agent: ${{ matrix.config.http-user-agent }}
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::rcmdcheck
+          needs: check
+
+      - uses: r-lib/actions/check-r-package@v2
+        with:
+          upload-snapshots: true

.github/workflows/pkgdown.yaml

@@ -0,0 +1,48 @@
+# Workflow derived from https://github.com/r-lib/actions/tree/v2/examples
+# Need help debugging build failures? Start at https://github.com/r-lib/actions#where-to-find-help
+on:
+  push:
+    branches: [main, master]
+  pull_request:
+    branches: [main, master]
+  release:
+    types: [published]
+  workflow_dispatch:
+
+name: pkgdown
+
+jobs:
+  pkgdown:
+    runs-on: ubuntu-latest
+    # Only restrict concurrency for non-PR jobs
+    concurrency:
+      group: pkgdown-${{ github.event_name != 'pull_request' || github.run_id }}
+    env:
+      GITHUB_PAT: ${{ secrets.GITHUB_TOKEN }}
+    permissions:
+      contents: write
+    steps:
+      - uses: actions/checkout@v3
+
+      - uses: r-lib/actions/setup-pandoc@v2
+
+      - uses: r-lib/actions/setup-r@v2
+        with:
+          use-public-rspm: true
+
+      - uses: r-lib/actions/setup-r-dependencies@v2
+        with:
+          extra-packages: any::pkgdown, local::.
+          needs: website
+
+      - name: Build site
+        run: pkgdown::build_site_github_pages(new_process = FALSE, install = FALSE)
+        shell: Rscript {0}
+
+      - name: Deploy to GitHub pages 🚀
+        if: github.event_name != 'pull_request'
+        uses: JamesIves/[email protected]
+        with:
+          clean: false
+          branch: gh-pages
+          folder: docs

.gitignore

@@ -1,5 +1,4 @@
 .Rproj.user
 .Rhistory
 .RData
-.Rbuildignore
-demography.Rproj
+revdep

DESCRIPTION

@@ -1,15 +1,24 @@
 Package: demography
-Version: 1.17
-Title: Forecasting mortality, fertility, migration and population data
+Version: 2.0.0.9000
+Title: Forecasting Mortality, Fertility, Migration and Population Data
 Description: Functions for demographic analysis including lifetable
         calculations; Lee-Carter modelling; functional data analysis of
         mortality rates, fertility rates, net migration numbers; and
         stochastic population forecasting.
-Depends: R (>= 2.15.2), forecast (>= 3.09), rainbow, ftsa, cobs
-Imports: mgcv, strucchange, RCurl
+Depends: R (>= 3.4), forecast (>= 8.5)
+Imports: ftsa (>= 4.8), rainbow, cobs, mgcv, strucchange, HMDHFDplus (>= 2.0.3)
 LazyData: yes
 ByteCompile: TRUE
-Author: Rob J Hyndman with contributions from Heather Booth, Leonie Tickle and John Maindonald.
-Maintainer: Rob J Hyndman <[email protected]>
-License: GPL (>= 2)
-URL: http://robjhyndman.com/software/demography/
+Authors@R: c(
+  person("Rob", "Hyndman", email = "[email protected]", role = c("aut", "cre", "cph"), comment = c(ORCID = "0000-0002-2140-5352")),
+  person("Heather", "Booth", role = "ctb", comment = c(ORCID = "0000-0002-8356-0534")),
+  person("Leonie", "Tickle", role = "ctb", comment = c(ORCID = "0000-0002-6612-2401")),
+  person("John", "Maindonald", role = "ctb"),
+  person("Simon", "Wood", role = "ctb"),
+  person("R Core Team", role = "ctb")
+  )
+URL: https://pkg.robjhyndman.com/demography/, https://github.com/robjhyndman/demography
+BugReports: https://github.com/robjhyndman/demography/issues
+License: GPL (>= 3)
+Encoding: UTF-8
+RoxygenNote: 7.3.2

Makefile

@@ -0,0 +1,36 @@
+# Makefile for generating R packages.
+# 2017 Rob J Hyndman
+#
+# Assumes Makefile is in top folder of package
+
+PKG_NAME=$(shell grep -i ^package DESCRIPTION | cut -d : -d \  -f 2)
+
+default: build
+
+check:
+	Rscript -e "rcmdcheck::rcmdcheck()"
+
+build:
+	-rm -f rstudio
+	-Rscript -e "devtools::build(args = c('--compact-vignettes=both'))"
+
+install:
+	R CMD INSTALL .
+
+clean:
+	-rm -f ../$(PKG_NAME)_*.tar.gz
+	-rm -r -f man/*.Rd
+	-rm -r -f NAMESPACE
+
+docs:
+	Rscript -e "roxygen2::roxygenize()"
+
+pkgdown:
+	Rscript -e "pkgdown::build_site()"
+
+revdep:
+	Rscript -e "revdepcheck::revdep_check(num_workers=3)"
+
+release:
+	-rm -f rstudio
+	-Rscript -e "devtools::submit_cran(args = c('--compact-vignettes=both'))"

NAMESPACE

@@ -1,54 +1,100 @@
-export(bms, cm.spline, cm.splinefun, coherentfdm, combine.demogdata,
-compare.demogdata, demogdata, extract.ages, extract.years, fdm,
-fitted.fdm, fitted.lca, forecast.fdm, forecast.lca, forecast.fdmpr,
-isfe, isfe.demogdata, lca, hmd.mx,hmd.e0,hmd.pop,
-life.expectancy, lifetable, mean.demogdata,
-median.demogdata, netmigration, plot.demogdata, plot.errorfdm,
-plot.lifetable, read.demogdata,flife.expectancy,
-residuals.fdm, residuals.lca, set.upperage, 
-smooth.demogdata, tfr, simulate.fmforecast, simulate.fmforecast2, pop.sim, e0, sex.ratio,models,
-models.fmforecast,models.fmforecast2,update.fmforecast,update.fmforecast2)
-
-S3method(fitted,fdm)
-S3method(fitted,lca)
-S3method(lines,lifetable)
-S3method(lines,demogdata)
-S3method(mean,demogdata)
-S3method(median,demogdata)
-S3method(plot,fmforecast)
-S3method(plot,lca)
-S3method(plot,lifetable)
-S3method(plot,demogdata)
-S3method(plot,errorfdm)
-S3method(points,demogdata)
-S3method(print,errorfdm)
-S3method(print,fmforecast)
-S3method(print,fdm)
-S3method(print,lca)
-S3method(print,lifetable)
-S3method(print,demogdata)
-S3method(residuals,fdm)
-S3method(residuals,lca)
-S3method(summary,fdm)
-S3method(summary,lca)
-S3method(forecast,fdm)
-S3method(forecast,lca)
-S3method(isfe,demogdata)
-S3method(simulate,fmforecast)
-S3method(simulate,fmforecast2)
-S3method(summary,demogdata)
-S3method(summary,fmforecast)
-S3method(summary,fmforecast2)
-S3method(summary,fdmpr)
-S3method(models,fmforecast)
-S3method(models,fmforecast2)
-S3method(update,fmforecast)
-S3method(update,fmforecast2)
-
-import(forecast)
-import(ftsa)
-import(rainbow)
-importFrom("stats", "simulate")
-importFrom("stats", "update")
-import(mgcv)
-import(cobs)
+# Generated by roxygen2: do not edit by hand
+
+S3method(as.data.frame,demogdata)
+S3method(as.data.frame,lifetable)
+S3method(fitted,fdm)
+S3method(fitted,lca)
+S3method(forecast,fdm)
+S3method(forecast,fdmpr)
+S3method(forecast,lca)
+S3method(isfe,demogdata)
+S3method(lines,demogdata)
+S3method(lines,lifetable)
+S3method(mean,demogdata)
+S3method(median,demogdata)
+S3method(models,fmforecast)
+S3method(models,fmforecast2)
+S3method(plot,demogdata)
+S3method(plot,errorfdm)
+S3method(plot,fmforecast)
+S3method(plot,lca)
+S3method(plot,lifetable)
+S3method(points,demogdata)
+S3method(print,demogdata)
+S3method(print,errorfdm)
+S3method(print,fdm)
+S3method(print,fmforecast)
+S3method(print,lca)
+S3method(print,lifetable)
+S3method(residuals,fdm)
+S3method(residuals,lca)
+S3method(simulate,fmforecast)
+S3method(simulate,fmforecast2)
+S3method(summary,demogdata)
+S3method(summary,fdm)
+S3method(summary,fdmpr)
+S3method(summary,fmforecast)
+S3method(summary,fmforecast2)
+S3method(summary,lca)
+S3method(update,fmforecast)
+S3method(update,fmforecast2)
+export(bms)
+export(cm.spline)
+export(cm.splinefun)
+export(coherentfdm)
+export(combine.demogdata)
+export(compare.demogdata)
+export(demogdata)
+export(e0)
+export(extract.ages)
+export(extract.years)
+export(fdm)
+export(flife.expectancy)
+export(hmd.e0)
+export(hmd.mx)
+export(hmd.pop)
+export(isfe)
+export(lca)
+export(life.expectancy)
+export(lifetable)
+export(models)
+export(netmigration)
+export(pop.sim)
+export(read.demogdata)
+export(set.upperage)
+export(sex.ratio)
+export(smooth.demogdata)
+export(tfr)
+import(cobs)
+import(forecast)
+import(ftsa)
+import(mgcv)
+import(rainbow)
+importFrom(graphics,abline)
+importFrom(graphics,lines)
+importFrom(graphics,plot)
+importFrom(stats,"tsp<-")
+importFrom(stats,approx)
+importFrom(stats,frequency)
+importFrom(stats,glm)
+importFrom(stats,lm)
+importFrom(stats,loess)
+importFrom(stats,median)
+importFrom(stats,na.omit)
+importFrom(stats,nlm)
+importFrom(stats,poisson)
+importFrom(stats,predict)
+importFrom(stats,qnorm)
+importFrom(stats,rbinom)
+importFrom(stats,rpois)
+importFrom(stats,simulate)
+importFrom(stats,spline)
+importFrom(stats,splinefun)
+importFrom(stats,start)
+importFrom(stats,time)
+importFrom(stats,ts)
+importFrom(stats,tsp)
+importFrom(stats,uniroot)
+importFrom(stats,update)
+importFrom(stats,window)
+importFrom(utils,read.table)