remove ordinal

JohnnyDoorn · Jun 14, 2024 · 4382f69 · 4382f69
1 parent 59d520c
commit 4382f69
Show file tree

Hide file tree

Showing 7 changed files with 143 additions and 6 deletions.
diff --git a/inst/qml/Correlation.qml b/inst/qml/Correlation.qml
@@ -27,7 +27,7 @@ Form
 	{
 		preferredHeight: jaspTheme.smallDefaultVariablesFormHeight
 		AvailableVariablesList{  name: "allVariablesList" }
-		AssignedVariablesList {  name: "variables";				title: qsTr("Variables"); allowedColumns: ["scale", "ordinal"] }
+		AssignedVariablesList {  name: "variables";				title: qsTr("Variables"); allowedColumns: ["scale"] }
 		AssignedVariablesList {  name: "partialOutVariables"; title: qsTr("Partial out"); allowedColumns: ["scale"] }
 	}
 

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", "ordinal"] }
+		AssignedVariablesList	{	name: "variables"; allowedColumns: ["scale"] }
 	}
 
 	Group

diff --git a/inst/qml/RegressionLinear.qml b/inst/qml/RegressionLinear.qml
@@ -49,8 +49,8 @@ Form
 				{ label: qsTr("Stepwise"),	value: "stepwise"}
 			]
 		}
-		AssignedVariablesList { name: "covariates";	title: qsTr("Covariates");				allowedColumns: ["ordinal", "scale"]					}
-		AssignedVariablesList { name: "factors";	title: qsTr("Factors");					allowedColumns: ["ordinal", "nominal"]; minLevels: 2}
+		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			}
 	}
 

diff --git a/inst/qml/RegressionLogistic.qml b/inst/qml/RegressionLogistic.qml
@@ -48,7 +48,7 @@ Form
 			]
 		}
 		AssignedVariablesList { name: "covariates";	title: qsTr("Covariates");			allowedColumns: ["scale"]											}
-		AssignedVariablesList { name: "factors";	title: qsTr("Factors");				allowedColumns: ["ordinal", "nominal"], minLevels: 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	}
 	}
 

diff --git a/inst/qml/RegressionLogisticBayesian.qml b/inst/qml/RegressionLogisticBayesian.qml
@@ -28,7 +28,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: "factors";		title: qsTr("Factors");					allowedColumns: ["ordinal", "nominal"], minLevels: 2  					}
+		AssignedVariablesList	{ name: "factors";		title: qsTr("Factors");					allowedColumns: ["nominal"], minLevels: 2  					}
 		AssignedVariablesList	{ name: "weights";		title: qsTr("WLS Weights (optional)");	allowedColumns: ["scale"];					singleVariable: true		}
 	}
 

diff --git a/tests/testthat/_snaps/regressionlinear/field-residuals-histogram.new.svg b/tests/testthat/_snaps/regressionlinear/field-residuals-histogram.new.svg