Updates for preloadData (jasp-stats#2)

* Update preloaddata

* Updates

* Update

* Update itemresponsetheorycommon.R

Author: koenderks

R/classicaltesttheory.R

@@ -16,7 +16,7 @@
 #
 
 classicalTestTheory <- function(jaspResults, dataset, options, ...) {
-  dataset <- .irtReadData(options)
+  dataset <- .irtReadData(dataset, options)
   ready <- .irtReady(options)
 
   # Create the summary table

R/itemresponsetheorycommon.R

@@ -35,14 +35,14 @@
   return(deps)
 }
 
-.irtReadData <- function(options) {
+.irtReadData <- function(dataset, options) {
   variables <- unlist(options[["items"]])
   variables <- variables[variables != ""]
   covariates <- unlist(options[["covariates"]])
   if (length(covariates) > 0) {
     variables <- c(variables, covariates)
   }
-  dataset <- .readDataSetToEnd(columns.as.numeric = variables)
+  dataset <- jaspBase::excludeNaListwise(dataset, variables)
   .hasErrors(dataset,
     type = c("infinity", "observations"),
     all.target = c(options[["items"]], options[["covariates"]]),
@@ -467,7 +467,7 @@
 }
 
 .irtIRTItemCharCurve <- function(dataset, options, jaspResults, ready, position) {
-  if (options[["explanatoryText"]] && options[["plotItemCharacteristic"]]) {
+  if (options[["explanatoryText"]] && length(options[["plotItemCharacteristicItems"]] > 0)) {
     text <- createJaspHtml(gettext("<h3>Explanatory Text: Item Characteristic Curves</h3>An item characteristic curve (ICC) plot shows how different test questions or items perform. It is like a graph that helps us understand how easy or hard each question is and how likely people with different abilities are to answer them correctly. In the figure, you can see a line for each question, and the shape of the line tells you if the question is easy or difficult to answer fully correctly as a function of the ability of a respondent."))
     text$position <- position
     text$dependOn(options = c("explanatoryText", "plotItemCharacteristicItems"))

R/itemresponstheorydichotomous.R

@@ -17,7 +17,7 @@
 
 itemResponseTheoryDichotomous <- function(jaspResults, dataset, options, ...) {
   # Preliminary work
-  dataset <- .irtReadData(options)
+  dataset <- .irtReadData(dataset, options)
   ready <- .irtReady(options)
   .irtIRTErrorHandling(dataset, options)
 

R/itemresponstheorydichotomousbayesian.R

@@ -17,7 +17,7 @@
 
 itemResponseTheoryDichotomousBayesian <- function(jaspResults, dataset, options, ...) {
   # Preliminary work
-  dataset <- .irtReadData(options)
+  dataset <- .irtReadData(dataset, options)
   ready <- .irtReady(options)
   .irtIRTErrorHandling(dataset, options)
 

R/itemresponstheorypolytomous.R

@@ -17,7 +17,7 @@
 
 itemResponseTheoryPolytomous <- function(jaspResults, dataset, options, ...) {
   # Preliminary work
-  dataset <- .irtReadData(options)
+  dataset <- .irtReadData(dataset, options)
   ready <- .irtReady(options)
   .irtIRTErrorHandling(dataset, options)
 

R/itemresponstheorypolytomousbayesian.R

@@ -17,7 +17,7 @@
 
 itemResponseTheoryPolytomousBayesian <- function(jaspResults, dataset, options, ...) {
   # Preliminary work
-  dataset <- .irtReadData(options)
+  dataset <- .irtReadData(dataset, options)
   ready <- .irtReady(options)
   .irtIRTErrorHandling(dataset, options)
 

inst/Description.qml

@@ -14,6 +14,7 @@ Description
 	website			: "https://github.com/jasp-stats/jaspIrt"
 	license			: "GPL (>= 3)"
 	hasWrappers		: false
+	preloadData		: true
 
 	GroupTitle
 	{

inst/qml/classicalTestTheory.qml

@@ -39,7 +39,7 @@ Form
 		{
 			name: 				"items"
 			title: 				qsTr("Item Scores")
-			allowedColumns: 	["nominal", "ordinal", "scale"]
+			allowedColumns: 	["scale"]
 			info:				qsTr("Select the variables representing item scores for the analysis.")
 		}
 	}

inst/qml/common/dichotomous/VariablesListDichotomous.qml

@@ -37,7 +37,7 @@ VariablesForm
 		id:					items
 		name: 				"items"
 		title: 				qsTr("Item Responses")
-		allowedColumns: 	["nominal"]
+		allowedColumns: 	["scale"]
 		info:				qsTr("Select the variables representing item responses for the analysis.")
 	}
 
@@ -46,7 +46,7 @@ VariablesForm
 		id:					covariates
 		name: 				"covariates"
 		title: 				qsTr("Person Covariates")
-		allowedColumns:		["nominal", "ordinal", "scale"]
+		allowedColumns:		["nominal", "scale"]
 		implicitHeight:		125 * preferencesModel.uiScale
 		info:				qsTr("Select the variables representing the person-level covariates for the analysis.")
 	}

inst/qml/common/polytomous/VariablesListPolytomous.qml

@@ -37,7 +37,7 @@ VariablesForm
 		id:					items
 		name: 				"items"
 		title: 				qsTr("Item Responses")
-		allowedColumns: 	["nominal", "ordinal"]
+		allowedColumns: 	["nominal"]
 		info:				qsTr("Select the variables representing item responses for the analysis.")
 	}
 
@@ -46,7 +46,7 @@ VariablesForm
 		id:					covariates
 		name: 				"covariates"
 		title: 				qsTr("Person Covariates")
-		allowedColumns:		["nominal", "ordinal", "scale"]
+		allowedColumns:		["nominal", "scale"]
 		implicitHeight:		125 * preferencesModel.uiScale
 		info:				qsTr("Select the variables representing the person-level covariates for the analysis.")
 	}