From 4382f6937fb438dbda8b833bda0e0a7b7a58b6e9 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 14 Jun 2024 11:09:33 +0200 Subject: [PATCH] remove ordinal --- inst/qml/Correlation.qml | 2 +- inst/qml/CorrelationBayesian.qml | 2 +- inst/qml/RegressionLinear.qml | 4 +- inst/qml/RegressionLogistic.qml | 2 +- inst/qml/RegressionLogisticBayesian.qml | 2 +- .../field-residuals-histogram.new.svg | 72 +++++++++++++++++++ .../residuals-histogram.new.svg | 65 +++++++++++++++++ 7 files changed, 143 insertions(+), 6 deletions(-) create mode 100644 tests/testthat/_snaps/regressionlinear/field-residuals-histogram.new.svg create mode 100644 tests/testthat/_snaps/regressionlinear/residuals-histogram.new.svg diff --git a/inst/qml/Correlation.qml b/inst/qml/Correlation.qml index 43278f8c..f65b8605 100644 --- 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 index 8f0c7d46..f36f1f48 100644 --- 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 index 5dc39b22..535c5f28 100644 --- 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 index 47bee27a..4d0db3dd 100644 --- 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 index ab1d67ae..62f985d4 100644 --- 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 new file mode 100644 index 00000000..ac6d5975 --- /dev/null +++ b/tests/testthat/_snaps/regressionlinear/field-residuals-histogram.new.svg @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +-3 +-2 +-1 +0 +1 +2 +3 +4 +Standardized Residuals +Density +field-residuals-histogram + + diff --git a/tests/testthat/_snaps/regressionlinear/residuals-histogram.new.svg b/tests/testthat/_snaps/regressionlinear/residuals-histogram.new.svg new file mode 100644 index 00000000..821858eb --- /dev/null +++ b/tests/testthat/_snaps/regressionlinear/residuals-histogram.new.svg @@ -0,0 +1,65 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +-3 +-2 +-1 +0 +1 +2 +3 +4 +Standardized Residuals +Density +residuals-histogram + +