Update preloaddata

koenderks · koenderks · commit 0fd8a9cf52a9 · 2024-11-12T14:49:06.000+01:00
diff --git a/R/classicaltesttheory.R b/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
diff --git a/R/itemresponsetheorycommon.R b/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"]]),
diff --git a/R/itemresponstheorydichotomous.R b/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)
 
diff --git a/R/itemresponstheorydichotomousbayesian.R b/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)
 
diff --git a/R/itemresponstheorypolytomous.R b/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)
 
diff --git a/R/itemresponstheorypolytomousbayesian.R b/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)
 
diff --git a/inst/Description.qml b/inst/Description.qml
@@ -14,6 +14,7 @@ Description
 	website			: "https://github.com/jasp-stats/jaspIrt"
 	license			: "GPL (>= 3)"
 	hasWrappers		: false
+	preloadData		: true
 
 	GroupTitle
 	{
diff --git a/tests/testthat/_snaps/classicaltesttheory/histogram-of-sum-scores-1.svg b/tests/testthat/_snaps/classicaltesttheory/histogram-of-sum-scores-1.svg
@@ -18,7 +18,7 @@
   </clipPath>
 </defs>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<rect x='0.00' y='0.00' width='720.00' height='576.00' style='stroke-width: 10.67; stroke: none;' />
+<rect x='-0.000000000000064' y='0.00' width='720.00' height='576.00' style='stroke-width: 10.67; stroke: none;' />
 </g>
 <defs>
   <clipPath id='cpNjQuNTZ8NzIwLjAwfDIwLjcxfDUxMC4xNA=='>
diff --git a/tests/testthat/_snaps/classicaltesttheory/histogram-of-sum-scores-2.svg b/tests/testthat/_snaps/classicaltesttheory/histogram-of-sum-scores-2.svg
@@ -18,7 +18,7 @@
   </clipPath>
 </defs>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<rect x='-0.000000000000064' y='0.00' width='720.00' height='576.00' style='stroke-width: 10.67; stroke: none;' />
+<rect x='0.00' y='0.00' width='720.00' height='576.00' style='stroke-width: 10.67; stroke: none;' />
 </g>
 <defs>
   <clipPath id='cpNTUuMTF8NzIwLjAwfDIwLjcxfDUxMC4xNA=='>
diff --git a/tests/testthat/_snaps/classicaltesttheory/histogram-of-sum-scores-3.svg b/tests/testthat/_snaps/classicaltesttheory/histogram-of-sum-scores-3.svg
@@ -18,7 +18,7 @@
   </clipPath>
 </defs>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<rect x='-0.000000000000064' y='0.00' width='720.00' height='576.00' style='stroke-width: 10.67; stroke: none;' />
+<rect x='0.00' y='0.00' width='720.00' height='576.00' style='stroke-width: 10.67; stroke: none;' />
 </g>
 <defs>
   <clipPath id='cpNTUuMTF8NzIwLjAwfDIwLjcxfDUxMC4xNA=='>
diff --git a/tests/testthat/_snaps/classicaltesttheory/histogram-of-sum-scores-4.svg b/tests/testthat/_snaps/classicaltesttheory/histogram-of-sum-scores-4.svg
@@ -18,7 +18,7 @@
   </clipPath>
 </defs>
 <g clip-path='url(#cpMC4wMHw3MjAuMDB8MC4wMHw1NzYuMDA=)'>
-<rect x='-0.000000000000064' y='0.00' width='720.00' height='576.00' style='stroke-width: 10.67; stroke: none;' />
+<rect x='0.00' y='0.00' width='720.00' height='576.00' style='stroke-width: 10.67; stroke: none;' />
 </g>
 <defs>
   <clipPath id='cpNTUuMTF8NzIwLjAwfDIwLjcxfDUxMC4xNA=='>
diff --git a/tests/testthat/_snaps/classicaltesttheory/item-correlation-heatmap-1.svg b/tests/testthat/_snaps/classicaltesttheory/item-correlation-heatmap-1.svg
diff --git a/tests/testthat/_snaps/classicaltesttheory/item-correlation-heatmap-2.svg b/tests/testthat/_snaps/classicaltesttheory/item-correlation-heatmap-2.svg
diff --git a/tests/testthat/_snaps/classicaltesttheory/item-correlation-heatmap-3.svg b/tests/testthat/_snaps/classicaltesttheory/item-correlation-heatmap-3.svg
diff --git a/tests/testthat/_snaps/classicaltesttheory/item-correlation-heatmap-4.svg b/tests/testthat/_snaps/classicaltesttheory/item-correlation-heatmap-4.svg
diff --git a/tests/testthat/_snaps/classicaltesttheory/item-difficulty-and-discrimination-plot-1.svg b/tests/testthat/_snaps/classicaltesttheory/item-difficulty-and-discrimination-plot-1.svg
@@ -219,14 +219,14 @@
 <text transform='translate(701.79,519.48) rotate(-45)' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='22.69px' lengthAdjust='spacingAndGlyphs'>Q15</text>
 <text transform='translate(717.55,519.48) rotate(-45)' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='22.69px' lengthAdjust='spacingAndGlyphs'>Q39</text>
 <text x='379.56' y='567.49' text-anchor='middle' style='font-size: 17.00px; font-family: sans;' textLength='196.53px' lengthAdjust='spacingAndGlyphs'>Item (ordered by difficulty)</text>
-<rect x='211.19' y='20.71' width='336.74' height='39.31' style='stroke-width: 0.75; stroke: none;' />
-<rect x='211.19' y='20.71' width='336.74' height='39.31' style='stroke-width: 10.67; stroke: none;' />
-<rect x='225.13' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
-<rect x='225.84' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #B22222;' />
-<rect x='362.04' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
-<rect x='362.75' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #1E90FF;' />
-<text x='261.95' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='91.63px' lengthAdjust='spacingAndGlyphs'>Difficulty (P)</text>
-<text x='398.86' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='143.59px' lengthAdjust='spacingAndGlyphs'>Discrimination (Rit)</text>
+<rect x='219.90' y='20.71' width='319.30' height='39.31' style='stroke-width: 0.75; stroke: none;' />
+<rect x='219.90' y='20.71' width='319.30' height='39.31' style='stroke-width: 10.67; stroke: none;' />
+<rect x='225.38' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
+<rect x='226.09' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #B22222;' />
+<rect x='356.32' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
+<rect x='357.02' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #1E90FF;' />
+<text x='259.21' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='91.63px' lengthAdjust='spacingAndGlyphs'>Difficulty (P)</text>
+<text x='390.14' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='143.59px' lengthAdjust='spacingAndGlyphs'>Discrimination (Rit)</text>
 <text x='379.56' y='11.70' text-anchor='middle' style='font-size: 17.00px; font-family: sans;' textLength='291.01px' lengthAdjust='spacingAndGlyphs'>item-difficulty-and-discrimination-plot-1</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/classicaltesttheory/item-difficulty-and-discrimination-plot-2.svg b/tests/testthat/_snaps/classicaltesttheory/item-difficulty-and-discrimination-plot-2.svg
@@ -127,14 +127,14 @@
 <text transform='translate(673.08,519.48) rotate(-45)' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='16.01px' lengthAdjust='spacingAndGlyphs'>Q1</text>
 <text transform='translate(706.78,519.48) rotate(-45)' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='16.01px' lengthAdjust='spacingAndGlyphs'>Q9</text>
 <text x='379.56' y='567.49' text-anchor='middle' style='font-size: 17.00px; font-family: sans;' textLength='196.53px' lengthAdjust='spacingAndGlyphs'>Item (ordered by difficulty)</text>
-<rect x='211.19' y='20.71' width='336.74' height='39.31' style='stroke-width: 0.75; stroke: none;' />
-<rect x='211.19' y='20.71' width='336.74' height='39.31' style='stroke-width: 10.67; stroke: none;' />
-<rect x='225.13' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
-<rect x='225.84' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #B22222;' />
-<rect x='362.04' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
-<rect x='362.75' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #1E90FF;' />
-<text x='261.95' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='91.63px' lengthAdjust='spacingAndGlyphs'>Difficulty (P)</text>
-<text x='398.86' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='143.59px' lengthAdjust='spacingAndGlyphs'>Discrimination (Rit)</text>
+<rect x='219.90' y='20.71' width='319.30' height='39.31' style='stroke-width: 0.75; stroke: none;' />
+<rect x='219.90' y='20.71' width='319.30' height='39.31' style='stroke-width: 10.67; stroke: none;' />
+<rect x='225.38' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
+<rect x='226.09' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #B22222;' />
+<rect x='356.32' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
+<rect x='357.02' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #1E90FF;' />
+<text x='259.21' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='91.63px' lengthAdjust='spacingAndGlyphs'>Difficulty (P)</text>
+<text x='390.14' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='143.59px' lengthAdjust='spacingAndGlyphs'>Discrimination (Rit)</text>
 <text x='379.56' y='11.70' text-anchor='middle' style='font-size: 17.00px; font-family: sans;' textLength='291.01px' lengthAdjust='spacingAndGlyphs'>item-difficulty-and-discrimination-plot-2</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/classicaltesttheory/item-difficulty-and-discrimination-plot-3.svg b/tests/testthat/_snaps/classicaltesttheory/item-difficulty-and-discrimination-plot-3.svg
@@ -221,14 +221,14 @@
 <text transform='translate(702.00,527.41) rotate(-45)' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>4b</text>
 <text transform='translate(717.63,527.41) rotate(-45)' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>1b</text>
 <text x='382.39' y='567.49' text-anchor='middle' style='font-size: 17.00px; font-family: sans;' textLength='196.53px' lengthAdjust='spacingAndGlyphs'>Item (ordered by difficulty)</text>
-<rect x='214.02' y='20.71' width='336.74' height='39.31' style='stroke-width: 0.75; stroke: none;' />
-<rect x='214.02' y='20.71' width='336.74' height='39.31' style='stroke-width: 10.67; stroke: none;' />
-<rect x='227.97' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
-<rect x='228.67' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #B22222;' />
-<rect x='364.87' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
-<rect x='365.58' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #1E90FF;' />
-<text x='264.78' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='91.63px' lengthAdjust='spacingAndGlyphs'>Difficulty (P)</text>
-<text x='401.69' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='143.59px' lengthAdjust='spacingAndGlyphs'>Discrimination (Rit)</text>
+<rect x='222.74' y='20.71' width='319.30' height='39.31' style='stroke-width: 0.75; stroke: none;' />
+<rect x='222.74' y='20.71' width='319.30' height='39.31' style='stroke-width: 10.67; stroke: none;' />
+<rect x='228.21' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
+<rect x='228.92' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #B22222;' />
+<rect x='359.15' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
+<rect x='359.86' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #1E90FF;' />
+<text x='262.04' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='91.63px' lengthAdjust='spacingAndGlyphs'>Difficulty (P)</text>
+<text x='392.97' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='143.59px' lengthAdjust='spacingAndGlyphs'>Discrimination (Rit)</text>
 <text x='382.39' y='11.70' text-anchor='middle' style='font-size: 17.00px; font-family: sans;' textLength='291.01px' lengthAdjust='spacingAndGlyphs'>item-difficulty-and-discrimination-plot-3</text>
 </g>
 </svg>
diff --git a/tests/testthat/_snaps/classicaltesttheory/item-difficulty-and-discrimination-plot-4.svg b/tests/testthat/_snaps/classicaltesttheory/item-difficulty-and-discrimination-plot-4.svg
@@ -236,14 +236,14 @@
 <text transform='translate(704.12,527.41) rotate(-45)' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='12.68px' lengthAdjust='spacingAndGlyphs'>5c</text>
 <text transform='translate(718.42,527.41) rotate(-45)' text-anchor='end' style='font-size: 12.00px; font-family: sans;' textLength='13.35px' lengthAdjust='spacingAndGlyphs'>7a</text>
 <text x='382.39' y='567.49' text-anchor='middle' style='font-size: 17.00px; font-family: sans;' textLength='196.53px' lengthAdjust='spacingAndGlyphs'>Item (ordered by difficulty)</text>
-<rect x='214.02' y='20.71' width='336.74' height='39.31' style='stroke-width: 0.75; stroke: none;' />
-<rect x='214.02' y='20.71' width='336.74' height='39.31' style='stroke-width: 10.67; stroke: none;' />
-<rect x='227.97' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
-<rect x='228.67' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #B22222;' />
-<rect x='364.87' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
-<rect x='365.58' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #1E90FF;' />
-<text x='264.78' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='91.63px' lengthAdjust='spacingAndGlyphs'>Difficulty (P)</text>
-<text x='401.69' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='143.59px' lengthAdjust='spacingAndGlyphs'>Discrimination (Rit)</text>
+<rect x='222.74' y='20.71' width='319.30' height='39.31' style='stroke-width: 0.75; stroke: none;' />
+<rect x='222.74' y='20.71' width='319.30' height='39.31' style='stroke-width: 10.67; stroke: none;' />
+<rect x='228.21' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
+<rect x='228.92' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #B22222;' />
+<rect x='359.15' y='26.19' width='28.35' height='28.35' style='stroke-width: 10.67; stroke: none;' />
+<rect x='359.86' y='26.90' width='26.93' height='26.93' style='stroke-width: 1.07; stroke-linecap: butt; stroke-linejoin: miter; fill: #1E90FF;' />
+<text x='262.04' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='91.63px' lengthAdjust='spacingAndGlyphs'>Difficulty (P)</text>
+<text x='392.97' y='46.21' style='font-size: 17.00px; font-family: sans;' textLength='143.59px' lengthAdjust='spacingAndGlyphs'>Discrimination (Rit)</text>
 <text x='382.39' y='11.70' text-anchor='middle' style='font-size: 17.00px; font-family: sans;' textLength='291.01px' lengthAdjust='spacingAndGlyphs'>item-difficulty-and-discrimination-plot-4</text>
 </g>
 </svg>
diff --git a/tests/testthat/test-classicaltesttheory.R b/tests/testthat/test-classicaltesttheory.R

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@`
`16`	`16`	`#`
`17`	`17`
`18`	`18`	`classicalTestTheory <- function(jaspResults, dataset, options, ...) {`
`19`		`- dataset <- .irtReadData(options)`
	`19`	`+ dataset <- .irtReadData(dataset, options)`
`20`	`20`	`ready <- .irtReady(options)`
`21`	`21`
`22`	`22`	`# Create the summary table`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@ Description`
`14`	`14`	`website : "https://github.com/jasp-stats/jaspIrt"`
`15`	`15`	`license : "GPL (>= 3)"`
`16`	`16`	`hasWrappers : false`
	`17`	`+ preloadData : true`
`17`	`18`
`18`	`19`	`GroupTitle`
`19`	`20`	`{`