Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

bayes lin reg read all as numeric #334

Merged
merged 2 commits into from
Jun 28, 2024
Merged

bayes lin reg read all as numeric #334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e72878a
bayes lin reg read all as numeric
JohnnyDoorn Jun 28, 2024
891a5a6
also add minNumericLevels: 2
JohnnyDoorn Jun 28, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion R/regressionlinearbayesian.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions inst/qml/Correlation.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion inst/qml/CorrelationBayesian.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ Form
{
preferredHeight: jaspTheme.smallDefaultVariablesFormHeight
AvailableVariablesList { name: "allVariablesList" }
AssignedVariablesList { name: "variables"; allowedColumns: ["scale"] }
AssignedVariablesList { name: "variables"; allowedColumns: ["scale"]; minNumericLevels: 2 }
}

Group
Expand Down
4 changes: 2 additions & 2 deletions inst/qml/RegressionLinear.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion inst/qml/RegressionLinearBayesian.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}

Expand Down
6 changes: 3 additions & 3 deletions inst/qml/RegressionLogistic.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion inst/qml/RegressionLogisticBayesian.qml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
}
Expand Down
Loading