-
Notifications
You must be signed in to change notification settings - Fork 2
Typologies Spain #37
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
AliceBeckmann
wants to merge
121
commits into
main
Choose a base branch
from
alice/typologies
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Typologies Spain #37
Changes from 20 commits
Commits
Show all changes
121 commits
Select commit
Hold shift + click to select a range
f4eb327
Test revision in typologies
AliceBeckmann ca205b0
Test revision in typologies
AliceBeckmann 62a1c73
Getting Typologies_Josette file back
AliceBeckmann 1a2c189
Getting Typologies_Josette file back
AliceBeckmann 9a506aa
Use of devtools::document
AliceBeckmann 0766c7d
Use of devtools::document
AliceBeckmann 1d40f29
Adding plot code for N input shares by typology
AliceBeckmann 91b5907
Adding plot code for N input shares by typology
AliceBeckmann 2daf52f
Move typology files to typology branch
AliceBeckmann 74074be
Move typology files to typology branch
AliceBeckmann 21966e1
Merge branch 'alice/model-grafs-spain' into alice/typologies
AliceBeckmann 2ba0c03
Merge branch 'alice/model-grafs-spain' into alice/typologies
AliceBeckmann eba5da2
added variables to utils
AliceBeckmann e9bb774
added variables to utils
AliceBeckmann 76ebf05
resolved conflicts and revised whep_typologies_spain
AliceBeckmann 6c51d9e
resolved conflicts and revised whep_typologies_spain
AliceBeckmann e02fdf3
resolved conflicts and revised whep_typologies_spain
AliceBeckmann d302415
resolved conflicts and revised whep_typologies_spain
AliceBeckmann a8e4bda
Merge remote-tracking branch 'origin/main' into alice/typologies
AliceBeckmann 2ef1d42
Merge remote-tracking branch 'origin/main' into alice/typologies
AliceBeckmann 1e3610f
Resolve conflicts
AliceBeckmann 23d8fc2
Resolve conflicts
AliceBeckmann 16b778b
deleted grafs_plot_df.R
AliceBeckmann a76a4f1
deleted grafs_plot_df.R
AliceBeckmann 7055bf8
merged files
AliceBeckmann fd59b74
merged files
AliceBeckmann 5faf4a5
fixed style
AliceBeckmann a698f56
fixed style
AliceBeckmann cfa6b77
fixed pkgdown.yml
AliceBeckmann 03f2914
fixed pkgdown.yml
AliceBeckmann 7944646
changed n soil inputs manure
AliceBeckmann 62176f7
changed n soil inputs manure
AliceBeckmann b29cd09
revised test
AliceBeckmann 6eb7bbd
revised test
AliceBeckmann bcf37ee
creating spain typology script and maps
AliceBeckmann 761a30e
creating spain typology script and maps
AliceBeckmann d25b011
Merge branch 'alice/model-grafs-spain' into alice/typologies
AliceBeckmann e89bc17
Merge branch 'alice/model-grafs-spain' into alice/typologies
AliceBeckmann ae6a16c
Resolve merge conflicts
AliceBeckmann e8e59f6
Resolve merge conflicts
AliceBeckmann 5a0dde3
Fix merge conflicts
lbm364dl dcba3f5
Fix merge conflicts
lbm364dl e144824
Resolve merge conflicts
AliceBeckmann 1ee30db
Resolve merge conflicts
AliceBeckmann 3707277
Remove old test part from merge
lbm364dl d5d2234
Remove old test part from merge
lbm364dl 8819378
Merge branch 'alice/typologies' of https://github.com/eduaguilera/WHE…
AliceBeckmann 8214693
Merge branch 'alice/typologies' of https://github.com/eduaguilera/WHE…
AliceBeckmann 4188d40
Fix column duplicates
lbm364dl 0a82a5f
Fix column duplicates
lbm364dl f2cfb7c
Resolve merge conflicts
AliceBeckmann f59d640
Resolve merge conflicts
AliceBeckmann 9c5debc
Changing tests
AliceBeckmann 67c1e27
Changing tests
AliceBeckmann c0df4ee
creating spain typology script and maps for 9 benchmark years
AliceBeckmann 0f98890
creating spain typology script and maps for 9 benchmark years
AliceBeckmann a875036
Revised urban system map
AliceBeckmann 28ea1ed
Revised urban system map
AliceBeckmann e58f248
Added more typologies (extensive vs intensive)
AliceBeckmann 0342ae3
Added more typologies (extensive vs intensive)
AliceBeckmann 44d278e
Revised decision tree
AliceBeckmann 3c2e05b
Revised decision tree
AliceBeckmann cbc45a7
revised typologie plots
AliceBeckmann 51486a4
revised typologie plots
AliceBeckmann bb107e3
updated n_prov_destiny from grafs_plot
AliceBeckmann bf9e9d3
updated n_prov_destiny from grafs_plot
AliceBeckmann d4a4e14
updated n_prov_destiny from model-grafs-spain
AliceBeckmann dfe2fe1
updated n_prov_destiny from model-grafs-spain
AliceBeckmann 088ec58
added a stacked bar plot for typologies
AliceBeckmann 16a5ae2
added a stacked bar plot for typologies
AliceBeckmann c4c26ff
merged n_prov_destiny from model-grafs-spain
AliceBeckmann ea647f7
merged n_prov_destiny from model-grafs-spain
AliceBeckmann 3e2fd19
revised exports and imports
AliceBeckmann 71bd57f
revised exports and imports
AliceBeckmann 662491e
revised livestock gas losses
AliceBeckmann 2890fdc
revised livestock gas losses
AliceBeckmann 880cd33
revised typology plots
AliceBeckmann 28f213d
revised typology plots
AliceBeckmann 82ce550
Merge branch 'main' into alice/typologies
lbm364dl 30a8201
Merge branch 'main' into alice/typologies
lbm364dl ce677f8
created typology plot kgN/ha
AliceBeckmann 3758c60
created typology plot kgN/ha
AliceBeckmann ce0404d
Remove R CMD Check warnings
lbm364dl d3b0d02
Remove R CMD Check warnings
lbm364dl 96a09ad
removed urban systems in stacked bar plots
AliceBeckmann cc3a71e
feat: add calculate_lmdi decomposition function
AliceBeckmann 531a7e5
feat: add data preparation helpers for lmdi analysis
AliceBeckmann 4b8eb70
feat: add provincial land-use typology input panel plots
AliceBeckmann a766666
feat: expand intensification and circularity plotting workflows
AliceBeckmann f4a438f
chore: add generated typology visualization outputs
AliceBeckmann 7646c26
sync n_prov_destiny.R with main
AliceBeckmann a8a1b61
added indicator functions
AliceBeckmann cd03cae
fixed a bug in the national function regarding exorts and imports
AliceBeckmann 6239b4c
Merge main into alice/typologies
lbm364dl f8987a2
Update n_prov_destiny
AliceBeckmann 97add62
Add example= parameter back to N flow functions and clean NAMESPACE
lbm364dl 7fdaa74
Resolve merge conflicts from remote alice/typologies changes
lbm364dl 6494610
Remove legacy version=example data files from extdata/examples
lbm364dl 4fb5db8
Remove R CMD Check warnings
lbm364dl 326ae2b
Update n_prov_destiny output to snake_case matching main
lbm364dl 301c325
Apply air format
lbm364dl 08bbcb1
Fix roxygen docs: snake_case columns, remove dashed titles, match main
lbm364dl 92e8da1
Fix roxygen: remove dashes from titles, put @param before @return
lbm364dl b3c460e
Merge latest main and fix internal rename placement
lbm364dl 376e411
Reorder rename_with(tolower) before select to minimize diff with main
lbm364dl 95c92ad
Remove temporary xd.R script
lbm364dl 80fc6ff
Remove legacy gapfilling aliases from pkgdown and mipfp dependency
lbm364dl de45a63
Fix R CMD check warnings and notes
lbm364dl f2a8ddc
Fix all lintr issues in typology files
lbm364dl 2b34a25
Fix remaining return_linter issues missed in previous commit
lbm364dl 0c60b87
Rename nitrogen_spain pins to kebab-case
lbm364dl 5b86641
Add pie-full-destinies-fm-old
lbm364dl 6e98f4f
Updates from grafs_plot changes
AliceBeckmann fadb8f9
Resolve merge conflict for whep_inputs
AliceBeckmann a7fbfc0
Revised input and output plots and typology decision tree
AliceBeckmann ebb74af
Revised Wastewater
AliceBeckmann fcb013d
Added Org other to Cropland and added new files
AliceBeckmann c6accdb
Added new datasets and revised decision tree
AliceBeckmann 7e0387e
Added decision tree visualization code
AliceBeckmann b96873a
Added intensification and specialization indicators
AliceBeckmann 737c267
Added revised files and adjusted decision tree
AliceBeckmann File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Could the names be a bit more consistent?
create_typologies_alfredocreate_typologies_josettecreate_typologies_whepcreate_typologies_grafs_spainAlso, is the last one even related to the other three? Could there be a better name perhaps?