Skip to content

Commit

Permalink
group_by now refers to names in "co2" (#601)
Browse files Browse the repository at this point in the history
  • Loading branch information
@maurolepore
maurolepore authored Nov 12, 2023
1 parent aead786 commit 6e68854
Show file tree
Hide file tree
Showing 8 changed files with 288 additions and 280 deletions.
2 changes: 1 addition & 1 deletion DESCRIPTION
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: tiltIndicator
Title: Indicators for the 'TILT' Project
Version: 0.0.0.9094
Version: 0.0.0.9095
Authors@R: c(
person("Mauro", "Lepore", , "[email protected]", role = c("aut", "cre"),
comment = c(ORCID = "https://orcid.org/0000-0002-1986-7988")),
Expand Down
10 changes: 10 additions & 0 deletions NEWS.md
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,15 @@
# tiltIndicator (development version)

<!-- NEWS.md is maintained by https://cynkra.github.io/fledge, do not edit -->

# tiltIndicator 0.0.0.9095

* The values of `grouped_by` are now less surprising (see related principle)
(#601). They now simply refer to the full name of the corresponding columns in
the "co2" dataset (products or inputs) passed to the `emissions_profile*()`
functions. For example, passing a column `products$tilt_sector` now yields the
value "tilt\_sector" in `group_by` -- which before got cropped to "tilt\_sec".

# tiltIndicator 0.0.0.9094

* The usage of `*rowid` columns is now documented and is more rigorous (#516):
Expand Down
18 changes: 9 additions & 9 deletions R/emissions_profile_any_add_values_to_categorize.R
View file
Original file line number Diff line number Diff line change
@@ -1,25 +1,25 @@
emissions_profile_any_add_values_to_categorize <- function(data) {
benchmarks <- set_names(epa_benchmarks(), flat_benchmarks())
benchmarks <- set_names(epa_benchmarks(data), flat_benchmarks(data))
map_df(benchmarks, ~ add_rank(data, .x), .id = "grouped_by")
}

rank_proportion <- function(x) {
rank(x) / length(x)
}

epa_benchmarks <- function() {
epa_benchmarks <- function(data) {
list(
"all",
"isic_sec",
"tilt_sec",
"unit",
c("unit", "isic_sec"),
c("unit", "tilt_sec")
extract_name(data, aka("isic")),
extract_name(data, aka("tsector")),
extract_name(data, aka("xunit")),
c(extract_name(data, aka("xunit")), extract_name(data, aka("isic"))),
c(extract_name(data, aka("xunit")), extract_name(data, aka("tsector")))
)
}

flat_benchmarks <- function() {
map_chr(epa_benchmarks(), ~ paste(.x, collapse = "_"))
flat_benchmarks <- function(data) {
map_chr(epa_benchmarks(data), ~ paste(.x, collapse = "_"))
}

add_rank <- function(data, .by) {
Expand Down
8 changes: 0 additions & 8 deletions R/rename_benchmark_columns.R
View file

This file was deleted.

3 changes: 1 addition & 2 deletions R/utils-co2.R
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
prepare_co2 <- function(data, low_threshold, high_threshold) {
data |>
mutate(low_threshold = low_threshold, high_threshold = high_threshold) |>
distinct() |>
rename_benchmark_columns()
distinct()
}

sanitize_co2 <- function(co2) {
Expand Down
260 changes: 130 additions & 130 deletions tests/testthat/_snaps/emissions_profile_any_at_company_level.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -136,136 +136,136 @@
129 vicquelin-espaces-verts_fra697272-00101
[[2]]
grouped_by
1 all
2 all
3 all
4 isic_sec
5 isic_sec
6 isic_sec
7 tilt_sec
8 tilt_sec
9 tilt_sec
10 unit
11 unit
12 unit
13 unit_isic_sec
14 unit_isic_sec
15 unit_isic_sec
16 unit_tilt_sec
17 unit_tilt_sec
18 unit_tilt_sec
19 <NA>
20 <NA>
21 <NA>
22 all
23 all
24 all
25 isic_sec
26 isic_sec
27 isic_sec
28 tilt_sec
29 tilt_sec
30 tilt_sec
31 unit
32 unit
33 unit
34 unit_isic_sec
35 unit_isic_sec
36 unit_isic_sec
37 unit_tilt_sec
38 unit_tilt_sec
39 unit_tilt_sec
40 all
41 all
42 all
43 isic_sec
44 isic_sec
45 isic_sec
46 tilt_sec
47 tilt_sec
48 tilt_sec
49 unit
50 unit
51 unit
52 unit_isic_sec
53 unit_isic_sec
54 unit_isic_sec
55 unit_tilt_sec
56 unit_tilt_sec
57 unit_tilt_sec
58 all
59 all
60 all
61 isic_sec
62 isic_sec
63 isic_sec
64 tilt_sec
65 tilt_sec
66 tilt_sec
67 unit
68 unit
69 unit
70 unit_isic_sec
71 unit_isic_sec
72 unit_isic_sec
73 unit_tilt_sec
74 unit_tilt_sec
75 unit_tilt_sec
76 all
77 all
78 all
79 isic_sec
80 isic_sec
81 isic_sec
82 tilt_sec
83 tilt_sec
84 tilt_sec
85 unit
86 unit
87 unit
88 unit_isic_sec
89 unit_isic_sec
90 unit_isic_sec
91 unit_tilt_sec
92 unit_tilt_sec
93 unit_tilt_sec
94 all
95 all
96 all
97 isic_sec
98 isic_sec
99 isic_sec
100 tilt_sec
101 tilt_sec
102 tilt_sec
103 unit
104 unit
105 unit
106 unit_isic_sec
107 unit_isic_sec
108 unit_isic_sec
109 unit_tilt_sec
110 unit_tilt_sec
111 unit_tilt_sec
112 all
113 all
114 all
115 isic_sec
116 isic_sec
117 isic_sec
118 tilt_sec
119 tilt_sec
120 tilt_sec
121 unit
122 unit
123 unit
124 unit_isic_sec
125 unit_isic_sec
126 unit_isic_sec
127 unit_tilt_sec
128 unit_tilt_sec
129 unit_tilt_sec
grouped_by
1 all
2 all
3 all
4 isic_4digit
5 isic_4digit
6 isic_4digit
7 tilt_sector
8 tilt_sector
9 tilt_sector
10 unit
11 unit
12 unit
13 unit_isic_4digit
14 unit_isic_4digit
15 unit_isic_4digit
16 unit_tilt_sector
17 unit_tilt_sector
18 unit_tilt_sector
19 <NA>
20 <NA>
21 <NA>
22 all
23 all
24 all
25 isic_4digit
26 isic_4digit
27 isic_4digit
28 tilt_sector
29 tilt_sector
30 tilt_sector
31 unit
32 unit
33 unit
34 unit_isic_4digit
35 unit_isic_4digit
36 unit_isic_4digit
37 unit_tilt_sector
38 unit_tilt_sector
39 unit_tilt_sector
40 all
41 all
42 all
43 isic_4digit
44 isic_4digit
45 isic_4digit
46 tilt_sector
47 tilt_sector
48 tilt_sector
49 unit
50 unit
51 unit
52 unit_isic_4digit
53 unit_isic_4digit
54 unit_isic_4digit
55 unit_tilt_sector
56 unit_tilt_sector
57 unit_tilt_sector
58 all
59 all
60 all
61 isic_4digit
62 isic_4digit
63 isic_4digit
64 tilt_sector
65 tilt_sector
66 tilt_sector
67 unit
68 unit
69 unit
70 unit_isic_4digit
71 unit_isic_4digit
72 unit_isic_4digit
73 unit_tilt_sector
74 unit_tilt_sector
75 unit_tilt_sector
76 all
77 all
78 all
79 isic_4digit
80 isic_4digit
81 isic_4digit
82 tilt_sector
83 tilt_sector
84 tilt_sector
85 unit
86 unit
87 unit
88 unit_isic_4digit
89 unit_isic_4digit
90 unit_isic_4digit
91 unit_tilt_sector
92 unit_tilt_sector
93 unit_tilt_sector
94 all
95 all
96 all
97 isic_4digit
98 isic_4digit
99 isic_4digit
100 tilt_sector
101 tilt_sector
102 tilt_sector
103 unit
104 unit
105 unit
106 unit_isic_4digit
107 unit_isic_4digit
108 unit_isic_4digit
109 unit_tilt_sector
110 unit_tilt_sector
111 unit_tilt_sector
112 all
113 all
114 all
115 isic_4digit
116 isic_4digit
117 isic_4digit
118 tilt_sector
119 tilt_sector
120 tilt_sector
121 unit
122 unit
123 unit
124 unit_isic_4digit
125 unit_isic_4digit
126 unit_isic_4digit
127 unit_tilt_sector
128 unit_tilt_sector
129 unit_tilt_sector
[[3]]
risk_category
Expand Down
Loading

0 comments on commit 6e68854

Please sign in to comment.