bayes lin reg read all as numeric (#334)

* bayes lin reg read all as numeric * also add minNumericLevels: 2
jasp-stats · Jun 28, 2024 · 6292424 · 6292424
1 parent 2191b11
commit 6292424
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 11 deletions.
diff --git a/R/regressionlinearbayesian.R b/R/regressionlinearbayesian.R
@@ -77,7 +77,7 @@ RegressionLinearBayesianInternal <- function(jaspResults, dataset = NULL, option
     vars <- c(vars, options$weights)
   }
 
-  dataset <- .readDataSetToEnd(columns = vars, exclude.na.listwise = vars)
+  dataset <- .readDataSetToEnd(columns.as.numeric = vars, exclude.na.listwise = vars)
 
   return(dataset)
 }

diff --git a/inst/qml/Correlation.qml b/inst/qml/Correlation.qml
@@ -27,8 +27,8 @@ Form
 	{
 		preferredHeight: jaspTheme.smallDefaultVariablesFormHeight
 		AvailableVariablesList{  name: "allVariablesList" }
-		AssignedVariablesList {  name: "variables";				title: qsTr("Variables"); allowedColumns: ["scale"] }
-		AssignedVariablesList {  name: "partialOutVariables"; title: qsTr("Partial out"); allowedColumns: ["scale"] }
+		AssignedVariablesList {  name: "variables";				title: qsTr("Variables"); allowedColumns: ["scale"]; minNumericLevels: 2 }
+		AssignedVariablesList {  name: "partialOutVariables"; title: qsTr("Partial out"); allowedColumns: ["scale"]; minNumericLevels: 2 }
 	}
 
 	Group

diff --git a/inst/qml/CorrelationBayesian.qml b/inst/qml/CorrelationBayesian.qml
@@ -27,7 +27,7 @@ Form
 	{
 		preferredHeight: jaspTheme.smallDefaultVariablesFormHeight
 		AvailableVariablesList	{	name: "allVariablesList" }
-		AssignedVariablesList	{	name: "variables"; allowedColumns: ["scale"] }
+		AssignedVariablesList	{	name: "variables"; allowedColumns: ["scale"]; minNumericLevels: 2 }
 	}
 
 	Group

diff --git a/inst/qml/RegressionLinear.qml b/inst/qml/RegressionLinear.qml
@@ -49,9 +49,9 @@ Form
 				{ label: qsTr("Stepwise"),	value: "stepwise"}
 			]
 		}
-		AssignedVariablesList { name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["scale"]					}
+		AssignedVariablesList { name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["scale"];   minNumericLevels: 2					}
 		AssignedVariablesList { name: "factors";	title: qsTr("Factors");					allowedColumns: ["nominal"]; minLevels: 2}
-		AssignedVariablesList { name: "weights";	title: qsTr("WLS Weights (optional)");	allowedColumns: ["scale"]; singleVariable: true			}
+		AssignedVariablesList { name: "weights";	title: qsTr("WLS Weights (optional)");	allowedColumns: ["scale"];   singleVariable: true			}
 	}
 
 	Section

diff --git a/inst/qml/RegressionLinearBayesian.qml b/inst/qml/RegressionLinearBayesian.qml
@@ -33,7 +33,7 @@ Form {
 	{
 		AvailableVariablesList	{ name: "allVariablesList" }
 		AssignedVariablesList	{ name: "dependent";	title: qsTr("Dependent Variable");		allowedColumns: ["scale"];	singleVariable: true	}
-		AssignedVariablesList	{ name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["scale"]}
+		AssignedVariablesList	{ name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["scale"];  minNumericLevels: 2}
 		AssignedVariablesList	{ name: "weights";		title: qsTr("WLS Weights (optional)");	allowedColumns: ["scale"];	singleVariable: true	}
 	}
 

diff --git a/inst/qml/RegressionLogistic.qml b/inst/qml/RegressionLogistic.qml
@@ -47,9 +47,9 @@ Form
 				{ label: qsTr("Stepwise"),	value: "stepwise"}
 			]
 		}
-		AssignedVariablesList { name: "covariates";	title: qsTr("Covariates");			allowedColumns: ["scale"]											}
-		AssignedVariablesList { name: "factors";	title: qsTr("Factors");				allowedColumns: ["nominal"]; minLevels: 2                }
-		AssignedVariablesList { name: "weights";	title: qsTr("WLS Weights (optional)"); allowedColumns: ["scale"]; singleVariable: true; debug: true	}
+		AssignedVariablesList { name: "covariates";	title: qsTr("Covariates");			allowedColumns: ["scale"]; 		minNumericLevels: 2			}
+		AssignedVariablesList { name: "factors";	title: qsTr("Factors");				allowedColumns: ["nominal"]; 	minLevels: 2                }
+		AssignedVariablesList { name: "weights";	title: qsTr("WLS Weights (optional)"); allowedColumns: ["scale"]; 	singleVariable: true; debug: true	}
 	}
 
 	Section

diff --git a/inst/qml/RegressionLogisticBayesian.qml b/inst/qml/RegressionLogisticBayesian.qml
@@ -27,7 +27,7 @@ Form {
 	{
 		AvailableVariablesList	{ name: "allVariablesList" }
 		AssignedVariablesList	{ name: "dependent";	title: qsTr("Dependent Variable");		allowedColumns: ["nominal"];	singleVariable: true		}
-		AssignedVariablesList	{ name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["scale"]									}
+		AssignedVariablesList	{ name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["scale"];   minNumericLevels: 2			}
 		AssignedVariablesList	{ name: "factors";		title: qsTr("Factors");					allowedColumns: ["nominal"]; minLevels: 2  					}
 		AssignedVariablesList	{ name: "weights";		title: qsTr("WLS Weights (optional)");	allowedColumns: ["scale"];					singleVariable: true		}
 	}