Update

jasp-stats · Oct 10, 2024 · b8caf47 · b8caf47
1 parent 0f7acdd
commit b8caf47
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 3 deletions.
diff --git a/R/auditClassicalBenfordsLaw.R b/R/auditClassicalBenfordsLaw.R
@@ -72,9 +72,6 @@ auditClassicalBenfordsLaw <- function(jaspResults, dataset, options, ...) {
 }
 
 .jfaBenfordsLawReadData <- function(dataset, options) {
-  if (!is.null(dataset)) {
-    return(dataset)
-  }
   values <- options[["values"]]
   if (values == "") {
     values <- NULL

diff --git a/R/auditClassicalModelFairness.R b/R/auditClassicalModelFairness.R
@@ -22,6 +22,9 @@ auditClassicalModelFairness <- function(jaspResults, dataset, options, ...) {
   # Create the procedure paragraph
   .jfaFairnessAddProcedure(options, jaspResults, position = 1)
 
+  # Read in the data
+  dataset <- .jfaFairnessReadData(dataset, options)
+
   # Ready for analysis
   ready <- (options[["protected"]] != "" && options[["target"]] != "" && options[["predictions"]] != "" && options[["privileged"]] != "" && options[["positive"]] != "")
 
@@ -118,6 +121,21 @@ auditClassicalModelFairness <- function(jaspResults, dataset, options, ...) {
   return(out)
 }
 
+.jfaFairnessReadData <- function(dataset, options) {
+  vars <- NULL
+  if (options[["target"]] != "") {
+    vars <- c(vars, options[["target"]])
+  }
+  if (options[["predictions"]] != "") {
+    vars <- c(vars, options[["predictions"]])
+  }
+  if (options[["protected"]] != "") {
+    vars <- c(vars, options[["protected"]])
+  }
+  dataset <- jaspBase::excludeNaListwise(dataset, vars)
+  return(dataset)
+}
+
 .jfaFairnessAddProcedure <- function(options, jaspResults, position) {
   if (options[["explanatoryText"]] && is.null(jaspResults[["procedureContainer"]])) {
     procedureContainer <- createJaspContainer(title = gettext("<u>Procedure</u>"))