merge with develop

OHDSI · Jan 13, 2025 · 6a106df · 6a106df
2 parents 9d10867 + d650c63
commit 6a106df
Show file tree

Hide file tree

Showing 143 changed files with 10,785 additions and 10,761 deletions.
diff --git a/.Rbuildignore b/.Rbuildignore
@@ -2,6 +2,7 @@
 ^renv\.lock$
 ^.*\.Rproj$
 ^\.Rproj\.user$
+^.vscode$
 standalone
 deploy.sh
 extras/*
@@ -11,5 +12,6 @@ compare_versions
 docs/*
 _pkgdown.yml
 ^vignettes/articles$
+^vignettes/Videos.Rmd
 ^doc$
 ^Meta$
diff --git a/.cproject b/.cproject
diff --git a/.gitignore b/.gitignore
@@ -25,3 +25,5 @@ standalone/build/*
 /inst/shiny/DiagnosticsExplorer/rsconnect/*
 /doc/
 /Meta/
+.project
+.cproject
diff --git a/.project b/.project
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -30,49 +30,51 @@ Imports:
     digest,
     dplyr,
     FeatureExtraction (>= 3.0.0),
-    ggplot2,
-    gridExtra,
     Matrix,
     memuse,
-    mgcv,
     ParallelLogger (>= 2.0.0),
-    polspline,
     pROC,
     PRROC,
-    reticulate (>= 1.30),
     rlang,
     SqlRender (>= 1.1.3),
-    survival,
     tidyr,
     utils
 Suggests:
+<<<<<<< HEAD
     AUC,
     BigKnn (>= 1.0.0),
     devtools,
     Eunomia,
     glmnet,
+||||||| fbea7558
+    AUC,
+    BigKnn (>= 1.0.0),
+    devtools,
+    Eunomia,
+=======
+    Eunomia (>= 2.0.0),
+    ggplot2,
+    gridExtra,
+>>>>>>> develop
     IterativeHardThresholding,
     knitr,
-    markdown,
     Metrics,
+    mgcv,
     parallel,
-    plyr, 
-    pool,
+    polspline,
     readr,
     ResourceSelection,
     ResultModelManager (>= 0.2.0),
+    reticulate (>= 1.30),
     rmarkdown,
     RSQLite,
     scoring,
-    ShinyAppBuilder (>= 1.1.1),
+    OhdsiShinyAppBuilder (>= 1.0.0),
+    survival,
     survminer,
     testthat,
     withr,
     xgboost (> 1.3.2.1),
     lightgbm
-Remotes:
-    ohdsi/BigKnn,
-    ohdsi/ShinyAppBuilder,
-    ohdsi/ResultModelManager
 RoxygenNote: 7.3.2
 Encoding: UTF-8
diff --git a/NAMESPACE b/NAMESPACE
@@ -106,7 +106,6 @@ export(setCoxModel)
 export(setDecisionTree)
 export(setGradientBoostingMachine)
 export(setIterativeHardThresholding)
-export(setKNN)
 export(setLassoLogisticRegression)
 export(setLightGBM)
 export(setMLP)

diff --git a/PatientLevelPrediction.Rproj b/PatientLevelPrediction.Rproj
@@ -1,5 +1,5 @@
 Version: 1.0
-ProjectId: f1419f5b-979f-42d1-87c4-ad27abce8d80
+ProjectId: 6acb9f49-7428-4e24-8a2a-6b10f35b95e2
 
 RestoreWorkspace: No
 SaveWorkspace: No