update ready for next stage of edits

STAPM · Apr 24, 2020 · 1f23a2c · 1f23a2c
1 parent 9e61037
commit 1f23a2c
Show file tree

Hide file tree

Showing 45 changed files with 6,489 additions and 5,957 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,2 +1,2 @@
-^.*\.Rproj$
-^\.Rproj\.user$
+^.*\.Rproj$
+^\.Rproj\.user$
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,9 @@
 .Rhistory
 .RData
 .Ruserdata
+inst/doc
+.Rproj.user
+*.zip
+Archive/
+*.Rproj*
+dev/
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,26 +1,26 @@
-Package: tobalcepi
-Type: Package
-Title: Risk functions and attributable fractions for tobacco and alcohol
-Version: 0.1.0
-Author: Duncan Gillespie
-Maintainer: Duncan Gillespie <[email protected]>
-Description: Functions to assign relative risks of disease to individuals based on their tobacco and/or alcohol consumption, and to estimate the attributable fractions of disease.
-License: For internal University of Sheffield use only
-Encoding: UTF-8
-LazyData: true
-Suggests: 
-    knitr,
-    rmarkdown,
-    roxygen2,
-    usethis
-Depends: 
-    data.table
-Imports: 
-    boot,
-    VGAM,
-    stringr,
-    readxl,
-    testthat,
-    dplyr
-VignetteBuilder: knitr
-RoxygenNote: 6.1.1
+Package: tobalcepi
+Type: Package
+Title: Risk functions and attributable fractions for tobacco and alcohol
+Version: 0.1.0
+Author: Duncan Gillespie
+Maintainer: Duncan Gillespie <[email protected]>
+Description: Functions to assign relative risks of disease to individuals based on their tobacco and/or alcohol consumption, and to estimate the attributable fractions of disease.
+License: For internal University of Sheffield use only
+Encoding: UTF-8
+LazyData: true
+Suggests: 
+    knitr,
+    rmarkdown,
+    roxygen2,
+    usethis
+Depends: 
+    data.table
+Imports: 
+    boot,
+    VGAM,
+    stringr,
+    readxl,
+    testthat,
+    dplyr
+VignetteBuilder: knitr
+RoxygenNote: 6.1.1
diff --git a/NAMESPACE b/NAMESPACE
@@ -1,12 +1,12 @@
-# Generated by roxygen2: do not edit by hand
-
-export(AlcBinge)
-export(AlcLags)
-export(ExpandCodes)
-export(PArisk)
-export(RRFunc)
-export(RRalc)
-export(RRtob)
-export(TobAlcInt)
-export(TobLags)
-export(subgroupRisk)
+# Generated by roxygen2: do not edit by hand
+
+export(AlcBinge)
+export(AlcLags)
+export(ExpandCodes)
+export(PArisk)
+export(RRFunc)
+export(RRalc)
+export(RRtob)
+export(TobAlcInt)
+export(TobLags)
+export(subgroupRisk)