Skip to content

Commit de4ecbd

Browse files
jdhoffajdhoffa
authored
release: prepare 0.4.0 (#484)
1 parent ecda850 commit de4ecbd

File tree

3 files changed

+43
-46
lines changed

3 files changed

+43
-46
lines changed

‎NEWS.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
# r2dii.analysis (development version)
22

3-
* Completed deprecation of `ald` in favour of `abcd` (#466).
4-
3+
* `target_market_share` now outputs `target_*` value for all `year`s in `scenario` (#481).
4+
* Complete deprecation of `ald` in favour of `abcd` (#466).
55
* `target_market_share` now correctly handles input scenarios with a hyphen in their name (#425).
6-
76
* `target_market_share` now handles `abcd` with rows where `production` is `NA` by filling with `0` (#423).
87

98
# r2dii.analysis 0.3.0

‎README.md‎

Lines changed: 40 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -98,20 +98,20 @@ matched %>%
9898
scenario = scenario_demo_2020,
9999
region_isos = region_isos_demo
100100
)
101-
#> # A tibble: 792 × 10
101+
#> # A tibble: 1,076 × 10
102102
#> sector technology year region scenario_source metric production
103103
#> <chr> <chr> <int> <chr> <chr> <chr> <dbl>
104-
#> 1 automotive electric 2020 global demo_2020 projected 324592.
105-
#> 2 automotive electric 2020 global demo_2020 target_cps 324592.
106-
#> 3 automotive electric 2020 global demo_2020 target_sds 324592.
107-
#> 4 automotive electric 2020 global demo_2020 target_sps 324592.
108-
#> 5 automotive electric 2021 global demo_2020 projected 339656.
109-
#> 6 automotive electric 2021 global demo_2020 target_cps 329191.
110-
#> 7 automotive electric 2021 global demo_2020 target_sds 352505.
111-
#> 8 automotive electric 2021 global demo_2020 target_sps 330435.
112-
#> 9 automotive electric 2022 global demo_2020 projected 354720.
113-
#> 10 automotive electric 2022 global demo_2020 target_cps 333693.
114-
#> # ℹ 782 more rows
104+
#> 1 automotive electric 2020 global demo_2020 projected 145649.
105+
#> 2 automotive electric 2020 global demo_2020 target_cps 145649.
106+
#> 3 automotive electric 2020 global demo_2020 target_sds 145649.
107+
#> 4 automotive electric 2020 global demo_2020 target_sps 145649.
108+
#> 5 automotive electric 2021 global demo_2020 projected 147480.
109+
#> 6 automotive electric 2021 global demo_2020 target_cps 146915.
110+
#> 7 automotive electric 2021 global demo_2020 target_sds 153332.
111+
#> 8 automotive electric 2021 global demo_2020 target_sps 147258.
112+
#> 9 automotive electric 2022 global demo_2020 projected 149310.
113+
#> 10 automotive electric 2022 global demo_2020 target_cps 148155.
114+
#> # ℹ 1,066 more rows
115115
#> # ℹ 3 more variables: technology_share <dbl>, scope <chr>,
116116
#> # percentage_of_initial_production_by_scope <dbl>
117117
```
@@ -130,20 +130,20 @@ matched %>%
130130
#> This will result in company-level results, weighted by the portfolio
131131
#> loan size, which is rarely useful. Did you mean to set one of these
132132
#> arguments to `FALSE`?
133-
#> # A tibble: 12,140 × 11
133+
#> # A tibble: 14,505 × 11
134134
#> sector technology year region scenario_source name_abcd metric production
135135
#> <chr> <chr> <int> <chr> <chr> <chr> <chr> <dbl>
136-
#> 1 automoti… electric 2020 global demo_2020 Bernardi… proje… 324592.
137-
#> 2 automoti… electric 2020 global demo_2020 Bernardi… targe… 324592.
138-
#> 3 automoti… electric 2020 global demo_2020 Bernardi… targe… 324592.
139-
#> 4 automoti… electric 2020 global demo_2020 Bernardi… targe… 324592.
140-
#> 5 automoti… electric 2021 global demo_2020 Bernardi… proje… 339656.
141-
#> 6 automoti… electric 2021 global demo_2020 Bernardi… targe… 329191.
142-
#> 7 automoti… electric 2021 global demo_2020 Bernardi… targe… 352505.
143-
#> 8 automoti… electric 2021 global demo_2020 Bernardi… targe… 330435.
144-
#> 9 automoti… electric 2022 global demo_2020 Bernardi… proje… 354720.
145-
#> 10 automoti… electric 2022 global demo_2020 Bernardi… targe… 333693.
146-
#> # ℹ 12,130 more rows
136+
#> 1 automoti… electric 2020 global demo_2020 Bernardi… proje… 17951.
137+
#> 2 automoti… electric 2020 global demo_2020 Bernardi… targe… 17951.
138+
#> 3 automoti… electric 2020 global demo_2020 Bernardi… targe… 17951.
139+
#> 4 automoti… electric 2020 global demo_2020 Bernardi… targe… 17951.
140+
#> 5 automoti… electric 2020 global demo_2020 Christia… proje… 11471.
141+
#> 6 automoti… electric 2020 global demo_2020 Christia… targe… 11471.
142+
#> 7 automoti… electric 2020 global demo_2020 Christia… targe… 11471.
143+
#> 8 automoti… electric 2020 global demo_2020 Christia… targe… 11471.
144+
#> 9 automoti… electric 2020 global demo_2020 Donati, … proje… 5611.
145+
#> 10 automoti… electric 2020 global demo_2020 Donati, … targe… 5611.
146+
#> # ℹ 14,495 more rows
147147
#> # ℹ 3 more variables: technology_share <dbl>, scope <chr>,
148148
#> # percentage_of_initial_production_by_scope <dbl>
149149
```
@@ -172,7 +172,7 @@ loanbook_joined_to_abcd_scenario <- matched %>%
172172
# portfolio level
173173
loanbook_joined_to_abcd_scenario %>%
174174
summarize_weighted_production(scenario, tmsr, smsp, region)
175-
#> # A tibble: 306 × 9
175+
#> # A tibble: 756 × 9
176176
#> sector_abcd technology year scenario tmsr smsp region
177177
#> <chr> <chr> <int> <chr> <dbl> <dbl> <chr>
178178
#> 1 automotive electric 2020 cps 1 0 global
@@ -185,27 +185,27 @@ loanbook_joined_to_abcd_scenario %>%
185185
#> 8 automotive electric 2022 sds 1.32 0.0131 global
186186
#> 9 automotive electric 2022 sps 1.29 0.00273 global
187187
#> 10 automotive electric 2023 cps 1.35 0.00316 global
188-
#> # ℹ 296 more rows
188+
#> # ℹ 746 more rows
189189
#> # ℹ 2 more variables: weighted_production <dbl>,
190190
#> # weighted_technology_share <dbl>
191191

192192
# company level
193193
loanbook_joined_to_abcd_scenario %>%
194194
summarize_weighted_production(scenario, tmsr, smsp, region, name_abcd)
195-
#> # A tibble: 4,005 × 10
196-
#> sector_abcd technology year scenario tmsr smsp region name_abcd
197-
#> <chr> <chr> <int> <chr> <dbl> <dbl> <chr> <chr>
198-
#> 1 automotive electric 2020 cps 1 0 global Bernardi, Bernard…
199-
#> 2 automotive electric 2020 sds 1 0 global Bernardi, Bernard…
200-
#> 3 automotive electric 2020 sps 1 0 global Bernardi, Bernard…
201-
#> 4 automotive electric 2021 cps 1.12 0.00108 global Bernardi, Bernard…
202-
#> 5 automotive electric 2021 sds 1.16 0.00653 global Bernardi, Bernard…
203-
#> 6 automotive electric 2021 sps 1.14 0.00137 global Bernardi, Bernard…
204-
#> 7 automotive electric 2022 cps 1.24 0.00213 global Bernardi, Bernard…
205-
#> 8 automotive electric 2022 sds 1.32 0.0131 global Bernardi, Bernard…
206-
#> 9 automotive electric 2022 sps 1.29 0.00273 global Bernardi, Bernard…
207-
#> 10 automotive electric 2023 cps 1.35 0.00316 global Bernardi, Bernard…
208-
#> # ℹ 3,995 more rows
195+
#> # A tibble: 13,023 × 10
196+
#> sector_abcd technology year scenario tmsr smsp region name_abcd
197+
#> <chr> <chr> <int> <chr> <dbl> <dbl> <chr> <chr>
198+
#> 1 automotive electric 2020 cps 1 0 global Bernardi, Bernardi …
199+
#> 2 automotive electric 2020 cps 1 0 global Christiansen PLC
200+
#> 3 automotive electric 2020 cps 1 0 global Donati, Donati e Do…
201+
#> 4 automotive electric 2020 cps 1 0 global DuBuque-DuBuque
202+
#> 5 automotive electric 2020 cps 1 0 global Ferrari-Ferrari SPA
203+
#> 6 automotive electric 2020 cps 1 0 global Ferry and Sons
204+
#> 7 automotive electric 2020 cps 1 0 global Goyette-Goyette
205+
#> 8 automotive electric 2020 cps 1 0 global Guerra, Guerra e Gu…
206+
#> 9 automotive electric 2020 cps 1 0 global Gutkowski, Gutkowsk…
207+
#> 10 automotive electric 2020 cps 1 0 global Hilpert, Hilpert an…
208+
#> # ℹ 13,013 more rows
209209
#> # ℹ 2 more variables: weighted_production <dbl>,
210210
#> # weighted_technology_share <dbl>
211211
```

‎cran-comments.md‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
11
## R CMD check results
22

3-
0 errors | 0 warnings | 1 note
4-
5-
* Maintainer changed to Alex Axthelm while Jackson Hoffart is on extended leave.
3+
0 errors | 0 warnings | 0 notes

0 commit comments

Comments
 (0)