Merge pull request #4 from gmelloni/kkevin821-patch-final-version

Kkevin821 patch final version
gmelloni · Sep 25, 2023 · 488743d · 488743d
2 parents d2f9e87 + e1fe9c4
commit 488743d
Show file tree

Hide file tree

Showing 17 changed files with 965 additions and 414 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -6,3 +6,4 @@ figure*
 paper*
 .RData
 .Rhistory
+.DS_Store
diff --git a/.Rinstignore b/.Rinstignore
@@ -4,3 +4,4 @@ figure*
 paper*
 .RData
 .Rhistory
+.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,4 @@
 .Rhistory
 .RData
 .Ruserdata
+.DS_Store
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,8 +1,8 @@
 Package: interactionRCS
 Type: Package
 Title: Calculate Estimates in Models with Interaction
-Version: 0.1.0
-Date: 2022-02-25
+Version: 0.2.0
+Date: 2023-09-25
 Authors@R: 
     c(person(given = "Giorgio",
             family = "Melloni",
@@ -13,7 +13,12 @@ Authors@R:
             family = "Bellavia",
             role = c("aut"),
             email = "abellavia@bwh.harvard.edu",
-            comment = c(ORCID = "0000-0003-4988-4532")))
+            comment = c(ORCID = "0000-0003-4988-4532")),
+    person(given = "Hong",
+            family = "Xiong",
+            role = c("aut"),
+            email = "kevinxiong@g.ucla.edu",
+            comment = c(ORCID = "0000-0003-4402-7478")))	   
 Description: A tool to calculate and plot estimates from models 
     in which an interaction between the main predictor and a continuous covariate has been specified.
     Methods used in the package refer to Harrell Jr FE (2015, ISBN:9783319330396); 
@@ -23,24 +28,25 @@ Depends:
     R (>= 3.6)
 Imports:
     graphics,
-    grDevices,
     stats,
     utils,
-    methods,
-    parallel,
     survival,
     msm,
     rms,
     boot,
     pspline,
     pryr,
-    mlbench
+    stringr
 Suggests:
     knitr,
     rmarkdown,
-    dplyr
+    dplyr,
+    mlbench,
+    grDevices,
+    parallel,
+    methods
 VignetteBuilder: knitr
 Roxygen: list(markdown = TRUE)
-RoxygenNote: 7.1.1
+RoxygenNote: 7.2.3
 Encoding: UTF-8
 LazyData: true
diff --git a/NAMESPACE b/NAMESPACE
@@ -23,8 +23,12 @@ importFrom(rms,lrm)
 importFrom(rms,rcs)
 importFrom(stats,as.formula)
 importFrom(stats,coef)
+importFrom(stats,formula)
 importFrom(stats,glm)
 importFrom(stats,qnorm)
 importFrom(stats,sd)
 importFrom(stats,vcov)
+importFrom(stringr,str_detect)
+importFrom(stringr,str_match)
 importFrom(survival,coxph)
+importFrom(utils,tail)