Meta-Analyses of Predictive Performance release fixes (#191)

* fixes link functions fixes: jasp-stats/jasp-test-release#2357 (comment) * fixes input check fixes: jasp-stats/jasp-test-release#2357 (comment)
jasp-stats · Aug 30, 2023 · 0002c75 · 0002c75
1 parent 7226996
commit 0002c75
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/R/classicalpredictionperformance.R b/R/classicalpredictionperformance.R
@@ -97,7 +97,7 @@ ClassicalPredictionPerformance   <- function(jaspResults, dataset, options, stat
       .quitAnalysis(gettext("The study labels contain invalid characters. Please, remove them before running the analysis."))
   }
 
-  .hasErrors(dataset               = dataset[,!grepl(options[["studyLabel"]], colnames(dataset))],
+  .hasErrors(dataset               = dataset[,varNames],
              type                  = c("infinity", "observations", "negativeValues"),
              observations.amount   = "< 2",
              exitAnalysisIfErrors  = TRUE)

diff --git a/inst/qml/qml_components/PredictionPerformanceInference.qml b/inst/qml/qml_components/PredictionPerformanceInference.qml
@@ -46,17 +46,22 @@ Section
 		{
 			name:		"withinStudyVariation"
 			label:		qsTr("Within-study variation")
-			values: 	if (analysisType == "bayesian" && measure == "oeRatio"){ // removing as metamisc's link function is broken for frequentist option: method.value == "Fixed Effects" || method.value == "Maximum Likelihood" || 
+			values: 	if (analysisType == "bayesian" && measure == "oeRatio"){ // removing as metamisc's link function is broken for frequentist option: method.value == "Fixed Effects" || method.value == "Maximum Likelihood" ||
 				[
 					{ label: qsTr("Normal/Log"),		value: "normal/log"			},
 					{ label: qsTr("Normal/Identity"),	value: "normal/identity"	},
 					{ label: qsTr("Poisson/Log"),		value: "poisson/log"		}
 				]
-			} else {
+			} else if (measure == "oeRatio"){
 				[
 					{ label: qsTr("Normal/Log"),		value: "normal/log"			},
 					{ label: qsTr("Normal/Identity"),	value: "normal/identity"	}
 				]
+			} else {
+				[
+					{ label: qsTr("Normal/Logit"),		value: "normal/logit"			},
+					{ label: qsTr("Normal/Identity"),	value: "normal/identity"	}
+				]
 			}
 		}
 	}