Merge pull request #27 from bips-hb/stepsize

Allow stepsize in forge and expct if not running in parallel
bips-hb · May 28, 2024 · b8e66dc · b8e66dc
2 parents 4d9c6b0 + e7b879b
commit b8e66dc
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 24 deletions.
diff --git a/R/expct.R b/R/expct.R
@@ -95,27 +95,29 @@ expct <- function(
     step_no <- 1
   } else {
     evidence <- as.data.table(evidence)
-    if (ncol(evidence) == 2 && all(colnames(evidence) == c("f_idx", "wt"))) {
-      stepsize <- nrow(evidence)
-      step_no <- 1
-    } else if (parallel & evidence_row_mode == "separate") {
-      # For "separate", parallelize in forge (not in cforde)
-      if (stepsize == 0) {
+    if (stepsize == 0) {
+      if (parallel) {
         stepsize <- ceiling(nrow(evidence)/foreach::getDoParWorkers())
+      } else {
+        stepsize <- nrow(evidence)
       }
+    } else if (stepsize > nrow(evidence)) {
+      stepsize <- nrow(evidence)
+    }
+    if (ncol(evidence) == 2 && all(colnames(evidence) == c("f_idx", "wt"))) {
+      stepsize <- nrow(evidence)
+    } else if (evidence_row_mode == "separate") {
+      # For "separate", parallelize in expct (not in cforde)
       stepsize_cforde <- 0
       parallel_cforde = FALSE
-      step_no <- ceiling(nrow(evidence)/stepsize)
     } else {
-      # For "or", parallelize in cforde (not in forge)
-      if (stepsize == 0) {
-        stepsize <- nrow(evidence)
-      }
-      stepsize_cforde <- stepsize
+      # For "or", parallelize in cforde (not in expct)
       parallel_cforde <- parallel
+      stepsize_cforde <- stepsize
+      parallel <- FALSE
       stepsize <- nrow(evidence)
-      step_no <- 1
     }
+    step_no <- ceiling(nrow(evidence)/stepsize)
   } 
 
   # Check query

diff --git a/R/forge.R b/R/forge.R
@@ -114,27 +114,27 @@ forge <- function(
     step_no <- 1
   } else {
     evidence <- as.data.table(evidence)
+    if (stepsize == 0) {
+      if (parallel) {
+        stepsize <- ceiling(nrow(evidence)/foreach::getDoParWorkers())
+      } else {
+        stepsize <- nrow(evidence)
+      }
+    }
     if (ncol(evidence) == 2 && all(colnames(evidence) == c("f_idx", "wt"))) {
       stepsize <- nrow(evidence)
-      step_no <- 1
-    } else if (parallel & evidence_row_mode == "separate") {
+    } else if (evidence_row_mode == "separate") {
       # For "separate", parallelize in forge (not in cforde)
-      if (stepsize == 0) {
-        stepsize <- ceiling(nrow(evidence)/foreach::getDoParWorkers())
-      }
       stepsize_cforde <- 0
       parallel_cforde = FALSE
-      step_no <- ceiling(nrow(evidence)/stepsize)
     } else {
       # For "or", parallelize in cforde (not in forge)
-      if (stepsize == 0) {
-        stepsize <- nrow(evidence)
-      }
-      stepsize_cforde <- stepsize
       parallel_cforde <- parallel
+      stepsize_cforde <- stepsize
+      parallel <- FALSE
       stepsize <- nrow(evidence)
-      step_no <- 1
     }
+    step_no <- ceiling(nrow(evidence)/stepsize)
   } 
 
   # Run in parallel for each step