a day of chasing the RNG bug

ropensci · Oct 3, 2023 · 0696ee1 · 0696ee1
1 parent 4b602a4
commit 0696ee1
Show file tree

Hide file tree

Showing 18 changed files with 177 additions and 139 deletions.
diff --git a/R/orsf.R b/R/orsf.R
@@ -725,10 +725,13 @@ orsf <- function(data,
  y_sort <- y[sorted, , drop = FALSE]
  w_sort <- weights[sorted]
 
- if(length(tree_seeds) == 1) set.seed(tree_seeds)
+ if(length(tree_seeds) == 1 && n_tree > 1){
+  set.seed(tree_seeds)
+  tree_seeds <- sample(x = n_tree*10, size = n_tree, replace = FALSE)
+ } else if(is.null(tree_seeds)){
+  tree_seeds <- sample(x = n_tree*10, size = n_tree, replace = FALSE)
+ }
 
- if(is.null(tree_seeds) || length(tree_seeds) == 1)
-  tree_seeds <- sample(x = n_tree*2, size = n_tree, replace = FALSE)
 
  vi_max_pvalue = 0.01
  tree_type_R = 3

diff --git a/man/orsf_control_custom.Rd b/man/orsf_control_custom.Rd
diff --git a/man/orsf_ice_oob.Rd b/man/orsf_ice_oob.Rd
diff --git a/man/orsf_pd_oob.Rd b/man/orsf_pd_oob.Rd
diff --git a/man/orsf_vi.Rd b/man/orsf_vi.Rd
diff --git a/man/predict.orsf_fit.Rd b/man/predict.orsf_fit.Rd
diff --git a/scratch.R b/scratch.R
@@ -5,9 +5,7 @@ library(survival)
 tictoc::tic()
 fit <- orsf(pbc_orsf,
             formula = time+status ~ . - id,
-            oobag_pred_type = 'none',
-            sample_with_replacement = FALSE,
-            sample_fraction = 2/3)
+            n_tree = 2)
 tictoc::toc()
 
 all(fit$data == pbc_orsf)

diff --git a/src/Forest.cpp b/src/Forest.cpp
@@ -335,8 +335,7 @@ void Forest::compute_oobag_vi() {
  progress = 0;
 
  if(n_thread == 1){
-  vec* vi_numer_ptr = &vi_numer;
-  compute_oobag_vi_single_thread(vi_numer_ptr);
+  compute_oobag_vi_single_thread(&vi_numer);
   return;
  }
 

diff --git a/src/Makevars b/src/Makevars
@@ -1,4 +1,3 @@
 CXX_STD = CXX17
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
-CXXFLAGS += -O3 -march=native -DNDEBUG
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
diff --git a/src/Makevars.win b/src/Makevars.win
@@ -1,4 +1,3 @@
 CXX_STD = CXX17
 PKG_CXXFLAGS = $(SHLIB_OPENMP_CXXFLAGS)
-CXXFLAGS += -O3 -march=native -DNDEBUG
 PKG_LIBS = $(SHLIB_OPENMP_CXXFLAGS) $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)