Skip to content

Commit

Permalink
refact: more formatting
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-muecke
m-muecke committed Feb 23, 2025
1 parent ff7891c commit e8c2880
Show file tree
Hide file tree
Showing 8 changed files with 50 additions and 46 deletions.
4 changes: 1 addition & 3 deletions R/LearnerClustDBSCANfpc.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,7 @@ LearnerClustDBSCANfpc = R6Class("LearnerClustDBSCANfpc",
}))
)

param_set$set_values(
MinPts = 5L, scale = FALSE, seeds = TRUE, showplot = FALSE, countmode = NULL
)
param_set$set_values(MinPts = 5L, scale = FALSE, seeds = TRUE, showplot = FALSE, countmode = NULL)

super$initialize(
id = "clust.dbscan_fpc",
Expand Down
2 changes: 1 addition & 1 deletion R/LearnerClustEM.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ LearnerClustEM = R6Class("LearnerClustEM",
N = p_int(-1L, default = -1L, tags = "train"),
num_slots = p_int(1L, default = 1L, tags = "train"),
S = p_int(0L, default = 100L, tags = "train"),
X = p_int(1L, default = 10L, tags = "train"),
X = p_int(1L, default = 10L, tags = "train"),
K = p_int(1L, default = 10L, tags = "train"),
V = p_lgl(default = FALSE, tags = "train"),
output_debug_info = p_lgl(default = FALSE, tags = "train")
Expand Down
3 changes: 2 additions & 1 deletion R/LearnerClustHclust.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,8 @@ LearnerClustHclust = R6Class("LearnerClustHclust",
),
members = p_uty(default = NULL, tags = c("train", "hclust")),
distmethod = p_fct(
default = "euclidean", levels = c("euclidean", "maximum", "manhattan", "canberra", "binary", "minkowski"),
default = "euclidean",
levels = c("euclidean", "maximum", "manhattan", "canberra", "binary", "minkowski"),
tags = "train"
),
diag = p_lgl(default = FALSE, tags = c("train", "dist")),
Expand Down
4 changes: 1 addition & 3 deletions R/LearnerClustKKMeans.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,7 @@ LearnerClustKKMeans = R6Class("LearnerClustKKMeans",
#' Creates a new instance of this [R6][R6::R6Class] class.
initialize = function() {
param_set = ps(
centers = p_uty(
tags = c("required", "train"), custom_check = check_centers
),
centers = p_uty(tags = c("required", "train"), custom_check = check_centers),
kernel = p_fct(
default = "rbfdot",
levels = c("vanilladot", "polydot", "rbfdot", "tanhdot", "laplacedot", "besseldot", "anovadot", "splinedot"),
Expand Down
4 changes: 1 addition & 3 deletions R/LearnerClustKMeans.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,7 @@ LearnerClustKMeans = R6Class("LearnerClustKMeans",
#' Creates a new instance of this [R6][R6::R6Class] class.
initialize = function() {
param_set = ps(
centers = p_uty(
tags = c("required", "train"), custom_check = check_centers
),
centers = p_uty(tags = c("required", "train"), custom_check = check_centers),
iter.max = p_int(1L, default = 10L, tags = "train"),
algorithm = p_fct(
levels = c("Hartigan-Wong", "Lloyd", "Forgy", "MacQueen"), default = "Hartigan-Wong", tags = "train"
Expand Down
32 changes: 16 additions & 16 deletions R/LearnerClustSimpleKMeans.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ LearnerClustSimpleKMeans = R6Class("LearnerClustSimpleKMeans",
#' Creates a new instance of this [R6][R6::R6Class] class.
initialize = function() {
param_set = ps(
A = p_uty(default = "weka.core.EuclideanDistance", tags = "train"),
C = p_lgl(default = FALSE, tags = "train"),
fast = p_lgl(default = FALSE, tags = "train"),
I = p_int(1L, default = 100L, tags = "train"),
init = p_int(0L, 3L, default = 0L, tags = "train"),
M = p_lgl(default = FALSE, tags = "train"),
max_candidates = p_int(1L, default = 100L, tags = "train"),
min_density = p_int(1L, default = 2L, tags = "train"),
N = p_int(1L, default = 2L, tags = "train"),
num_slots = p_int(1L, default = 1L, tags = "train"),
O = p_lgl(default = FALSE, tags = "train"),
periodic_pruning = p_int(1L, default = 10000L, tags = "train"),
S = p_int(0L, default = 10L, tags = "train"),
t2 = p_dbl(default = -1, tags = "train"),
t1 = p_dbl(default = -1.5, tags = "train"),
V = p_lgl(default = FALSE, tags = "train"),
A = p_uty(default = "weka.core.EuclideanDistance", tags = "train"),
C = p_lgl(default = FALSE, tags = "train"),
fast = p_lgl(default = FALSE, tags = "train"),
I = p_int(1L, default = 100L, tags = "train"),
init = p_int(0L, 3L, default = 0L, tags = "train"),
M = p_lgl(default = FALSE, tags = "train"),
max_candidates = p_int(1L, default = 100L, tags = "train"),
min_density = p_int(1L, default = 2L, tags = "train"),
N = p_int(1L, default = 2L, tags = "train"),
num_slots = p_int(1L, default = 1L, tags = "train"),
O = p_lgl(default = FALSE, tags = "train"),
periodic_pruning = p_int(1L, default = 10000L, tags = "train"),
S = p_int(0L, default = 10L, tags = "train"),
t2 = p_dbl(default = -1, tags = "train"),
t1 = p_dbl(default = -1.5, tags = "train"),
V = p_lgl(default = FALSE, tags = "train"),
output_debug_info = p_lgl(default = FALSE, tags = "train")
)

Expand Down
32 changes: 16 additions & 16 deletions R/LearnerClustXMeans.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,28 +16,28 @@
#' @export
#' @template seealso_learner
#' @template example
LearnerClustXMeans = R6Class("LearnerClustXMeans",
LearnerClustXMeans = R6Class( "LearnerClustXMeans",
inherit = LearnerClust,
public = list(
#' @description
#' Creates a new instance of this [R6][R6::R6Class] class.
initialize = function() {
param_set = ps(
B = p_dbl(0, default = 1, tags = "train"),
C = p_dbl(0, default = 0, tags = "train"),
D = p_uty(default = "weka.core.EuclideanDistance", tags = "train"),
H = p_int(1L, default = 4L, tags = "train"),
I = p_int(1L, default = 1L, tags = "train"),
J = p_int(1L, default = 1000L, tags = "train"),
K = p_uty(default = "", tags = "train"),
L = p_int(1L, default = 2L, tags = "train"),
M = p_int(1L, default = 1000L, tags = "train"),
S = p_int(1L, default = 10L, tags = "train"),
U = p_int(0L, default = 0L, tags = "train"),
use_kdtree = p_lgl(default = FALSE, tags = "train"),
N = p_uty(tags = "train"),
O = p_uty(tags = "train"),
Y = p_uty(tags = "train"),
B = p_dbl(0, default = 1, tags = "train"),
C = p_dbl(0, default = 0, tags = "train"),
D = p_uty(default = "weka.core.EuclideanDistance", tags = "train"),
H = p_int(1L, default = 4L, tags = "train"),
I = p_int(1L, default = 1L, tags = "train"),
J = p_int(1L, default = 1000L, tags = "train"),
K = p_uty(default = "", tags = "train"),
L = p_int(1L, default = 2L, tags = "train"),
M = p_int(1L, default = 1000L, tags = "train"),
S = p_int(1L, default = 10L, tags = "train"),
U = p_int(0L, default = 0L, tags = "train"),
use_kdtree = p_lgl(default = FALSE, tags = "train"),
N = p_uty(tags = "train"),
O = p_uty(tags = "train"),
Y = p_uty(tags = "train"),
output_debug_info = p_lgl(default = FALSE, tags = "train")
)

Expand Down
15 changes: 12 additions & 3 deletions R/MeasureClust.R
View file
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,18 @@ MeasureClust = R6Class("MeasureClust",
public = list(
#' @description
#' Creates a new instance of this [R6][R6::R6Class] class.
initialize = function(id, range, minimize = NA, aggregator = NULL, properties = character(),
predict_type = "partition", task_properties = character(),
packages = character(), label = NA_character_, man = NA_character_) {
initialize = function(
id,
range,
minimize = NA,
aggregator = NULL,
properties = character(),
predict_type = "partition",
task_properties = character(),
packages = character(),
label = NA_character_,
man = NA_character_
) {
super$initialize(
id = id,
task_type = "clust",
Expand Down

0 comments on commit e8c2880

Please sign in to comment.