Skip to content

Commit

Permalink
Update energy dataset
Browse files Browse the repository at this point in the history
  • Loading branch information
jbengler committed Jan 9, 2025
1 parent 0de99ed commit 95df4dd
Show file tree
Hide file tree
Showing 43 changed files with 855 additions and 88 deletions.
14 changes: 11 additions & 3 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,17 @@
# tidyplots (development version)

## Breaking changes

* The `energy` dataset has been updated to contain the correct energy values in TWh. The variable `power` has been renamed to `energy`. This change will affect all code that uses the `energy` dataset.

## Bug fixes

* Fixed bug when combining `add_count_*()` with axis `limits` (#41).

## Improvements

* New color scheme `colors_discrete_rainbow` (@electrolars, #35).
* The function `save_plot()` gains the new argument `view_plot`
to control whether to view the plot on screen after saving (#40).
* Fixed a bug when combining counts with axis limits (#41).
* `save_plot()` gains `view_plot` argument to control whether to view the plot on screen after saving (#40).

# tidyplots 0.2.0

Expand Down
4 changes: 2 additions & 2 deletions R/add-misc.R
Original file line number Diff line number Diff line change
Expand Up @@ -212,11 +212,11 @@ add_curve_fit <- function(plot, dodge_width = NULL, method = "loess", linewidth
#'
#' @examples
#' energy %>%
#' tidyplot(x = power) %>%
#' tidyplot(x = energy) %>%
#' add_histogram()
#'
#' energy %>%
#' tidyplot(x = power, color = energy_type) %>%
#' tidyplot(x = energy, color = energy_type) %>%
#' add_histogram()
#'
#' @export
Expand Down
30 changes: 15 additions & 15 deletions R/add-proportional.R
Original file line number Diff line number Diff line change
Expand Up @@ -45,13 +45,13 @@ ff_pie <- function(.type = "pie") {
#' add_donut()
#'
#' # for a `sum` provide `color` and `y`
#' # `sum` of `power` in each `energy_type` category
#' # `sum` of `energy` in each `energy_type` category
#' energy %>%
#' tidyplot(y = power, color = energy_type) %>%
#' tidyplot(y = energy, color = energy_type) %>%
#' add_pie()
#'
#' energy %>%
#' tidyplot(y = power, color = energy_type) %>%
#' tidyplot(y = energy, color = energy_type) %>%
#' add_donut()
#'
#' @export
Expand Down Expand Up @@ -122,31 +122,31 @@ ff_barstack <- function(.position_fun) {
#' add_barstack_relative()
#'
#' # for a `sum` provide `color` and `y`
#' # `sum` of `power` in each `energy_type` category
#' # `sum` of `energy` in each `energy_type` category
#' energy %>%
#' tidyplot(y = power, color = energy_type) %>%
#' tidyplot(y = energy, color = energy_type) %>%
#' add_barstack_absolute()
#'
#' energy %>%
#' tidyplot(y = power, color = energy_type) %>%
#' tidyplot(y = energy, color = energy_type) %>%
#' add_barstack_relative()
#'
#' # Include variable on second axis
#' energy %>%
#' tidyplot(x = year, y = power, color = energy_type) %>%
#' tidyplot(x = year, y = energy, color = energy_type) %>%
#' add_barstack_absolute()
#'
#' energy %>%
#' tidyplot(x = year, y = power, color = energy_type) %>%
#' tidyplot(x = year, y = energy, color = energy_type) %>%
#' add_barstack_relative()
#'
#' # Flip x and y-axis
#' energy %>%
#' tidyplot(x = power, y = year, color = energy_type) %>%
#' tidyplot(x = energy, y = year, color = energy_type) %>%
#' add_barstack_absolute(orientation = "y")
#'
#' energy %>%
#' tidyplot(x = power, y = year, color = energy_type) %>%
#' tidyplot(x = energy, y = year, color = energy_type) %>%
#' add_barstack_relative(orientation = "y")
#'
#' @export
Expand Down Expand Up @@ -275,22 +275,22 @@ ff_areastack <- function(.position_fun) {
#' add_areastack_relative()
#'
#' # for a `sum` provide `x`, `y` and `color`
#' # `sum` of `power` in each `energy_type` category
#' # `sum` of `energy` in each `energy_type` category
#' energy %>%
#' tidyplot(x = year, y = power, color = energy_type) %>%
#' tidyplot(x = year, y = energy, color = energy_type) %>%
#' add_areastack_absolute()
#'
#' energy %>%
#' tidyplot(x = year, y = power, color = energy_type) %>%
#' tidyplot(x = year, y = energy, color = energy_type) %>%
#' add_areastack_relative()
#'
#' # Flip x and y-axis
#' energy %>%
#' tidyplot(x = power, y = year, color = energy_type) %>%
#' tidyplot(x = energy, y = year, color = energy_type) %>%
#' add_areastack_absolute(orientation = "y")
#'
#' energy %>%
#' tidyplot(x = power, y = year, color = energy_type) %>%
#' tidyplot(x = energy, y = year, color = energy_type) %>%
#' add_areastack_relative(orientation = "y")
#'
#' @export
Expand Down
4 changes: 2 additions & 2 deletions R/helpers.R
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ as_tidyplot <- function(gg, width = 50, height = 50, dodge_width = NULL) {
#' flip_plot()
#'
#' energy %>%
#' tidyplot(x = year, y = power, color = energy_type) %>%
#' tidyplot(x = year, y = energy, color = energy_type) %>%
#' add_barstack_absolute() %>%
#' flip_plot()
#'
Expand All @@ -109,7 +109,7 @@ as_tidyplot <- function(gg, width = 50, height = 50, dodge_width = NULL) {
#' add_sem_errorbar()
#'
#' energy %>%
#' tidyplot(x = power, y = year, color = energy_type) %>%
#' tidyplot(x = energy, y = year, color = energy_type) %>%
#' add_barstack_absolute(orientation = "y")
#'
#' @export
Expand Down
8 changes: 4 additions & 4 deletions R/plot.R
Original file line number Diff line number Diff line change
Expand Up @@ -89,27 +89,27 @@ tidyplot <- function(data, ..., width = 50, height = 50, dodge_width = NULL) {
#' # Before splitting
#' energy %>%
#' dplyr::filter(year %in% c(2005, 2010, 2015, 2020)) %>%
#' tidyplot(y = power, color = energy_source) %>%
#' tidyplot(y = energy, color = energy_source) %>%
#' add_donut()
#'
#' # Split by year
#' energy %>%
#' dplyr::filter(year %in% c(2005, 2010, 2015, 2020)) %>%
#' tidyplot(y = power, color = energy_source) %>%
#' tidyplot(y = energy, color = energy_source) %>%
#' add_donut() %>%
#' split_plot(by = year)
#'
#' # Change dimensions of subplots
#' energy %>%
#' dplyr::filter(year %in% c(2005, 2010, 2015, 2020)) %>%
#' tidyplot(y = power, color = energy_source) %>%
#' tidyplot(y = energy, color = energy_source) %>%
#' add_donut() %>%
#' split_plot(by = year, widths = 15, heights = 15)
#'
#' # Spread plots across multiple pages
#' energy %>%
#' dplyr::filter(year %in% c(2005, 2010, 2015, 2020)) %>%
#' tidyplot(y = power, color = energy_source) %>%
#' tidyplot(y = energy, color = energy_source) %>%
#' add_donut() %>%
#' split_plot(by = year, ncol = 2, nrow = 1)
#'
Expand Down
4 changes: 2 additions & 2 deletions README.Rmd
Original file line number Diff line number Diff line change
Expand Up @@ -57,14 +57,14 @@ study %>%

```{r}
energy %>%
tidyplot(x = year, y = power, color = energy_source) %>%
tidyplot(x = year, y = energy, color = energy_source) %>%
add_barstack_absolute()
```

```{r}
energy %>%
dplyr::filter(year %in% c(2005, 2010, 2015, 2020)) %>%
tidyplot(y = power, color = energy_source) %>%
tidyplot(y = energy, color = energy_source) %>%
add_donut() %>%
split_plot(by = year)
```
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ study %>%

``` r
energy %>%
tidyplot(x = year, y = power, color = energy_source) %>%
tidyplot(x = year, y = energy, color = energy_source) %>%
add_barstack_absolute()
```

Expand All @@ -61,7 +61,7 @@ energy %>%
``` r
energy %>%
dplyr::filter(year %in% c(2005, 2010, 2015, 2020)) %>%
tidyplot(y = power, color = energy_source) %>%
tidyplot(y = energy, color = energy_source) %>%
add_donut() %>%
split_plot(by = year)
```
Expand Down
32 changes: 26 additions & 6 deletions data-raw/energy.R
Original file line number Diff line number Diff line change
@@ -1,22 +1,42 @@
## code to prepare `energy` dataset goes here

library(tidyverse)
library(tidyplots)

# corrected version
read_single_file <- function(x) {
read_csv(x, comment = "#") %>%
pivot_longer(-Year, names_to = "energy_source", values_to = "energy") %>%
rename(year = Year)
}

energy <-
read_csv("data-raw/energy_total_year.csv") %>%
pivot_longer(-year, names_to = "energy_source", values_to = "power") %>%
list.files(path = "data-raw/energy_charts_download",
pattern = "in_20",
full.names = TRUE
) %>%
map(read_single_file) %>%
bind_rows() %>%
mutate(
energy_source = str_replace_all(energy_source, "Fossil.*gas", "Fossil gas"),
energy_source = str_replace_all(energy_source, "Solar.*", "Solar"),
energy_source = str_replace_all(energy_source, "Hydro.*", "Hydro"),
energy_source = str_replace_all(energy_source, "Waste.*", "Waste")
) %>%
tidyr::complete(year, energy_source, fill = list(energy = 0)) %>%
mutate(energy_type = case_when(
str_detect(energy_source, "Geo|Hydro|Wind|Bio|Solar") ~ "Renewable",
str_detect(energy_source, "Nuclear") ~ "Nuclear",
str_detect(energy_source, "Fossil") ~ "Fossil",
.default = "Other"
)) %>%
mutate(
power_unit = "GW",
energy_unit = "TWh",
energy_source = factor(energy_source),
energy_type = factor(energy_type)
) %>%
tidyr::replace_na(list(power = 0)) %>%
relocate(year, energy_source, energy_type, power, power_unit)
) %>%
relocate(year, energy_source, energy_type, energy, energy_unit)

usethis::use_data(energy, overwrite = TRUE)

# write_csv(energy, "electricity-generation-in-Germany.csv")
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2002,156.287,23.377,3.723,140.544,111.427,1.755,39.983,6.309,1.399,1.435,15.49,0.196
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2003,156.456,18.075,5.682,141.726,121.831,2.035,44.974,6.185,1.649,1.649,18.713,0.313
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2004,158.378,20.494,6.955,142.136,116.64,1.874,44.882,6.388,1.648,1.648,25.509,0.557
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2005,154.612,19.344,9.638,138.205,112.973,2.401,52.31,6.302,2.424,2.424,27.229,1.282
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2006,158.711,19.718,12.772,135.087,116.47,2.086,54.958,5.521,2.963,2.963,30.71,2.224
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2007,133.229,20.811,17.511,138.565,119.131,2.234,56.257,5.09,3.519,3.519,39.713,3.08
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2008,140.71,20.134,20.375,134.498,105.714,2.211,66.937,4.801,3.67,3.989,40.574,4.426
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2009,127.69,18.743,23.289,130.992,91.654,2.492,57.599,3.387,3.355,4.416,38.61,6.58
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2010,132.971,20.682,25.606,130.429,99.706,2.544,63.091,3.898,3.755,5.048,0.174,37.619,11.686
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2011,102.241,17.326,28.395,134.056,96.499,1.638,59.761,3.897,3.795,5.111,0.568,48.314,19.349
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2012,94.18,21.332,34.093,141.868,105.83,2.153,49.868,1.15,3.971,5.262,0.722,49.949,25.41
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Geothermal,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2013,92.127,22.66,35.788,145.122,110.724,0.987,39.584,0.069,0.24,4.305,5.244,0.905,50.803,28.79
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Geothermal,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2014,91.8,19.31,37.797,140.791,107.734,0.872,31.122,0.067,0.304,4.838,5.929,1.449,55.908,33.003
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil coal-derived gas,Fossil hard coal,Fossil oil,Fossil gas,Geothermal,Hydro water reservoir,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2015,86.765,18.057,39.899,139.371,1.176,106.208,1.748,28.947,0.091,0.608,2.349,4.565,5.575,8.162,70.922,35.21
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil coal-derived gas,Fossil hard coal,Fossil oil,Fossil gas,Geothermal,Hydro water reservoir,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2016,80.038,19.396,40.327,134.886,3.793,99.765,1.739,42.71,0.164,0.819,2.716,4.746,5.867,12.092,66.324,34.49
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil coal-derived gas,Fossil hard coal,Fossil oil,Fossil gas,Geothermal,Hydro water reservoir,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2017,72.155,19.378,40.327,133.983,3.767,81.724,1.766,45.189,0.157,0.607,4.839,4.802,5.876,17.414,86.293,35.431
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil coal-derived gas,Fossil hard coal,Fossil oil,Fossil gas,Geothermal,Hydro water reservoir,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2018,71.866,17.024,39.824,131.498,3.585,72.406,2.797,40.948,0.126,0.902,3.591,4.932,5.656,19.179,88.71,40.764
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil coal-derived gas,Fossil hard coal,Fossil oil,Fossil gas,Geothermal,Hydro water reservoir,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in,Solar other grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2019,70.992,18.647,40.129,101.924,1.954,49.503,3.972,50.945,0.144,1.31,3.328,4.626,5.399,24.379,99.166,41.342,0.323
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Geothermal,Hydro water reservoir,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in,Solar other grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2020,60.914,17.334,40.962,82.128,35.46,3.713,57.096,0.173,1.212,3.099,4.638,5.377,26.903,102.741,44.977,0.47
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Geothermal,Hydro water reservoir,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in,Solar other grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2021,65.444,18.305,40.575,99.37,46.662,3.214,51.796,0.174,1.178,2.892,4.575,5.261,24.015,88.034,44.206,1.105
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
Year,Nuclear,Hydro Run-of-River,Biomass,Fossil brown coal / lignite,Fossil hard coal,Fossil oil,Fossil gas,Geothermal,Hydro water reservoir,Others,Waste renewable,Waste non-renewable,Wind offshore,Wind onshore,Solar EEG grid feed-in,Solar other grid feed-in
#,Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh),Energy (TWh)
2022,32.765,16.334,39.413,105.944,55.444,2.788,45.164,0.152,1.124,2.303,4.436,5.007,24.752,97.738,53.055,1.273
Loading

0 comments on commit 95df4dd

Please sign in to comment.