finish manual riskset option

Author: juliuspfadt

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: jaspRem
 Type: Package
 Title: REM
-Version: 0.19
+Version: 0.19.0
 Date: 2024-06-05
 Author: JASP Team
 Website: jasp-stats.org

R/relationalEventModeling.R

@@ -166,42 +166,29 @@ relationalEventModeling <- function(jaspResults, dataset, options) {
 
 .remUploadDyadExcludeData <- function(jaspResults, options) {
 
-  dyadExcludePaths <- sapply(options[["dyadExcludeList"]], function(x) x[["dyadExclude"]])
+  if (!is.null(jaspResults[["dyadExcludeState"]]$object) || options[["riskset"]] != "manual" ||
+      is.null(options[["dyadExclude"]])) return()
 
-  if (all(dyadExcludePaths == "")) return()
+  if (options[["dyadExclude"]] == "") return()
 
-  if (!is.null(jaspResults[["dyadExcludeState"]]$object) || options[["riskset"]] != "custom") return()
+  bsName <- basename(options[["dyadExclude"]])
+  attrName <- gsub("\\..*","", bsName)
+  ending <- sub(".*(\\..*)", "\\1", bsName)
 
-  dyadOut <- list()
-  for (i in 1:length(dyadExcludePaths)) {
-
-    if (dyadExcludePaths[i] != "") {
-
-      bsName <- basename(options[["dyadExcludeList"]][[i]][["dyadExclude"]])
-      attrName <- gsub("\\..*","", bsName)
-      ending <- sub(".*(\\..*)", "\\1", bsName)
-
-      if (ending == ".csv") {
-        dyadDt <- read.csv(options[["dyadExcludeList"]][[i]][["dyadExclude"]], row.names = NULL, check.names = FALSE)
-      } else if (ending == ".txt") {
-        dyadDt <- read.delim(options[["dyadExcludeList"]][[i]][["dyadExclude"]], row.names = NULL, check.names = FALSE)
-      }
-
-      dyadDt$type <- NA
-      # # this is only necessary for the wide format...
-      # if (ncol(dyadDt) == nrow(dyadDt)) {
-      #   rownames(dyadDt) <- colnames(dyadDt)
-      # }
-
-      dyadOut[[attrName]] <- dyadDt
+  if (ending == ".csv") {
+    dyadDt <- read.csv(options[["dyadExclude"]], row.names = NULL, check.names = FALSE)
+  } else if (ending == ".txt") {
+    dyadDt <- read.delim(options[["dyadExclude"]], row.names = NULL, check.names = FALSE)
+  }
 
-    } else {
-      dyadOut[[i]] <- NULL
-    }
+  cnames <- colnames(dyadDt)
+  if (!all(c("actor1", "actor2") %in% cnames)) {
+    .quitAnalysis(gettext("The columns in the dyad exclude data file should be named 'actor1' and 'actor2'"))
   }
 
-  dyadExcludeState <- createJaspState(dyadOut)
-  dyadExcludeState$dependOn("dyadExcludeList")
+  dyadDt <- dyadDt[, c("actor1", "actor2")]
+  dyadExcludeState <- createJaspState(dyadDt)
+  dyadExcludeState$dependOn(c("riskset", "dyadExclude"))
   jaspResults[["dyadExcludeState"]] <- dyadExcludeState
 
   return()
@@ -573,11 +560,11 @@ relationalEventModeling <- function(jaspResults, dataset, options) {
   }
 
   if (!is.null(jaspResults[["dyadExcludeState"]][["object"]])) {
-    dtExcludeList <- jaspResults[["dyadExcludeState"]][["object"]]
-    omitDyad <- list()
-    for (i in 1:length(dtExcludeList)) {
-      omitDyad <- append(omitDyad, list(time = c(NA,NA), dyad = dtExcludeList[[i]]))
-    }
+    dtExclude <- jaspResults[["dyadExcludeState"]][["object"]]
+    dtExclude <- lapply(dtExclude, as.character)
+    dtExclude$type <- NA
+
+    omitDyad <- list(list(time = c(NA,NA), dyad = dtExclude))
   } else {
     omitDyad <- NULL
   }

inst/qml/RelationalEventModeling.qml

@@ -182,27 +182,19 @@ Form
 			{
 				value: "manual"
 				label: qsTr("Manual")
-				ComponentsList
+			
+				Label {	text:	qsTr("Upload dyads to exclude:"); visible: riskset.value == "manual" }
+
+				FileSelector
 				{
-					visible: riskset.value == "manual"
-					name: "dyadExcludeList"
-					title: qsTr("Upload dyads to exclude from the riskset")
-					implicitHeight: 90 * preferencesModel.uiScale // about 3 rows
-					minimumItems: 1
-					rowComponent: 
-					RowLayout
-					{
-						FileSelector
-						{
-							id:										dyadExclude
-							name:									"dyadExclude"
-							label:								""
-							placeholderText:			qsTr("e.g., home/Data/dyadExclude.csv")
-							filter:								"*.csv *.txt"
-							save:									false
-							fieldWidth:						180 * preferencesModel.uiScale
-						}
-					}
+					id:										dyadExclude
+					visible: 							riskset.value == "manual"
+					name:									"dyadExclude"
+					label: 								""
+					placeholderText:			qsTr("e.g., home/Data/dyadExclude.csv")
+					filter:								"*.csv *.txt"
+					save:									false
+					fieldWidth:						180 * preferencesModel.uiScale
 				}
 			}
 

renv.lock

@@ -1096,12 +1096,10 @@
       "Package": "jaspBase",
       "Version": "0.19.0",
       "Source": "GitHub",
-      "Remotes": "jasp-stats/jaspGraphs",
       "RemoteType": "github",
       "RemoteHost": "api.github.com",
-      "RemoteRepo": "jaspBase",
       "RemoteUsername": "jasp-stats",
-      "RemoteRef": "HEAD",
+      "RemoteRepo": "jaspBase",
       "RemoteSha": "7de02c442478e028fe2036e3b906059bf504c13e",
       "Requirements": [
         "R6",
@@ -1141,7 +1139,6 @@
       "RemoteHost": "api.github.com",
       "RemoteRepo": "jaspGraphs",
       "RemoteUsername": "jasp-stats",
-      "RemoteRef": "HEAD",
       "RemoteSha": "09e2fecf1b921a00a203a442207591ecd3db2821",
       "Requirements": [
         "R6",
@@ -1165,7 +1162,6 @@
       "RemoteHost": "api.github.com",
       "RemoteRepo": "jaspTools",
       "RemoteUsername": "jasp-stats",
-      "RemoteRef": "HEAD",
       "RemoteSha": "6caf5dd91f1469f4357cd6dc78b3600711e871ea",
       "Requirements": [
         "archive",
@@ -1852,13 +1848,13 @@
     },
     "renv": {
       "Package": "renv",
-      "Version": "1.0.3",
+      "Version": "1.0.9",
       "Source": "Repository",
-      "Repository": "CRAN",
+      "Repository": "RSPM",
       "Requirements": [
         "utils"
       ],
-      "Hash": "41b847654f567341725473431dd0d5ab"
+      "Hash": "ef233f0e9064fc88c898b340c9add5c2"
     },
     "reshape2": {
       "Package": "reshape2",
@@ -2075,7 +2071,6 @@
       "RemoteHost": "api.github.com",
       "RemoteRepo": "shrinkem",
       "RemoteUsername": "jomulder",
-      "RemoteRef": "HEAD",
       "RemoteSha": "b5699e9b14120127dbbb8f6b2c59b188872e6263",
       "Requirements": [
         "CholWishart",