Store extra variables as a list

R/AllClasses.R

@@ -49,7 +49,7 @@
 #' @slot singular_values A [`numeric`] vector giving the singular values.
 #' @slot rows A [`MultivariateResults-class`] object.
 #' @slot columns A [`MultivariateResults-class`] object.
-#' @slot extra A [`matrix`] of extra variables.
+#' @slot extra A [`list`] of extra variables.
 #' @section Subset:
 #'  In the code snippets below, `x` is a `MultivariateAnalysis` object.
 #'  \describe{
@@ -70,7 +70,7 @@
     singular_values = "numeric",
     rows = "MultivariateResults",
     columns = "MultivariateResults",
-    extra = "matrix"
+    extra = "list"
   ),
   contains = "VIRTUAL"
 )

R/mca.R

@@ -20,7 +20,7 @@ setMethod(
                                     sup_row = sup_row, sup_col = clean$sup)
 
     ## Add supplementary quantitative variables
-    if (!is.null(sup_quanti)) set_extra(results) <- as.matrix(clean$extra)
+    if (!is.null(clean$extra)) set_extra(results) <- clean$extra
 
     results
   }

R/mutators.R

@@ -29,7 +29,11 @@ has_extra <- function(x) {
   NROW(extra) > 0 && NCOL(extra) > 0
 }
 `set_extra<-` <- function(x, value) {
-  value <- value[get_order(x, margin = 1), , drop = FALSE]
+  value <- lapply(
+    X = value,
+    FUN = function(val, i) { val[i] },
+    i = get_order(x, margin = 1)
+  )
   x@extra <- value
   methods::validObject(x)
   x

R/pca.R

@@ -25,7 +25,7 @@ setMethod(
     )
 
     ## Add supplementary quantitative variables
-    if (!is.null(sup_quali)) set_extra(results) <- as.matrix(clean$extra)
+    if (!is.null(clean$extra)) set_extra(results) <- clean$extra
 
     results
   }