Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions R/commonMachineLearningClustering.R
Original file line number Diff line number Diff line change
Expand Up @@ -149,10 +149,10 @@
table$dependOn(options = .mlClusteringDependencies(options))
table$addColumnInfo(name = "clusters", title = gettext("Clusters"), type = "integer")
table$addColumnInfo(name = "n", title = gettext("N"), type = "integer")
table$addColumnInfo(name = "measure", title = gettextf("R%s", "\u00B2"), type = "number", format = "dp:2")
table$addColumnInfo(name = "aic", title = gettext("AIC"), type = "number", format = "dp:2")
table$addColumnInfo(name = "bic", title = gettext("BIC"), type = "number", format = "dp:2")
table$addColumnInfo(name = "Silh", title = gettext("Silhouette"), type = "number", format = "dp:2")
table$addColumnInfo(name = "measure", title = gettextf("R%s", "\u00B2"), type = "number")
table$addColumnInfo(name = "aic", title = gettext("AIC"), type = "number")
table$addColumnInfo(name = "bic", title = gettext("BIC"), type = "number")
table$addColumnInfo(name = "Silh", title = gettext("Silhouette"), type = "number")
if (type == "kmeans") {
table$addCitation("Hartigan, J. A., & Wong, M. A. (1979). Algorithm AS 136: A k-means clustering algorithm. Journal of the Royal Statistical Society. Series C (Applied Statistics), 28(1), 100-108.")
} else if (type == "kmedians") {
Expand Down Expand Up @@ -245,7 +245,7 @@
if (options[["tableClusterInformationCentroids"]]) {
for (i in seq_along(options[["predictors"]])) {
title <- gettextf("Center %s", options[["predictors"]][i])
table$addColumnInfo(name = paste0("centroid", i), title = title, type = "number", format = "dp:3")
table$addColumnInfo(name = paste0("centroid", i), title = title, type = "number")
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion R/mlClusteringRandomForest.R
Original file line number Diff line number Diff line change
Expand Up @@ -148,7 +148,7 @@ mlClusteringRandomForest <- function(jaspResults, dataset, options, ...) {
table$position <- position
table$dependOn(options = c(.mlClusteringDependencies(), "featureImportanceTable"))
table$addColumnInfo(name = "variable", title = "", type = "string")
table$addColumnInfo(name = "measure", title = gettext("Mean decrease in Gini Index"), type = "number", format = "sf:4")
table$addColumnInfo(name = "measure", title = gettext("Mean decrease in Gini Index"), type = "number")
jaspResults[["importanceTable"]] <- table
if (!ready) {
return()
Expand Down
Loading