Skip to content

Commit 290c1ed

Browse files
koenderkskoenderks
committed
Update tests
1 parent 7830225 commit 290c1ed

15 files changed

+22
-22
lines changed

‎tests/testthat/test-mlclassificationboosting.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ options$noOfFolds <- 5
4040
options$deviancePlot <- TRUE
4141
options$outOfBagImprovementPlot <- TRUE
4242
options$relativeInfluencePlot <- TRUE
43-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
43+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
4444
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
4545
"Hue", "Dilution", "Proline")
4646
options$predictors.types <- rep("scale", length(options$predictors))

‎tests/testthat/test-mlclassificationknn.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ options$modelValid <- "validationManual"
3838
options$noOfFolds <- 5
3939
options$errorVsKPlot <- TRUE
4040
options$weightsPlot <- TRUE
41-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
41+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
4242
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
4343
"Hue", "Dilution", "Proline")
4444
options$predictors.types <- rep("scale", length(options$predictors))

‎tests/testthat/test-mlclassificationlda.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ options$modelOptimization <- "manual"
1919
options$modelValid <- "validationManual"
2020
options$multicolTable <- TRUE
2121
options$noOfFolds <- 5
22-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
22+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
2323
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
2424
"Hue", "Dilution", "Proline")
2525
options$predictors.types <- rep("scale", length(options$predictors))

‎tests/testthat/test-mlclassificationrandomforest.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ options$noOfFolds <- 5
3939
options$accuracyDecreasePlot <- TRUE
4040
options$purityIncreasePlot <- TRUE
4141
options$treesVsModelErrorPlot <- TRUE
42-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
42+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
4343
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
4444
"Hue", "Dilution", "Proline")
4545
options$predictors.types <- rep("scale", length(options$predictors))

‎tests/testthat/test-mlclusteringdensitybased.R‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ options$distance <- "normalDensities"
99
options[["kDistancePlot"]] <- TRUE
1010
options$modelOptimization <- "manual"
1111
options$tsneClusterPlot <- TRUE
12-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
12+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
1313
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
1414
"Hue", "Dilution", "Proline")
1515
options$predictors.types <- rep("scale", length(options$predictors))

‎tests/testthat/test-mlclusteringfuzzycmeans.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ context("Machine Learning Fuzzy C-Means Clustering")
22

33
# Test fixed model #############################################################
44
options <- initMlOptions("mlClusteringFuzzyCMeans")
5-
options$predictors <- list("Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width")
5+
options$predictors <- c("Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width")
66
options$predictors.types <- rep("scale", length(options$predictors))
77
options$modelOptimization <- "manual"
88
options$predictionsColumn <- ""
@@ -22,7 +22,7 @@ options$predictionsColumn <- ""
2222
options$validationMeasures <- TRUE
2323
options$modelOptimization <- "optimized"
2424
options$tsneClusterPlot <- TRUE
25-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
25+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
2626
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
2727
"Hue", "Dilution", "Proline")
2828
options$predictors.types <- rep("scale", length(options$predictors))

‎tests/testthat/test-mlclusteringhierarchical.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ context("Machine Learning Hierarchical Clustering")
22

33
# Test fixed model #############################################################
44
options <- initMlOptions("mlClusteringHierarchical")
5-
options$predictors <- list("Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width")
5+
options$predictors <- c("Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width")
66
options$predictors.types <- rep("scale", length(options$predictors))
77
options$modelOptimization <- "manual"
88
options$predictionsColumn <- ""
@@ -23,7 +23,7 @@ options$validationMeasures <- TRUE
2323
options$dendrogram <- TRUE
2424
options$modelOptimization <- "optimized"
2525
options$tsneClusterPlot <- TRUE
26-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
26+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
2727
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
2828
"Hue", "Dilution", "Proline")
2929
options$predictors.types <- rep("scale", length(options$predictors))

‎tests/testthat/test-mlclusteringkmeans.R‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ context("Machine Learning K-Means Clustering")
22

33
# Test fixed model #############################################################
44
options <- initMlOptions("mlClusteringKMeans")
5-
options$predictors <- list("Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width")
5+
options$predictors <- c("Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width")
66
options$predictors.types <- rep("scale", length(options$predictors))
77
options$modelOptimization <- "manual"
88
options$predictionsColumn <- ""
@@ -18,7 +18,7 @@ jaspTools::expect_equal_tables(table,
1818

1919
# Test optimized model #########################################################
2020
options <- initMlOptions("mlClusteringKMeans")
21-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
21+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
2222
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
2323
"Hue", "Dilution", "Proline")
2424
options$predictors.types <- rep("scale", length(options$predictors))
@@ -104,7 +104,7 @@ test_that("t-SNE Cluster Plot matches", {
104104
context("Machine Learning K-Medians Clustering")
105105

106106
options <- initMlOptions("mlClusteringKMeans")
107-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
107+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
108108
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
109109
"Hue", "Dilution", "Proline")
110110
options$predictors.types <- rep("scale", length(options$predictors))
@@ -186,7 +186,7 @@ test_that("Elbow Method Plot matches", {
186186
context("Machine Learning K-Medoids Clustering")
187187

188188
options <- initMlOptions("mlClusteringKMeans")
189-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
189+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
190190
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
191191
"Hue", "Dilution", "Proline")
192192
options$predictors.types <- rep("scale", length(options$predictors))

‎tests/testthat/test-mlclusteringmodelbased.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ context("Machine Learning K-Means Clustering")
22

33
# Test fixed model #############################################################
44
options <- initMlOptions("mlClusteringModelBased")
5-
options$predictors <- list("Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width")
5+
options$predictors <- c("Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width")
66
options$predictors.types <- rep("scale", length(options$predictors))
77
options$modelOptimization <- "manual"
88
options$predictionsColumn <- ""
@@ -17,7 +17,7 @@ jaspTools::expect_equal_tables(table,
1717

1818
# Test optimized model #########################################################
1919
options <- initMlOptions("mlClusteringModelBased")
20-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
20+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
2121
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
2222
"Hue", "Dilution", "Proline")
2323
options$predictors.types <- rep("scale", length(options$predictors))

‎tests/testthat/test-mlclusteringrandomforest.R‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ context("Machine Learning Random Forest Clustering")
22

33
# Test fixed model #############################################################
44
options <- initMlOptions("mlClusteringRandomForest")
5-
options$predictors <- list("Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width")
5+
options$predictors <- c("Sepal.Length", "Sepal.Width", "Petal.Length", "Petal.Width")
66
options$predictors.types <- rep("scale", length(options$predictors))
77
options$modelOptimization <- "manual"
88
options$predictionsColumn <- ""
@@ -35,7 +35,7 @@ options$validationMeasures <- TRUE
3535
options$featureImportanceTable <- TRUE
3636
options$modelOptimization <- "optimized"
3737
options$tsneClusterPlot <- TRUE
38-
options$predictors <- list("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
38+
options$predictors <- c("Alcohol", "Malic", "Ash", "Alcalinity", "Magnesium", "Phenols",
3939
"Flavanoids", "Nonflavanoids", "Proanthocyanins", "Color",
4040
"Hue", "Dilution", "Proline")
4141
options$predictors.types <- rep("scale", length(options$predictors))

0 commit comments

Comments
 (0)