From 29ae5c3754325afe88252fb8364ffd244fe86220 Mon Sep 17 00:00:00 2001
From: Kucharssim <kucharssim@gmail.com>
Date: Fri, 29 Sep 2023 11:46:52 +0200
Subject: [PATCH] use jaspBase to load dataset

---
 DESCRIPTION |  5 ++++-
 R/rbridge.R | 29 +----------------------------
 R/run.R     |  3 ++-
 3 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/DESCRIPTION b/DESCRIPTION
index 7a1fa28..7b56843 100644
--- a/DESCRIPTION
+++ b/DESCRIPTION
@@ -19,6 +19,9 @@ Imports:
   stringi,
   stringr,
   testthat (>= 3.0.3),
-  vdiffr (>= 1.0.2)
+  vdiffr (>= 1.0.2),
+  jaspBase
+Remotes:
+  jasp-stats/jaspBase
 RoxygenNote: 7.2.3
 Roxygen: list(markdown = TRUE)
diff --git a/R/rbridge.R b/R/rbridge.R
index 68f0506..0969964 100644
--- a/R/rbridge.R
+++ b/R/rbridge.R
@@ -15,8 +15,7 @@
   env[[".setColumnDataAsNominalText"]] <- function(...) return(TRUE)
 
   env[[".allColumnNamesDataset"]]      <- function(...) {
-    dataset <- .getInternal("dataset")
-    dataset <- loadCorrectDataset(dataset)
+    dataset <- jaspBase::getDataSet(dataset)
     return(colnames(dataset))
   }
 }
@@ -26,32 +25,6 @@
 
 .baseCitation <- "x"
 
-.readDatasetToEndNative <- function(columns = c(), columns.as.numeric = c(), columns.as.ordinal = c(),
-                                    columns.as.factor = c(), all.columns = FALSE) {
-
-  dataset <- .getInternal("dataset")
-  dataset <- loadCorrectDataset(dataset)
-
-  if (all.columns) {
-    columns <- colnames(dataset)
-    columns <- columns[columns != ""]
-  }
-  dataset <- jaspBase:::.vdf(dataset, columns, columns.as.numeric, columns.as.ordinal,
-                        columns.as.factor, all.columns, exclude.na.listwise = c())
-
-  return(dataset)
-}
-
-.readDataSetHeaderNative <- function(columns = c(), columns.as.numeric = c(), columns.as.ordinal = c(),
-                                     columns.as.factor = c(), all.columns = FALSE) {
-
-  dataset <- .readDatasetToEndNative(columns, columns.as.numeric, columns.as.ordinal,
-                                     columns.as.factor, all.columns)
-  dataset <- dataset[0, , drop = FALSE]
-
-  return(dataset)
-}
-
 .requestTempFileNameNative <- function(...) {
   root <- getTempOutputLocation("html")
   numPlots <- length(list.files(file.path(root, "plots")))
diff --git a/R/run.R b/R/run.R
index bfbdaa8..a2ec7a7 100644
--- a/R/run.R
+++ b/R/run.R
@@ -139,7 +139,8 @@ initAnalysisRuntime <- function(dataset, makeTests, ...) {
   reinstallChangedModules()
 
   # dataset to be found in the analysis when it needs to be read
-  .setInternal("dataset", dataset)
+  dataset <- loadCorrectDataset(dataset)
+  jaspBase::setDataSet(dataset)
 
   # prevent the results from being translated (unless the user explicitly wants to)
   Sys.setenv(LANG = getPkgOption("language"))