degroup() for cross-classified data (#521)

* degroup() for cross-classified data Fixes #520 * draft * fix * comment * add tests * news * newslione * wordlist * checks * better message * styler complains * review comments * fix * update snapshots * docs * add experimental feature * warning * remove note * fix * add test for nested structures * test warning * remove code for nested structure * docs --------- Co-authored-by: Etienne Bacher <[email protected]>
easystats · Jul 1, 2024 · 8658c8a · 8658c8a
1 parent 8d120c8
commit 8658c8a
Show file tree

Hide file tree

Showing 8 changed files with 464 additions and 244 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: datawizard
 Title: Easy Data Wrangling and Statistical Transformations
-Version: 0.11.0.4
+Version: 0.11.0.5
 Authors@R: c(
     person("Indrajeet", "Patil", , "[email protected]", role = "aut",
            comment = c(ORCID = "0000-0003-1995-6531", Twitter = "@patilindrajeets")),

diff --git a/NEWS.md b/NEWS.md
@@ -21,6 +21,10 @@ CHANGES
   frame, where the first column contains name of the variable for which
   frequencies were calculated, and the second column contains the frequency table.
 
+* `demean()` (and `degroup()`) now also work for cross-classified designs, or
+  more generally, for data with multiple grouping or cluster variables (i.e.
+  `by` can now specify more than one variable).
+
 # datawizard 0.11.0
 
 BREAKING CHANGES

diff --git a/R/demean.R b/R/demean.R
diff --git a/inst/WORDLIST b/inst/WORDLIST
@@ -6,6 +6,8 @@ CMD
 Carle
 Catran
 Crosstables
+Dhaliwal
+Disaggregating
 DOI
 De
 Dom
@@ -16,6 +18,7 @@ GLMM
 Gelman
 Giesecke
 Giesselmann
+Guo
 Heisig
 Herrington
 Hoffmann
@@ -79,6 +82,7 @@ midhinge
 modelbased
 modelling
 nd
+panelr
 partialization
 patilindrajeets
 platykurtic

diff --git a/man/demean.Rd b/man/demean.Rd
diff --git a/tests/testthat/_snaps/demean.md b/tests/testthat/_snaps/demean.md
@@ -23,27 +23,27 @@
     Code
       head(x)
     Output
-        Sepal.Length_between Species_between binary_between Species_setosa_between
-      1             5.925000        0.850000          0.375              0.4250000
-      2             5.925000        0.850000          0.375              0.4250000
-      3             5.925000        0.850000          0.375              0.4250000
-      4             5.862222        1.133333          0.400              0.2888889
-      5             5.925000        0.850000          0.375              0.4250000
-      6             5.862222        1.133333          0.400              0.2888889
+        Sepal.Length_between binary_between Species_between Species_setosa_between
+      1             5.925000          0.375        0.850000              0.4250000
+      2             5.925000          0.375        0.850000              0.4250000
+      3             5.925000          0.375        0.850000              0.4250000
+      4             5.862222          0.400        1.133333              0.2888889
+      5             5.925000          0.375        0.850000              0.4250000
+      6             5.862222          0.400        1.133333              0.2888889
         Species_versicolor_between Species_virginica_between Sepal.Length_within
       1                  0.3000000                 0.2750000          -0.8250000
       2                  0.3000000                 0.2750000          -1.0250000
       3                  0.3000000                 0.2750000          -1.2250000
       4                  0.2888889                 0.4222222          -1.2622222
       5                  0.3000000                 0.2750000          -0.9250000
       6                  0.2888889                 0.4222222          -0.4622222
-        Species_within binary_within Species_setosa_within Species_versicolor_within
-      1      -0.850000        -0.375             0.5750000                -0.3000000
-      2      -0.850000         0.625             0.5750000                -0.3000000
-      3      -0.850000        -0.375             0.5750000                -0.3000000
-      4      -1.133333         0.600             0.7111111                -0.2888889
-      5      -0.850000         0.625             0.5750000                -0.3000000
-      6      -1.133333        -0.400             0.7111111                -0.2888889
+        binary_within Species_within Species_setosa_within Species_versicolor_within
+      1        -0.375      -0.850000             0.5750000                -0.3000000
+      2         0.625      -0.850000             0.5750000                -0.3000000
+      3        -0.375      -0.850000             0.5750000                -0.3000000
+      4         0.600      -1.133333             0.7111111                -0.2888889
+      5         0.625      -0.850000             0.5750000                -0.3000000
+      6        -0.400      -1.133333             0.7111111                -0.2888889
         Species_virginica_within
       1               -0.2750000
       2               -0.2750000

diff --git a/tests/testthat/test-center.R b/tests/testthat/test-center.R
@@ -169,8 +169,7 @@ test_that("center, factors (grouped data)", {
     poorman::ungroup() %>%
     poorman::pull(Species)
 
-  manual <- iris %>%
-    poorman::pull(Species)
+  manual <- poorman::pull(iris, Species)
 
   expect_identical(datawizard, manual)
 })