Change file names

Author: koenderks

NAMESPACE

@@ -51,7 +51,7 @@ export(mlClassificationBoosting)
 export(mlClassificationDecisionTree)
 export(mlClassificationKnn)
 export(mlClassificationLda)
-export(mlClassificationLogistic)
+export(mlClassificationLogisticMultinomial)
 export(mlClassificationNaiveBayes)
 export(mlClassificationNeuralNetwork)
 export(mlClassificationRandomForest)

R/commonMachineLearningClassification.R

@@ -95,7 +95,7 @@
         "rpart" = .decisionTreeClassification(dataset, options, jaspResults),
         "svm" = .svmClassification(dataset, options, jaspResults),
         "naivebayes" = .naiveBayesClassification(dataset, options, jaspResults),
-        "logistic" = .logisticRegressionClassification(dataset, options, jaspResults)
+        "logistic" = .logisticMultinomialClassification(dataset, options, jaspResults)
       )
     })
     if (isTryError(p)) { # Fail gracefully

R/mlClassificationLogistic.R renamed to R/mlClassificationLogisticMultinomial.R

@@ -101,7 +101,7 @@ Description
 	{
 		menu:	qsTr("Logistic / Multinomial")
 		title:	qsTr("Logistic / Multinomial Regression Classification")
-		func: 	"mlClassificationLogistic"
+		func: 	"mlClassificationLogisticMultinomial"
 	}
 	Analysis
 	{

inst/Description.qml

@@ -1,7 +1,7 @@
 context("Machine Learning Logistic Regression Classification")
 
 # Test fixed model #############################################################
-options <- initMlOptions("mlClassificationLogistic")
+options <- initMlOptions("mlClassificationLogisticMultinomial")
 options$addIndicator <- FALSE
 options$addPredictions <- FALSE
 options$classProportionsTable <- TRUE
@@ -26,7 +26,7 @@ options$fromIndex <- 1
 options$toIndex <- 5
 options$featureImportanceTable <- TRUE
 set.seed(1)
-results <- jaspTools::runAnalysis("mlClassificationLogistic", "iris.csv", options)
+results <- jaspTools::runAnalysis("mlClassificationLogisticMultinomial", "iris.csv", options)
 
 test_that("Class Proportions table results match", {
 	table <- results[["results"]][["classProportionsTable"]][["data"]]