Skip to content

Commit

Permalink
Merge branch 'main' into data_rename_changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@rempsyc
rempsyc authored Dec 10, 2024
2 parents 68058f5 + 278d9f6 commit 3e40f40
Show file tree
Hide file tree
Showing 3 changed files with 113 additions and 58 deletions.
12 changes: 6 additions & 6 deletions DESCRIPTION
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,32 +7,32 @@ Authors@R:
family = "Makowski",
role = "aut",
email = "[email protected]",
comment = c(ORCID = "0000-0001-5375-9967", Twitter = "@Dom_Makowski")),
comment = c(ORCID = "0000-0001-5375-9967")),
person(given = "Daniel",
family = "Lüdecke",
role = "aut",
email = "[email protected]",
comment = c(ORCID = "0000-0002-8895-3206", Twitter = "@strengejacke")),
comment = c(ORCID = "0000-0002-8895-3206")),
person(given = "Indrajeet",
family = "Patil",
role = "aut",
email = "[email protected]",
comment = c(ORCID = "0000-0003-1995-6531", Twitter = "@patilindrajeets")),
comment = c(ORCID = "0000-0003-1995-6531")),
person(given = "Rémi",
family = "Thériault",
role = c("aut", "cre"),
email = "[email protected]",
comment = c(ORCID = "0000-0003-4315-6788", Twitter = "@rempsyc")),
comment = c(ORCID = "0000-0003-4315-6788")),
person(given = "Mattan S.",
family = "Ben-Shachar",
role = "aut",
email = "[email protected]",
comment = c(ORCID = "0000-0002-4287-4801", Twitter = "@mattansb")),
comment = c(ORCID = "0000-0002-4287-4801")),
person(given = "Brenton M.",
family = "Wiernik",
role = "aut",
email = "[email protected]",
comment = c(ORCID = "0000-0001-9560-6336", Twitter = "@bmwiernik")),
comment = c(ORCID = "0000-0001-9560-6336")),
person(given = "Rudolf",
family = "Siegel",
role = "ctb",
Expand Down
146 changes: 107 additions & 39 deletions tests/testthat/_snaps/windows/report_sample.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -187,13 +187,21 @@
Output
# Descriptive Statistics
Variable | 5 (n=31) | 6 (n=30) | 7 (n=31) | 8 (n=31) | 9 (n=30) | Total (n=153)
------------------------------------------------------------------------------------------------------------------------
Mean Ozone (SD) | 23.62 (22.22) | 29.44 (18.21) | 59.12 (31.64) | 59.96 (39.68) | 31.45 (24.14) | 42.13 (32.99)
Mean Solar.R (SD) | 181.30 (115.08) | 190.17 (92.88) | 216.48 (80.57) | 171.86 (76.83) | 167.43 (79.12) | 185.93 (90.06)
Mean Wind (SD) | 11.62 (3.53) | 10.27 (3.77) | 8.94 (3.04) | 8.79 (3.23) | 10.18 (3.46) | 9.96 (3.52)
Mean Temp (SD) | 65.55 (6.85) | 79.10 (6.60) | 83.90 (4.32) | 83.97 (6.59) | 76.90 (8.36) | 77.88 (9.47)
Mean Day (SD) | 16.00 (9.09) | 15.50 (8.80) | 16.00 (9.09) | 16.00 (9.09) | 15.50 (8.80) | 15.80 (8.86)
Variable | 5 (n=31) | 6 (n=30) | 7 (n=31)
---------------------------------------------------------------------
Mean Ozone (SD) | 23.62 (22.22) | 29.44 (18.21) | 59.12 (31.64)
Mean Solar.R (SD) | 181.30 (115.08) | 190.17 (92.88) | 216.48 (80.57)
Mean Wind (SD) | 11.62 (3.53) | 10.27 (3.77) | 8.94 (3.04)
Mean Temp (SD) | 65.55 (6.85) | 79.10 (6.60) | 83.90 (4.32)
Mean Day (SD) | 16.00 (9.09) | 15.50 (8.80) | 16.00 (9.09)
Variable | 8 (n=31) | 9 (n=30) | Total (n=153)
--------------------------------------------------------------------
Mean Ozone (SD) | 59.96 (39.68) | 31.45 (24.14) | 42.13 (32.99)
Mean Solar.R (SD) | 171.86 (76.83) | 167.43 (79.12) | 185.93 (90.06)
Mean Wind (SD) | 8.79 (3.23) | 10.18 (3.46) | 9.96 (3.52)
Mean Temp (SD) | 83.97 (6.59) | 76.90 (8.36) | 77.88 (9.47)
Mean Day (SD) | 16.00 (9.09) | 15.50 (8.80) | 15.80 (8.86)

---

Expand Down Expand Up @@ -460,13 +468,21 @@
Output
# Descriptive Statistics
Variable | 5 (n=31) | 6 (n=30) | 7 (n=31) | 8 (n=31) | 9 (n=30) | Total (n=153)
------------------------------------------------------------------------------------------------------------------------
Mean Ozone (SD) | 23.62 (22.22) | 29.44 (18.21) | 59.12 (31.64) | 59.96 (39.68) | 31.45 (24.14) | 42.13 (32.99)
Mean Solar.R (SD) | 181.30 (115.08) | 190.17 (92.88) | 216.48 (80.57) | 171.86 (76.83) | 167.43 (79.12) | 185.93 (90.06)
Mean Wind (SD) | 11.62 (3.53) | 10.27 (3.77) | 8.94 (3.04) | 8.79 (3.23) | 10.18 (3.46) | 9.96 (3.52)
Mean Temp (SD) | 65.55 (6.85) | 79.10 (6.60) | 83.90 (4.32) | 83.97 (6.59) | 76.90 (8.36) | 77.88 (9.47)
Mean Day (SD) | 16.00 (9.09) | 15.50 (8.80) | 16.00 (9.09) | 16.00 (9.09) | 15.50 (8.80) | 15.80 (8.86)
Variable | 5 (n=31) | 6 (n=30) | 7 (n=31)
---------------------------------------------------------------------
Mean Ozone (SD) | 23.62 (22.22) | 29.44 (18.21) | 59.12 (31.64)
Mean Solar.R (SD) | 181.30 (115.08) | 190.17 (92.88) | 216.48 (80.57)
Mean Wind (SD) | 11.62 (3.53) | 10.27 (3.77) | 8.94 (3.04)
Mean Temp (SD) | 65.55 (6.85) | 79.10 (6.60) | 83.90 (4.32)
Mean Day (SD) | 16.00 (9.09) | 15.50 (8.80) | 16.00 (9.09)
Variable | 8 (n=31) | 9 (n=30) | Total (n=153)
--------------------------------------------------------------------
Mean Ozone (SD) | 59.96 (39.68) | 31.45 (24.14) | 42.13 (32.99)
Mean Solar.R (SD) | 171.86 (76.83) | 167.43 (79.12) | 185.93 (90.06)
Mean Wind (SD) | 8.79 (3.23) | 10.18 (3.46) | 9.96 (3.52)
Mean Temp (SD) | 83.97 (6.59) | 76.90 (8.36) | 77.88 (9.47)
Mean Day (SD) | 16.00 (9.09) | 15.50 (8.80) | 15.80 (8.86)

---

Expand All @@ -475,13 +491,21 @@
Output
# Descriptive Statistics
Variable | 5 (n=31) | 6 (n=30) | 7 (n=31) | 8 (n=31) | 9 (n=30) (n=153)
---------------------------------------------------------------------------------------------------------
Mean Ozone (SD) | 23.62 (22.22) | 29.44 (18.21) | 59.12 (31.64) | 59.96 (39.68) | 31.45 (24.14)
Mean Solar.R (SD) | 181.30 (115.08) | 190.17 (92.88) | 216.48 (80.57) | 171.86 (76.83) | 167.43 (79.12)
Mean Wind (SD) | 11.62 (3.53) | 10.27 (3.77) | 8.94 (3.04) | 8.79 (3.23) | 10.18 (3.46)
Mean Temp (SD) | 65.55 (6.85) | 79.10 (6.60) | 83.90 (4.32) | 83.97 (6.59) | 76.90 (8.36)
Mean Day (SD) | 16.00 (9.09) | 15.50 (8.80) | 16.00 (9.09) | 16.00 (9.09) | 15.50 (8.80)
Variable | 5 (n=31) | 6 (n=30) | 7 (n=31)
---------------------------------------------------------------------
Mean Ozone (SD) | 23.62 (22.22) | 29.44 (18.21) | 59.12 (31.64)
Mean Solar.R (SD) | 181.30 (115.08) | 190.17 (92.88) | 216.48 (80.57)
Mean Wind (SD) | 11.62 (3.53) | 10.27 (3.77) | 8.94 (3.04)
Mean Temp (SD) | 65.55 (6.85) | 79.10 (6.60) | 83.90 (4.32)
Mean Day (SD) | 16.00 (9.09) | 15.50 (8.80) | 16.00 (9.09)
Variable | 8 (n=31) | 9 (n=30) (n=153)
-----------------------------------------------------
Mean Ozone (SD) | 59.96 (39.68) | 31.45 (24.14)
Mean Solar.R (SD) | 171.86 (76.83) | 167.43 (79.12)
Mean Wind (SD) | 8.79 (3.23) | 10.18 (3.46)
Mean Temp (SD) | 83.97 (6.59) | 76.90 (8.36)
Mean Day (SD) | 16.00 (9.09) | 15.50 (8.80)

---

Expand All @@ -490,13 +514,21 @@
Output
# Descriptive Statistics
Variable | 5 (n=31) | 6 (n=30) | 7 (n=31) | 8 (n=31) | 9 (n=30) (n=153)
------------------------------------------------------------------------------------------------------------------------------
Mean Ozone (SD), n | 23.62 (22.22), 26 | 29.44 (18.21), 9 | 59.12 (31.64), 26 | 59.96 (39.68), 26 | 31.45 (24.14), 29
Mean Solar.R (SD), n | 181.30 (115.08), 27 | 190.17 (92.88), 30 | 216.48 (80.57), 31 | 171.86 (76.83), 28 | 167.43 (79.12), 30
Mean Wind (SD), n | 11.62 (3.53), 31 | 10.27 (3.77), 30 | 8.94 (3.04), 31 | 8.79 (3.23), 31 | 10.18 (3.46), 30
Mean Temp (SD), n | 65.55 (6.85), 31 | 79.10 (6.60), 30 | 83.90 (4.32), 31 | 83.97 (6.59), 31 | 76.90 (8.36), 30
Mean Day (SD), n | 16.00 (9.09), 31 | 15.50 (8.80), 30 | 16.00 (9.09), 31 | 16.00 (9.09), 31 | 15.50 (8.80), 30
Variable | 5 (n=31) | 6 (n=30)
---------------------------------------------------------------
Mean Ozone (SD), n | 23.62 (22.22), 26 | 29.44 (18.21), 9
Mean Solar.R (SD), n | 181.30 (115.08), 27 | 190.17 (92.88), 30
Mean Wind (SD), n | 11.62 (3.53), 31 | 10.27 (3.77), 30
Mean Temp (SD), n | 65.55 (6.85), 31 | 79.10 (6.60), 30
Mean Day (SD), n | 16.00 (9.09), 31 | 15.50 (8.80), 30
Variable | 7 (n=31) | 8 (n=31) | 9 (n=30) (n=153)
-----------------------------------------------------------------------------------
Mean Ozone (SD), n | 59.12 (31.64), 26 | 59.96 (39.68), 26 | 31.45 (24.14), 29
Mean Solar.R (SD), n | 216.48 (80.57), 31 | 171.86 (76.83), 28 | 167.43 (79.12), 30
Mean Wind (SD), n | 8.94 (3.04), 31 | 8.79 (3.23), 31 | 10.18 (3.46), 30
Mean Temp (SD), n | 83.90 (4.32), 31 | 83.97 (6.59), 31 | 76.90 (8.36), 30
Mean Day (SD), n | 16.00 (9.09), 31 | 16.00 (9.09), 31 | 15.50 (8.80), 30

---

Expand All @@ -505,13 +537,29 @@
Output
# Descriptive Statistics
Variable | 5 (n=31) | 6 (n=30) | 7 (n=31) | 8 (n=31) | 9 (n=30) | Total (n=153)
----------------------------------------------------------------------------------------------------------------------------------------------------
Mean Ozone (SD), n | 23.62 (22.22), 26 | 29.44 (18.21), 9 | 59.12 (31.64), 26 | 59.96 (39.68), 26 | 31.45 (24.14), 29 | 42.13 (32.99), 116
Mean Solar.R (SD), n | 181.30 (115.08), 27 | 190.17 (92.88), 30 | 216.48 (80.57), 31 | 171.86 (76.83), 28 | 167.43 (79.12), 30 | 185.93 (90.06), 146
Mean Wind (SD), n | 11.62 (3.53), 31 | 10.27 (3.77), 30 | 8.94 (3.04), 31 | 8.79 (3.23), 31 | 10.18 (3.46), 30 | 9.96 (3.52), 153
Mean Temp (SD), n | 65.55 (6.85), 31 | 79.10 (6.60), 30 | 83.90 (4.32), 31 | 83.97 (6.59), 31 | 76.90 (8.36), 30 | 77.88 (9.47), 153
Mean Day (SD), n | 16.00 (9.09), 31 | 15.50 (8.80), 30 | 16.00 (9.09), 31 | 16.00 (9.09), 31 | 15.50 (8.80), 30 | 15.80 (8.86), 153
Variable | 5 (n=31) | 6 (n=30)
---------------------------------------------------------------
Mean Ozone (SD), n | 23.62 (22.22), 26 | 29.44 (18.21), 9
Mean Solar.R (SD), n | 181.30 (115.08), 27 | 190.17 (92.88), 30
Mean Wind (SD), n | 11.62 (3.53), 31 | 10.27 (3.77), 30
Mean Temp (SD), n | 65.55 (6.85), 31 | 79.10 (6.60), 30
Mean Day (SD), n | 16.00 (9.09), 31 | 15.50 (8.80), 30
Variable | 7 (n=31) | 8 (n=31)
--------------------------------------------------------------
Mean Ozone (SD), n | 59.12 (31.64), 26 | 59.96 (39.68), 26
Mean Solar.R (SD), n | 216.48 (80.57), 31 | 171.86 (76.83), 28
Mean Wind (SD), n | 8.94 (3.04), 31 | 8.79 (3.23), 31
Mean Temp (SD), n | 83.90 (4.32), 31 | 83.97 (6.59), 31
Mean Day (SD), n | 16.00 (9.09), 31 | 16.00 (9.09), 31
Variable | 9 (n=30) | Total (n=153)
---------------------------------------------------------------
Mean Ozone (SD), n | 31.45 (24.14), 29 | 42.13 (32.99), 116
Mean Solar.R (SD), n | 167.43 (79.12), 30 | 185.93 (90.06), 146
Mean Wind (SD), n | 10.18 (3.46), 30 | 9.96 (3.52), 153
Mean Temp (SD), n | 76.90 (8.36), 30 | 77.88 (9.47), 153
Mean Day (SD), n | 15.50 (8.80), 30 | 15.80 (8.86), 153

# report_sample digits

Expand Down Expand Up @@ -625,10 +673,30 @@
Output
# Descriptive Statistics
Variable | setosa, a (n=16) | versicolor, a (n=17) | virginica, a (n=9) | setosa, b (n=15) | versicolor, b (n=17) | virginica, b (n=22) | setosa, c (n=19) | versicolor, c (n=16) | virginica, c (n=19) | Total (n=150)
-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
Mean Sepal.Length (SD) | 5.13 (0.36) | 6.08 (0.48) | 6.59 (0.44) | 4.91 (0.31) | 5.84 (0.54) | 6.77 (0.63) | 4.97 (0.36) | 5.88 (0.53) | 6.38 (0.69) | 5.84 (0.83)
Mean Sepal.Width (SD) | 3.50 (0.42) | 2.76 (0.40) | 3.02 (0.25) | 3.34 (0.25) | 2.81 (0.25) | 3.05 (0.36) | 3.44 (0.43) | 2.74 (0.29) | 2.87 (0.30) | 3.06 (0.44)
Variable | setosa, a (n=16) | versicolor, a (n=17)
----------------------------------------------------------------
Mean Sepal.Length (SD) | 5.13 (0.36) | 6.08 (0.48)
Mean Sepal.Width (SD) | 3.50 (0.42) | 2.76 (0.40)
Variable | virginica, a (n=9) | setosa, b (n=15)
--------------------------------------------------------------
Mean Sepal.Length (SD) | 6.59 (0.44) | 4.91 (0.31)
Mean Sepal.Width (SD) | 3.02 (0.25) | 3.34 (0.25)
Variable | versicolor, b (n=17) | virginica, b (n=22)
-------------------------------------------------------------------
Mean Sepal.Length (SD) | 5.84 (0.54) | 6.77 (0.63)
Mean Sepal.Width (SD) | 2.81 (0.25) | 3.05 (0.36)
Variable | setosa, c (n=19) | versicolor, c (n=16)
----------------------------------------------------------------
Mean Sepal.Length (SD) | 4.97 (0.36) | 5.88 (0.53)
Mean Sepal.Width (SD) | 3.44 (0.43) | 2.74 (0.29)
Variable | virginica, c (n=19) | Total (n=150)
------------------------------------------------------------
Mean Sepal.Length (SD) | 6.38 (0.69) | 5.84 (0.83)
Mean Sepal.Width (SD) | 2.87 (0.30) | 3.06 (0.44)

# report_sample, print vertical

Expand Down
13 changes: 0 additions & 13 deletions tests/testthat/helper-state.R
View file

This file was deleted.

0 comments on commit 3e40f40

Please sign in to comment.