correctness tests more forgiving

ropensci · Oct 7, 2023 · 5bb7376 · 5bb7376
1 parent e0b4ff8
commit 5bb7376
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,8 @@
 # aorsf 0.1.0 (unreleased)
 
-* Re-worked `aorsf`'s C++, code following the design of `ranger`, to set it up for classification and regression trees.
+* Re-worked internal C++ routines following the design of `ranger`. 
+
+* re-worked how progress is printed to console when `verbose_progress` is `TRUE`, following the design of `ranger`. Messages now indicate the action being taken, the % complete, and the approximate time until finishing the action. 
 
 * Allowed multi-threading to be performed in `orsf()`, `predict.orsf_fit()`, and functions in the `orsf_vi()` and `orsf_pd()` family.
 

diff --git a/tests/testthat/test-compute_cstat.R b/tests/testthat/test-compute_cstat.R
@@ -3,7 +3,6 @@ test_that(
  desc = 'C-statistic is close to survival::concordance',
  code = {
 
-  library(survival)
   y_mat <- as.matrix(pbc_orsf[, c('time', 'status')])
 
   sorted <-
@@ -13,8 +12,6 @@ test_that(
 
   x_vars <- c("bili", "chol", "trig")
 
-  set.seed(329)
-
   n_runs <- 100
 
   diffs_vec <- diffs_uvec<- diffs_vec_wtd <- diffs_uvec_wtd <-

diff --git a/tests/testthat/test-orsf_vi.R b/tests/testthat/test-orsf_vi.R
@@ -1,10 +1,6 @@
 
-tree_seeds <- 329
-
 pbc_vi <- pbc_orsf
 
-set.seed(tree_seeds)
-
 pbc_vi$junk <- rnorm(nrow(pbc_orsf))
 
 pbc_vi$junk_cat <- factor(
@@ -34,7 +30,7 @@ test_that(
                         importance = importance,
                         n_tree = 75,
                         group_factors = group_factors,
-                        tree_seeds = tree_seeds)
+                        tree_seeds = seeds_standard)
 
 
     vi_during_fit <- orsf_vi(fit_with_vi,
@@ -56,7 +52,7 @@ test_that(
                        importance = 'none',
                        n_tree = 75,
                        group_factors = group_factors,
-                       tree_seeds = tree_seeds)
+                       tree_seeds = seeds_standard)
 
      expect_error(orsf_vi(fit_no_vi), regexp = 'no variable importance')
 
@@ -72,7 +68,7 @@ test_that(
                               n_tree = 75,
                               oobag_fun = oobag_c_risk,
                               group_factors = group_factors,
-                              tree_seeds = tree_seeds)
+                              tree_seeds = seeds_standard)
 
      vi_custom_oobag <- orsf_vi(fit_custom_oobag,
                                 group_factors = group_factors)
@@ -89,7 +85,7 @@ test_that(
                         n_tree = 75,
                         n_thread = 0,
                         group_factors = group_factors,
-                        tree_seeds = tree_seeds)
+                        tree_seeds = seeds_standard)
 
     vi_threads <- orsf_vi(fit_threads,
                           group_factors = group_factors)
@@ -98,9 +94,9 @@ test_that(
 
     good_vars <- c('bili',
                    'protime',
-                   if(group_factors) 'edema' else c("edema_1", "edema_0.5"))
+                   if(group_factors) 'edema' else c("edema_1"))
 
-    bad_vars <- setdiff(names(vi_during_fit), good_vars)
+    bad_vars <- setdiff(names(vi_during_fit), c(good_vars, "edema_0.5"))
 
     vi_good_vars <- vi_during_fit[good_vars]
     vi_bad_vars <- vi_during_fit[bad_vars]