Merge pull request #5 from FBartos/add-semi-parametric

Add semi parametric survival analysis (Cox proportional hazards)
jasp-stats · Oct 28, 2024 · 1945277 · 1945277
2 parents 72e8092 + 5793f9f
commit 1945277
Show file tree

Hide file tree

Showing 15 changed files with 2,205 additions and 1,134 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -1,3 +1,5 @@
+^renv$
+^renv\.lock$
 ^.*\.Rproj$
 ^\.Rproj\.user$
 ^\.travis\.yml$
diff --git a/.gitignore b/.gitignore
@@ -58,3 +58,5 @@ Thumbs.db
 # RStudio files
 .Rproj.user
 _processedLockFile.lock
+renv/activate.R
+.Rprofile
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -9,9 +9,10 @@ Maintainer: JASP Team <[email protected]>
 Description: Perform analyses of censored time to event data.
 License: GPL (>= 2)
 Encoding: UTF-8
+Depends:
+  survival
 Imports:
-  survival,
-  survminer,
+  ggsurvfit,
   jaspBase,
   jaspGraphs
 Suggests:

diff --git a/NAMESPACE b/NAMESPACE
@@ -1,4 +1,5 @@
 import(jaspBase)
+import(survival)
 export(NonParametricSurvivalAnalysis)
 export(SemiParametricSurvivalAnalysis)
 export(ParametricSurvivalAnalysis)