From e72878ace76540289fe6f0c02e3626425fc8ae42 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 28 Jun 2024 13:37:36 +0200 Subject: [PATCH 1/2] bayes lin reg read all as numeric --- R/regressionlinearbayesian.R | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/R/regressionlinearbayesian.R b/R/regressionlinearbayesian.R index 791aa27c..e570be16 100644 --- 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) } From 891a5a6309772567658896bafc8831af98066bb4 Mon Sep 17 00:00:00 2001 From: Johnny Date: Fri, 28 Jun 2024 13:46:40 +0200 Subject: [PATCH 2/2] also add minNumericLevels: 2 --- inst/qml/Correlation.qml | 4 ++-- inst/qml/CorrelationBayesian.qml | 2 +- inst/qml/RegressionLinear.qml | 4 ++-- inst/qml/RegressionLinearBayesian.qml | 2 +- inst/qml/RegressionLogistic.qml | 6 +++--- inst/qml/RegressionLogisticBayesian.qml | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/inst/qml/Correlation.qml b/inst/qml/Correlation.qml index f65b8605..c98f61b8 100644 --- 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 index e81493c4..942c049f 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"] } + AssignedVariablesList { name: "variables"; allowedColumns: ["scale"]; minNumericLevels: 2 } } Group diff --git a/inst/qml/RegressionLinear.qml b/inst/qml/RegressionLinear.qml index 7a6622a5..590454d8 100644 --- 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 index c5f95699..90a884e3 100644 --- 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 index 2ddf79f2..ecb76fff 100644 --- 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 index 6a91fc4e..34de000f 100644 --- 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 } }