fix: varsup and indsup renamed to supvar and supind in GDAtools

Author: juba

NEWS.md

@@ -1,5 +1,6 @@
 # explor (development version)
 
+- Fix varsup and indsup functions renamed to supvar and supind in GDAtools
 - Fix duplicated level names in supplementary variables in speMCA
 - Fix warnings in Font Awesome icon names (#39, thanks @jl5000)
 - Fix supplementary variables not displayed in individual plot for speMCA (thanks @419kfj)

R/utils.R

@@ -15,7 +15,7 @@
 speMCA_varsup <- function(mca, df) {
     if (!is.data.frame(df)) stop("df must be a data frame")
     res <- lapply(names(df), function(name) {
-        l <- GDAtools::varsup(mca, df[, name])
+        l <- GDAtools::supvar(mca, df[, name])
         l <- lapply(l, function(x) {
             if (is.data.frame(x)) {
                 rownames(x) <- paste(name, rownames(x), sep = "____")

tests/testthat/test_prepare_results_speMCA.R

@@ -3,7 +3,7 @@ context("prepare_results.speMCA")
 
 data(Music)
 mca <- GDAtools::speMCA(Music[3:nrow(Music), 1:4], excl = c(3, 6, 9, 12))
-mca$supi <- indsup(mca, Music[1:2, 1:4])
+mca$supi <- GDAtools::supind(mca, Music[1:2, 1:4])
 mca$supv <- speMCA_varsup(mca, Music[3:nrow(Music), 5:6])
 
 res <- prepare_results(mca)
@@ -56,11 +56,11 @@ test_that("Supplementary individuals results are equal", {
 
 test_that("Supplementary variables results are equal", {
   expect_equal(
-    round(GDAtools::varsup(mca, Music[3:nrow(Music), 5])$coord[, 1], 3),
+    round(GDAtools::supvar(mca, Music[3:nrow(Music), 5])$coord[, 1], 3),
     data.frame(res$vars)[res$vars$Type == "Supplementary" & res$vars$Variable == "Classical" & res$vars$Axis == "1", "Coord"]
   )
   expect_equal(
-    round(GDAtools::varsup(mca, Music[3:nrow(Music), 6])$cos2[, 2], 3),
+    round(GDAtools::supvar(mca, Music[3:nrow(Music), 6])$cos2[, 2], 3),
     data.frame(res$vars)[res$vars$Type == "Supplementary" & res$vars$Variable == "Gender" & res$vars$Axis == "2", "Cos2"]
   )
 })
@@ -73,4 +73,4 @@ test_that("Qualitative data are equal", {
     as.character(tmp[ids, "FrenchPop"]),
     as.character(Music[ids, "FrenchPop"])
   )
-})
+})