Merge pull request #102 from rtemis-org/develop

Develop

Author: egenn

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: rtemis
-Version: 0.99.1000
+Version: 0.99.1005
 Title: Advanced Machine Learning and Visualization
-Date: 2025-10-18
+Date: 2025-11-25
 Authors@R: person(given = "E.D.", family = "Gennatas", role = c("aut", "cre"), email = "gennatas@gmail.com", comment = c(ORCID = "0000-0001-9280-3609"))
 Description: Advanced Machine Learning and Visualization for all.
 License: GPL (>= 3)

NAMESPACE

@@ -138,6 +138,7 @@ export(plot_true_pred.Regression)
 export(plot_true_pred.RegressionRes)
 export(plot_varimp)
 export(preprocess)
+export(preprocessed)
 export(present)
 export(present.list)
 export(previewcolor)
@@ -149,6 +150,7 @@ export(recycle)
 export(regression_metrics)
 export(repr)
 export(repr_S7name)
+export(repr_ls)
 export(resample)
 export(rnormmat)
 export(rt_reactable)
@@ -187,7 +189,6 @@ export(setup_TabNet)
 export(setup_UMAP)
 export(setup_tSNE)
 export(sge_submit)
-export(show_ls)
 export(size)
 export(sparsernorm)
 export(summarize)

R/00_S7_init.R

@@ -5,6 +5,8 @@
 # References
 # S7 generics: https://rconsortium.github.io/S7/articles/generics-methods.html
 
+# --- Generics -------------------------------------------------------------------------------------
+
 #' String representation
 #'
 #' @details
@@ -366,3 +368,14 @@ get_output_type <- function(
 
   match.arg(output_type)
 } # /rtemis::get_output_type
+
+
+#' Get preprocessed data from Preprocessor
+#'
+#' @param x Preprocessor: A Preprocessor object.
+#' @param ... Not used.
+#'
+#' @return data.frame: The preprocessed data.
+#'
+#' @export
+preprocessed <- new_generic("preprocessed", "x")

R/01_S7_Hyperparameters.R

@@ -23,7 +23,7 @@ TUNED_STATUS_TUNED <- 1L
 
 # `resampled` values ----
 # 0: Running on single training set.
-# 1: Running on cross-validated training sets.
+# 1: Running on resampled training sets.
 
 #' @title Hyperparameters
 #'
@@ -32,10 +32,11 @@ TUNED_STATUS_TUNED <- 1L
 #'
 #' @field algorithm Character: Algorithm name.
 #' @field hyperparameters Named list of algorithm hyperparameter values.
-#' @field tuned Integer: Tuning status.
-#' @field resampled Integer: Cross-validation status.
 #' @field tunable_hyperparameters Character: Names of tunable hyperparameters.
 #' @field fixed_hyperparameters Character: Names of fixed hyperparameters.
+#' @field tuned Integer: Tuning status.
+#' @field resampled Integer: Outer resampling status.
+#' @field n_workers Integer: Number of workers to use for tuning.
 #'
 #' @author EDG
 #' @noRd
@@ -140,7 +141,7 @@ method(repr, Hyperparameters) <- function(
   )
   out <- paste0(
     out,
-    show_ls(
+    repr_ls(
       props(x)[-1],
       pad = pad,
       maxlength = maxlength,

R/02_S7_Metrics.R

@@ -87,7 +87,7 @@ method(repr, RegressionMetrics) <- function(
   }
   out <- paste0(
     out,
-    show_ls(
+    repr_ls(
       x@metrics,
       print_class = FALSE,
       print_df = TRUE,
@@ -296,7 +296,7 @@ method(repr, MetricsRes) <- function(
   names(metricsl) <- names(x@mean_metrics)
   out <- paste0(
     out,
-    show_ls(
+    repr_ls(
       metricsl,
       print_class = FALSE,
       print_df = TRUE,

R/03_S7_Preprocessor.R

@@ -90,7 +90,7 @@ method(repr, PreprocessorConfig) <- function(
   output_type <- get_output_type(output_type)
   paste0(
     repr_S7name("PreprocessorConfig", pad = pad, output_type = output_type),
-    show_ls(props(x), pad = pad, limit = limit, output_type = output_type)
+    repr_ls(props(x), pad = pad, limit = limit, output_type = output_type)
   )
 } # /rtemis::show.PreprocessorConfig
 
@@ -350,7 +350,7 @@ method(repr, Preprocessor) <- function(
   output_type <- get_output_type(output_type)
   out <- paste0(
     repr_S7name("Preprocessor", pad = pad, output_type = output_type),
-    show_ls(props(x), pad = pad, print_df = print_df)
+    repr_ls(props(x), pad = pad, print_df = print_df)
   )
 } # /rtemis::show.Preprocessor
 
@@ -385,3 +385,8 @@ method(`[`, Preprocessor) <- function(x, name) {
 method(`[[`, Preprocessor) <- function(x, name) {
   props(x)[[name]]
 }
+
+# preprocessed.Preprocessor ----
+method(preprocessed, Preprocessor) <- function(x) {
+  x@preprocessed
+}

R/05_S7_Tuner.R

@@ -340,7 +340,7 @@ method(repr, GridSearch) <- function(
   )
   out <- paste(
     out,
-    show_ls(x@best_hyperparameters, output_type = output_type),
+    repr_ls(x@best_hyperparameters, output_type = output_type),
     sep = ""
   )
   out

R/06_S7_Supervised.R

@@ -2,7 +2,7 @@
 # ::rtemis::
 # 2025 EDG rtemis.org
 
-# Refs & Res
+# References
 # https://github.com/RConsortium/S7/
 # https://rconsortium.github.io/S7
 # https://rconsortium.github.io/S7/articles/classes-objects.html?q=computed#computed-properties
@@ -412,6 +412,7 @@ get_explain_fn <- function(algorithm) {
   paste0("explain_", algorithm)
 }
 
+
 # Explain Supervised ----
 #' Explain Supervised
 #'

R/08_S7_ClusteringConfig.R

@@ -53,7 +53,7 @@ method(repr, ClusteringConfig) <- function(
   )
   paste0(
     out,
-    show_ls(props(x)[["config"]], pad = pad, output_type = output_type)
+    repr_ls(props(x)[["config"]], pad = pad, output_type = output_type)
   )
 } # /show
 

R/09_S7_Clustering.R

@@ -57,7 +57,7 @@ method(repr, Clustering) <- function(
   output_type <- get_output_type(output_type)
   paste0(
     repr_S7name(paste(x$algorithm, "Clustering")),
-    show_ls(props(x)[-1], pad = pad, output_type = output_type)
+    repr_ls(props(x)[-1], pad = pad, output_type = output_type)
   )
 } # /rtemis::show.Clustering