fix quosures and add tests (#87)

* fix quosures and add tests * fix checkout action
OHDSI · Sep 8, 2023 · 549e8a1 · 549e8a1
1 parent e484060
commit 549e8a1
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 11 deletions.
diff --git a/.github/workflows/R_CDM_check_hades.yaml b/.github/workflows/R_CDM_check_hades.yaml
@@ -45,7 +45,7 @@ jobs:
       CDM5_SQL_SERVER_USER: ${{ secrets.CDM5_SQL_SERVER_USER }}
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - uses: r-lib/actions/setup-r@v2
         with:

diff --git a/R/Estimator.R b/R/Estimator.R
@@ -64,8 +64,6 @@ setEstimator <- function(learningRate='auto',
   checkHigher(batchSize, 0)
   checkIsClass(epochs, c("numeric", "integer"))
   checkHigher(epochs, 0)
-  checkIsClass(device, c("character", "function"))
-  checkIsClass(scheduler, "list")
   checkIsClass(earlyStopping, c("list", "NULL"))
   checkIsClass(metric, c("character", "list"))
   checkIsClass(seed, c("numeric", "integer", "NULL"))

diff --git a/tests/testthat/test-Estimator.R b/tests/testthat/test-Estimator.R
@@ -55,8 +55,6 @@ test_that("Estimator detects wrong inputs", {
   testthat::expect_error(setEstimator(batchSize = "text"))
   testthat::expect_error(setEstimator(epochs = 0))
   testthat::expect_error(setEstimator(epochs = "test"))
-  testthat::expect_error(setEstimator(device = 1))
-  testthat::expect_error(setEstimator(scheduler = "notList"))
   testthat::expect_error(setEstimator(earlyStopping = "notListorNull"))
   testthat::expect_error(setEstimator(metric = 1))
   testthat::expect_error(setEstimator(seed = "32"))
@@ -357,9 +355,18 @@ test_that("device as a function argument works", {
 
   })
 
-# test_that("estimatorSettings can be saved and loaded with correct objects", {
-#   settings <- setEstimator()
-#   
-#   saveRDS(settings,file=file.path(testLoc, 'settings.RDS'))
-#   
-# })
+test_that("estimatorSettings can be saved and loaded with correct python objects", {
+  settings <- setEstimator()
+
+  saveRDS(settings,file=file.path(testLoc, 'settings.RDS'))
+
+  loadedSettings <- readRDS(file = file.path(testLoc, 'settings.RDS'))
+
+  optimizer <- loadedSettings$optimizer()
+  scheduler <- loadedSettings$scheduler()
+  criterion <- loadedSettings$criterion()
+
+  testthat::expect_false(reticulate::py_is_null_xptr(optimizer))
+  testthat::expect_false(reticulate::py_is_null_xptr(scheduler$fun))
+  testthat::expect_false(reticulate::py_is_null_xptr(criterion))
+})