try handling nans differently for cran

ropensci · Jan 16, 2024 · 45c5613 · 45c5613
1 parent a8992f6
commit 45c5613
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 26 deletions.
diff --git a/CRAN-SUBMISSION b/CRAN-SUBMISSION
@@ -1,3 +1,3 @@
-Version: 0.1.2
-Date: 2024-01-15 23:45:43 UTC
-SHA: 6eb9df73e540241691d9c72aade9f9b046b45437
+Version: 0.1.3
+Date: 2024-01-16 04:06:31 UTC
+SHA: a8992f6f66a277109ee0e777113673438a08e27b
diff --git a/R/orsf_R6.R b/R/orsf_R6.R
@@ -2664,7 +2664,8 @@ ObliqueForest <- R6::R6Class(
 
     for(j in seq_along(pd_vals[[i]])){
 
-     nans <- which(is.nan(pd_vals[[i]][[j]]))
+     # nans <- which(is.nan(pd_vals[[i]][[j]]))
+     nans <- which(pd_vals[[i]][[j]]==0)
 
      if(!is_empty(nans)){
       pd_vals[[i]][[j]][nans] <- NA_real_

diff --git a/man/orsf.Rd b/man/orsf.Rd
diff --git a/src/Forest.cpp b/src/Forest.cpp
@@ -540,10 +540,10 @@ std::vector<std::vector<arma::mat>> Forest::compute_dependence(bool oobag){
    thread.join();
   }
 
-  // uvec oobag_zeros = find(oobag_denom == 0);
-  // if(oobag_zeros.size() > 0){
-  //  oobag_denom(oobag_zeros).fill(1.0);
-  // }
+  uvec oobag_zeros = find(oobag_denom == 0);
+  if(oobag_zeros.size() > 0){
+   oobag_denom(oobag_zeros).fill(1.0);
+  }
 
   threads.clear();