diff --git a/R/mlPrediction.R b/R/mlPrediction.R index 00043aba..65b0fecd 100644 --- a/R/mlPrediction.R +++ b/R/mlPrediction.R @@ -19,7 +19,7 @@ mlPrediction <- function(jaspResults, dataset, options, ...) { # Preparatory work model <- .mlPredictionReadModel(options) - dataset <- .mlPredictionReadData(options) + dataset <- .mlPredictionReadData(dataset, options) # Check if analysis is ready ready <- .mlPredictionReady(model, dataset, options) @@ -302,8 +302,8 @@ is.jaspMachineLearning <- function(x) { return(ready) } -.mlPredictionReadData <- function(options) { - dataset <- .readDataSetToEnd(columns = options[["predictors"]], exclude.na.listwise = options[["predictors"]]) +.mlPredictionReadData <- function(dataset, options) { + dataset <- jaspBase::excludeNaListwise(dataset, options[["predictors"]]) if (options[["scaleVariables"]] && length(unlist(options[["predictors"]])) > 0) { dataset <- .scaleNumericData(dataset) } diff --git a/inst/Description.qml b/inst/Description.qml index 72422c39..c0513b08 100644 --- a/inst/Description.qml +++ b/inst/Description.qml @@ -3,183 +3,184 @@ import JASP.Module 1.0 Description { - title : qsTr("Machine Learning") - name : "jaspMachineLearning" + title: qsTr("Machine Learning") + name: "jaspMachineLearning" description: qsTr("Explore the relation between variables using data-driven methods for regression, classification, and clustering") - version : "0.19.0" + version: "0.19.2" author: "JASP Team" maintainer: "JASP Team " website: "www.jasp-stats.org" license: "GPL (>= 2)" icon: "analysis-ml-ribbon.svg" + preloadData: true GroupTitle { - title: qsTr("Regression") - icon: "analysis-ml-regression.svg" + title: qsTr("Regression") + icon: "analysis-ml-regression.svg" } Analysis { - menu: qsTr("Boosting") - title: qsTr("Boosting Regression") - func: "mlRegressionBoosting" + menu: qsTr("Boosting") + title: qsTr("Boosting Regression") + func: "mlRegressionBoosting" } Analysis { - menu: qsTr("Decision Tree") - title: qsTr("Decision Tree Regression") - func: "mlRegressionDecisionTree" + menu: qsTr("Decision Tree") + title: qsTr("Decision Tree Regression") + func: "mlRegressionDecisionTree" } Analysis { - menu: qsTr("K-Nearest Neighbors") - title: qsTr("K-Nearest Neighbors Regression") - func: "mlRegressionKnn" + menu: qsTr("K-Nearest Neighbors") + title: qsTr("K-Nearest Neighbors Regression") + func: "mlRegressionKnn" } Analysis { - menu: qsTr("Linear") - title: qsTr("Linear Regression") - func: "mlRegressionLinear" + menu: qsTr("Linear") + title: qsTr("Linear Regression") + func: "mlRegressionLinear" } Analysis { - menu: qsTr("Neural Network") - title: qsTr("Neural Network Regression") - func: "mlRegressionNeuralNetwork" + menu: qsTr("Neural Network") + title: qsTr("Neural Network Regression") + func: "mlRegressionNeuralNetwork" } Analysis { - menu: qsTr("Random Forest") - title: qsTr("Random Forest Regression") - func: "mlRegressionRandomForest" + menu: qsTr("Random Forest") + title: qsTr("Random Forest Regression") + func: "mlRegressionRandomForest" } Analysis { - menu: qsTr("Regularized Linear") - title: qsTr("Regularized Linear Regression") - func: "mlRegressionRegularized" + menu: qsTr("Regularized Linear") + title: qsTr("Regularized Linear Regression") + func: "mlRegressionRegularized" } Analysis { - menu: qsTr("Support Vector Machine") - title: qsTr("Support Vector Machine Regression") - func: "mlRegressionSvm" + menu: qsTr("Support Vector Machine") + title: qsTr("Support Vector Machine Regression") + func: "mlRegressionSvm" } GroupTitle { - title: qsTr("Classification") - icon: "analysis-ml-classification.svg" + title: qsTr("Classification") + icon: "analysis-ml-classification.svg" } Analysis { - menu: qsTr("Boosting") - title: qsTr("Boosting Classification") - func: "mlClassificationBoosting" + menu: qsTr("Boosting") + title: qsTr("Boosting Classification") + func: "mlClassificationBoosting" } Analysis { - menu: qsTr("Decision Tree") - title: qsTr("Decision Tree Classification") - func: "mlClassificationDecisionTree" + menu: qsTr("Decision Tree") + title: qsTr("Decision Tree Classification") + func: "mlClassificationDecisionTree" } Analysis { - menu: qsTr("K-Nearest Neighbors") - title: qsTr("K-Nearest Neighbors Classification") - func: "mlClassificationKnn" + menu: qsTr("K-Nearest Neighbors") + title: qsTr("K-Nearest Neighbors Classification") + func: "mlClassificationKnn" } Analysis { - menu: qsTr("Linear Discriminant") - title: qsTr("Linear Discriminant Classification") - func: "mlClassificationLda" + menu: qsTr("Linear Discriminant") + title: qsTr("Linear Discriminant Classification") + func: "mlClassificationLda" } Analysis { - menu: qsTr("Logistic / Multinomial") - title: qsTr("Logistic / Multinomial Regression Classification") - func: "mlClassificationLogisticMultinomial" + menu: qsTr("Logistic / Multinomial") + title: qsTr("Logistic / Multinomial Regression Classification") + func: "mlClassificationLogisticMultinomial" } Analysis { - menu: qsTr("Naive Bayes") - title: qsTr("Naive Bayes Classification") - func: "mlClassificationNaiveBayes" + menu: qsTr("Naive Bayes") + title: qsTr("Naive Bayes Classification") + func: "mlClassificationNaiveBayes" } Analysis { - menu: qsTr("Neural Network") - title: qsTr("Neural Network Classification") - func: "mlClassificationNeuralNetwork" + menu: qsTr("Neural Network") + title: qsTr("Neural Network Classification") + func: "mlClassificationNeuralNetwork" } Analysis { - menu: qsTr("Random Forest") - title: qsTr("Random Forest Classification") - func: "mlClassificationRandomForest" + menu: qsTr("Random Forest") + title: qsTr("Random Forest Classification") + func: "mlClassificationRandomForest" } Analysis { - menu: qsTr("Support Vector Machine") - title: qsTr("Support Vector Machine Classification") - func: "mlClassificationSvm" + menu: qsTr("Support Vector Machine") + title: qsTr("Support Vector Machine Classification") + func: "mlClassificationSvm" } GroupTitle { - title: qsTr("Clustering") - icon: "analysis-ml-clustering.svg" + title: qsTr("Clustering") + icon: "analysis-ml-clustering.svg" } Analysis { - menu: qsTr("Density-Based") - title: qsTr("Density-Based Clustering") - func: "mlClusteringDensityBased" + menu: qsTr("Density-Based") + title: qsTr("Density-Based Clustering") + func: "mlClusteringDensityBased" } Analysis { - menu: qsTr("Fuzzy C-Means") - title: qsTr("Fuzzy C-Means Clustering") - func: "mlClusteringFuzzyCMeans" + menu: qsTr("Fuzzy C-Means") + title: qsTr("Fuzzy C-Means Clustering") + func: "mlClusteringFuzzyCMeans" } Analysis { - menu: qsTr("Hierarchical") - title: qsTr("Hierarchical Clustering") - func: "mlClusteringHierarchical" + menu: qsTr("Hierarchical") + title: qsTr("Hierarchical Clustering") + func: "mlClusteringHierarchical" } Analysis { - menu: qsTr("Model-Based") - title: qsTr("Model-Based Clustering") - func: "mlClusteringModelBased" + menu: qsTr("Model-Based") + title: qsTr("Model-Based Clustering") + func: "mlClusteringModelBased" } Analysis { - menu: qsTr("Neighborhood-Based") - title: qsTr("Neighborhood-Based Clustering") - func: "mlClusteringKMeans" + menu: qsTr("Neighborhood-Based") + title: qsTr("Neighborhood-Based Clustering") + func: "mlClusteringKMeans" } Analysis { - menu: qsTr("Random Forest") - title: qsTr("Random Forest Clustering") - func: "mlClusteringRandomForest" + menu: qsTr("Random Forest") + title: qsTr("Random Forest Clustering") + func: "mlClusteringRandomForest" } GroupTitle { - title: qsTr("Prediction") - icon: "analysis-ml-prediction.svg" + title: qsTr("Prediction") + icon: "analysis-ml-prediction.svg" } Analysis { - menu: qsTr("Prediction") - title: qsTr("Prediction") - func: "mlPrediction" + menu: qsTr("Prediction") + title: qsTr("Prediction") + func: "mlPrediction" } }