Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
110 commits
Select commit Hold shift + click to select a range
f4eb327
Test revision in typologies
AliceBeckmann Jul 17, 2025
ca205b0
Test revision in typologies
AliceBeckmann Jul 17, 2025
62a1c73
Getting Typologies_Josette file back
AliceBeckmann Jul 17, 2025
1a2c189
Getting Typologies_Josette file back
AliceBeckmann Jul 17, 2025
9a506aa
Use of devtools::document
AliceBeckmann Jul 17, 2025
0766c7d
Use of devtools::document
AliceBeckmann Jul 17, 2025
1d40f29
Adding plot code for N input shares by typology
AliceBeckmann Jul 22, 2025
91b5907
Adding plot code for N input shares by typology
AliceBeckmann Jul 22, 2025
2daf52f
Move typology files to typology branch
AliceBeckmann Sep 12, 2025
74074be
Move typology files to typology branch
AliceBeckmann Sep 12, 2025
21966e1
Merge branch 'alice/model-grafs-spain' into alice/typologies
AliceBeckmann Sep 12, 2025
2ba0c03
Merge branch 'alice/model-grafs-spain' into alice/typologies
AliceBeckmann Sep 12, 2025
eba5da2
added variables to utils
AliceBeckmann Sep 15, 2025
e9bb774
added variables to utils
AliceBeckmann Sep 15, 2025
76ebf05
resolved conflicts and revised whep_typologies_spain
AliceBeckmann Sep 15, 2025
6c51d9e
resolved conflicts and revised whep_typologies_spain
AliceBeckmann Sep 15, 2025
e02fdf3
resolved conflicts and revised whep_typologies_spain
AliceBeckmann Sep 15, 2025
d302415
resolved conflicts and revised whep_typologies_spain
AliceBeckmann Sep 15, 2025
a8e4bda
Merge remote-tracking branch 'origin/main' into alice/typologies
AliceBeckmann Sep 15, 2025
2ef1d42
Merge remote-tracking branch 'origin/main' into alice/typologies
AliceBeckmann Sep 15, 2025
1e3610f
Resolve conflicts
AliceBeckmann Sep 15, 2025
23d8fc2
Resolve conflicts
AliceBeckmann Sep 15, 2025
16b778b
deleted grafs_plot_df.R
AliceBeckmann Sep 15, 2025
a76a4f1
deleted grafs_plot_df.R
AliceBeckmann Sep 15, 2025
7055bf8
merged files
AliceBeckmann Sep 15, 2025
fd59b74
merged files
AliceBeckmann Sep 15, 2025
5faf4a5
fixed style
AliceBeckmann Sep 15, 2025
a698f56
fixed style
AliceBeckmann Sep 15, 2025
cfa6b77
fixed pkgdown.yml
AliceBeckmann Sep 15, 2025
03f2914
fixed pkgdown.yml
AliceBeckmann Sep 15, 2025
7944646
changed n soil inputs manure
AliceBeckmann Nov 10, 2025
62176f7
changed n soil inputs manure
AliceBeckmann Nov 10, 2025
b29cd09
revised test
AliceBeckmann Nov 10, 2025
6eb7bbd
revised test
AliceBeckmann Nov 10, 2025
bcf37ee
creating spain typology script and maps
AliceBeckmann Nov 11, 2025
761a30e
creating spain typology script and maps
AliceBeckmann Nov 11, 2025
d25b011
Merge branch 'alice/model-grafs-spain' into alice/typologies
AliceBeckmann Nov 11, 2025
e89bc17
Merge branch 'alice/model-grafs-spain' into alice/typologies
AliceBeckmann Nov 11, 2025
ae6a16c
Resolve merge conflicts
AliceBeckmann Nov 11, 2025
e8e59f6
Resolve merge conflicts
AliceBeckmann Nov 11, 2025
5a0dde3
Fix merge conflicts
lbm364dl Nov 11, 2025
dcba3f5
Fix merge conflicts
lbm364dl Nov 11, 2025
e144824
Resolve merge conflicts
AliceBeckmann Nov 11, 2025
1ee30db
Resolve merge conflicts
AliceBeckmann Nov 11, 2025
3707277
Remove old test part from merge
lbm364dl Nov 11, 2025
d5d2234
Remove old test part from merge
lbm364dl Nov 11, 2025
8819378
Merge branch 'alice/typologies' of https://github.com/eduaguilera/WHE…
AliceBeckmann Nov 11, 2025
8214693
Merge branch 'alice/typologies' of https://github.com/eduaguilera/WHE…
AliceBeckmann Nov 11, 2025
4188d40
Fix column duplicates
lbm364dl Nov 11, 2025
0a82a5f
Fix column duplicates
lbm364dl Nov 11, 2025
f2cfb7c
Resolve merge conflicts
AliceBeckmann Nov 11, 2025
f59d640
Resolve merge conflicts
AliceBeckmann Nov 11, 2025
9c5debc
Changing tests
AliceBeckmann Nov 12, 2025
67c1e27
Changing tests
AliceBeckmann Nov 12, 2025
c0df4ee
creating spain typology script and maps for 9 benchmark years
AliceBeckmann Nov 14, 2025
0f98890
creating spain typology script and maps for 9 benchmark years
AliceBeckmann Nov 14, 2025
a875036
Revised urban system map
AliceBeckmann Nov 26, 2025
28ea1ed
Revised urban system map
AliceBeckmann Nov 26, 2025
e58f248
Added more typologies (extensive vs intensive)
AliceBeckmann Nov 27, 2025
0342ae3
Added more typologies (extensive vs intensive)
AliceBeckmann Nov 27, 2025
44d278e
Revised decision tree
AliceBeckmann Nov 28, 2025
3c2e05b
Revised decision tree
AliceBeckmann Nov 28, 2025
cbc45a7
revised typologie plots
AliceBeckmann Nov 30, 2025
51486a4
revised typologie plots
AliceBeckmann Nov 30, 2025
bb107e3
updated n_prov_destiny from grafs_plot
AliceBeckmann Dec 2, 2025
bf9e9d3
updated n_prov_destiny from grafs_plot
AliceBeckmann Dec 2, 2025
d4a4e14
updated n_prov_destiny from model-grafs-spain
AliceBeckmann Dec 5, 2025
dfe2fe1
updated n_prov_destiny from model-grafs-spain
AliceBeckmann Dec 5, 2025
088ec58
added a stacked bar plot for typologies
AliceBeckmann Dec 5, 2025
16a5ae2
added a stacked bar plot for typologies
AliceBeckmann Dec 5, 2025
c4c26ff
merged n_prov_destiny from model-grafs-spain
AliceBeckmann Dec 6, 2025
ea647f7
merged n_prov_destiny from model-grafs-spain
AliceBeckmann Dec 6, 2025
3e2fd19
revised exports and imports
AliceBeckmann Dec 9, 2025
71bd57f
revised exports and imports
AliceBeckmann Dec 9, 2025
662491e
revised livestock gas losses
AliceBeckmann Dec 10, 2025
2890fdc
revised livestock gas losses
AliceBeckmann Dec 10, 2025
880cd33
revised typology plots
AliceBeckmann Dec 16, 2025
28f213d
revised typology plots
AliceBeckmann Dec 16, 2025
82ce550
Merge branch 'main' into alice/typologies
lbm364dl Feb 19, 2026
30a8201
Merge branch 'main' into alice/typologies
lbm364dl Feb 19, 2026
ce677f8
created typology plot kgN/ha
AliceBeckmann Feb 20, 2026
3758c60
created typology plot kgN/ha
AliceBeckmann Feb 20, 2026
ce0404d
Remove R CMD Check warnings
lbm364dl Feb 26, 2026
d3b0d02
Remove R CMD Check warnings
lbm364dl Feb 26, 2026
96a09ad
removed urban systems in stacked bar plots
AliceBeckmann Mar 9, 2026
cc3a71e
feat: add calculate_lmdi decomposition function
AliceBeckmann Mar 31, 2026
531a7e5
feat: add data preparation helpers for lmdi analysis
AliceBeckmann Mar 31, 2026
4b8eb70
feat: add provincial land-use typology input panel plots
AliceBeckmann Mar 31, 2026
a766666
feat: expand intensification and circularity plotting workflows
AliceBeckmann Mar 31, 2026
f4a438f
chore: add generated typology visualization outputs
AliceBeckmann Mar 31, 2026
7646c26
sync n_prov_destiny.R with main
AliceBeckmann Apr 6, 2026
a8a1b61
added indicator functions
AliceBeckmann Apr 6, 2026
cd03cae
fixed a bug in the national function regarding exorts and imports
AliceBeckmann Apr 7, 2026
6239b4c
Merge main into alice/typologies
lbm364dl Apr 8, 2026
f8987a2
Update n_prov_destiny
AliceBeckmann Apr 8, 2026
97add62
Add example= parameter back to N flow functions and clean NAMESPACE
lbm364dl Apr 8, 2026
7fdaa74
Resolve merge conflicts from remote alice/typologies changes
lbm364dl Apr 8, 2026
6494610
Remove legacy version=example data files from extdata/examples
lbm364dl Apr 8, 2026
4fb5db8
Remove R CMD Check warnings
lbm364dl Apr 8, 2026
326ae2b
Update n_prov_destiny output to snake_case matching main
lbm364dl Apr 8, 2026
301c325
Apply air format
lbm364dl Apr 8, 2026
08bbcb1
Fix roxygen docs: snake_case columns, remove dashed titles, match main
lbm364dl Apr 8, 2026
92e8da1
Fix roxygen: remove dashes from titles, put @param before @return
lbm364dl Apr 8, 2026
b3c460e
Merge latest main and fix internal rename placement
lbm364dl Apr 8, 2026
376e411
Reorder rename_with(tolower) before select to minimize diff with main
lbm364dl Apr 8, 2026
95c92ad
Remove temporary xd.R script
lbm364dl Apr 8, 2026
80fc6ff
Remove legacy gapfilling aliases from pkgdown and mipfp dependency
lbm364dl Apr 8, 2026
de45a63
Fix R CMD check warnings and notes
lbm364dl Apr 8, 2026
f2a8ddc
Fix all lintr issues in typology files
lbm364dl Apr 8, 2026
2b34a25
Fix remaining return_linter issues missed in previous commit
lbm364dl Apr 8, 2026
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions .Rbuildignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,7 @@
^Meta$
^.vscode$
^\.agent$
^Rplot\.png$
^typology_kgha_agricultural\.jpg$
^\.claude$
^CLAUDE\.md$
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -17,3 +17,5 @@ vignettes/methods_production_cbs.qmd
vignettes/methods_production_cbs.html
vignettes/methods_production_cbs_files/
vignettes/methods_references.bib
Rplots.pdf
typology_kgha_agricultural.jpg
12 changes: 9 additions & 3 deletions DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ Authors@R: c(
Description: A set of tools for processing and analyzing data developed in the
context of the "Who Has Eaten the Planet" (WHEP) project, funded by the
European Research Council (ERC). For more details on multi-regional
input–output model "Food and Agriculture Biomass Input–Output" (FABIO) see
input–output model "Food and Agriculture Biomass Input–Output" (FABIO) see
Bruckner et al. (2019) <doi:10.1021/acs.est.9b03554>.
License: MIT + file LICENSE
Imports:
Expand All @@ -30,27 +30,33 @@ Imports:
rappdirs,
readr,
rlang,
scales,
stringr,
tibble,
tidyr,
withr,
yaml,
readxl,
sf,
stringi,
zoo
Encoding: UTF-8
Roxygen: list(markdown = TRUE)
RoxygenNote: 7.3.3
Suggests:
Suggests:
ggpattern,
ggplot2,
googlesheets4,
here,
knitr,
patchwork,
pointblank,
rmarkdown,
testthat (>= 3.0.0)
Config/testthat/edition: 3
VignetteBuilder: knitr
URL: https://eduaguilera.github.io/whep/, https://github.com/eduaguilera/whep
BugReports: https://github.com/eduaguilera/whep/issues
Depends:
Depends:
R (>= 3.5)
LazyData: true
Loading
Loading