Move eta2 formatting to shiny

Author: juba

R/explor_multi.R

@@ -585,7 +585,8 @@ explor_multi_var_data <- function(input, output, session, res, settings) {
         if (settings()$has_var_eta2) {
             res()$vareta2 %>% filter(Type == "Active", Axis == input$vardim) %>%
                     select(all_of(settings()$vareta2_columns)) %>%
-                    arrange(eta2)
+                    arrange(eta2) %>%
+                    mutate(eta2 = format(eta2, scientific = FALSE, nsmall = 3, digits = 1))
         }
     })
     output$vartableeta2 <- DT::renderDT(
@@ -598,7 +599,8 @@ explor_multi_var_data <- function(input, output, session, res, settings) {
                                      Class == "Qualitative",
                                      Axis == input$vardim) %>%
                     select(all_of(settings()$varsupeta2_columns)) %>%
-                    arrange(eta2)
+                    arrange(eta2) %>%
+                    mutate(eta2 = format(eta2, scientific = FALSE, nsmall = 3, digits = 1))
         }
     })
     output$vartablesupeta2 <- DT::renderDT(

R/prepare_results_MCA.R

@@ -135,7 +135,6 @@ prepare_results.MCA <- function(obj) {
     vareta2 <- vareta2 %>%
         pivot_longer(names_to = "Axis", values_to = "eta2", starts_with("Dim.")) %>%
         mutate(Axis = gsub("Dim.", "", Axis, fixed = TRUE))
-    vareta2$eta2 <- format(vareta2$eta2, scientific = FALSE, nsmall = 3, digits = 1)
 
     ## Individuals coordinates
     ind <- data.frame(obj$ind$coord)

R/prepare_results_dudi_mca.R

@@ -92,7 +92,6 @@ prepare_results.acm <- function(obj) {
 
     vareta2 <- vareta2 %>% pivot_longer(names_to = "Axis", values_to = "eta2", starts_with("RS")) %>%
         mutate(Axis = gsub("RS", "", Axis, fixed = TRUE))
-    vareta2$eta2 <- format(vareta2$eta2, scientific = FALSE, nsmall = 3, digits = 1)
 
     ## Individuals coordinates
     ind <- obj$li

R/prepare_results_speMCA.R

@@ -91,7 +91,6 @@ prepare_results.speMCA <- function(obj) {
     vareta2 <- vareta2 %>%
         pivot_longer(names_to = "Axis", values_to = "eta2", starts_with("dim.")) %>%
         mutate(Axis = gsub("dim.", "", Axis, fixed = TRUE))
-    vareta2$eta2 <- format(vareta2$eta2, scientific = FALSE, nsmall = 3, digits = 1)
 
     ## Individuals coordinates
     ind <- data.frame(obj$ind$coord)

tests/testthat/test_prepare_results_MCA.R

@@ -18,7 +18,7 @@ test_that("Variables results are equal", {
                res$vars[res$vars$Type == "Active" & res$vars$Axis == "2", "Cos2"])
   expect_equal(as.vector(round(mca$var$contrib[,3],3)),
                res$vars[res$vars$Type == "Active" & res$vars$Axis == "3", "Contrib"])
-  expect_equal(as.vector(format(mca$var$eta2[,5], scientific = FALSE, nsmall = 3, digits = 1)),
+  expect_equal(as.vector(mca$var$eta2[,5]),
                data.frame(res$vareta2)[res$vareta2$Type == "Active" & 
                                          res$vareta2$Axis == "5", "eta2", drop = TRUE])
 })
@@ -33,7 +33,7 @@ test_that("Qualitative supplementary variables results are equal", {
   expect_equal(as.vector(round(mca$quali.sup$v.test[,3],2)),
                res$vars[res$vars$Type == "Supplementary" & 
                           res$vars$Class == "Qualitative" & res$vars$Axis == "3", "V.test"])
-  expect_equal(as.vector(format(mca$quali.sup$eta2[,2], scientific = FALSE, nsmall = 3, digits = 1)),
+  expect_equal(as.vector(mca$quali.sup$eta2[,2]),
                data.frame(res$vareta2)[res$vareta2$Type == "Supplementary" & 
                                          res$vareta2$Class == "Qualitative" &
                                          res$vareta2$Axis == "2", "eta2", drop = TRUE])

tests/testthat/test_prepare_results_dudi.acm.R

@@ -27,7 +27,7 @@ test_that("Variables results are equal", {
                res$vars[res$vars$Type == "Active" & res$vars$Axis == "2", "Cos2", drop = TRUE])
   expect_equal(as.vector(round(iner$col.abs[,3],3)),
                res$vars[res$vars$Type == "Active" & res$vars$Axis == "3", "Contrib", drop = TRUE])
-  expect_equal(as.vector(format(mca$cr[,5], scientific = FALSE, nsmall = 3, digits = 1)),
+  expect_equal(as.vector(mca$cr[,5]),
                data.frame(res$vareta2)[res$vareta2$Type == "Active" & 
                                          res$vareta2$Axis == "5", "eta2", drop = TRUE])
 })

tests/testthat/test_prepare_results_speMCA.R

@@ -19,7 +19,7 @@ test_that("Variables results are equal", {
                res$vars[res$vars$Type == "Active" & res$vars$Axis == "2", "Cos2"])
   expect_equal(as.vector(round(mca$var$contrib[,3],3)),
                res$vars[res$vars$Type == "Active" & res$vars$Axis == "3", "Contrib"])
-  expect_equal(as.vector(format(mca$var$eta2[,5], scientific = FALSE, nsmall = 3, digits = 1)),
+  expect_equal(as.vector(mca$var$eta2[,5]),
                data.frame(res$vareta2)[res$vareta2$Type == "Active" & 
                                          res$vareta2$Axis == "5", "eta2", drop = TRUE])
 })