Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
164 commits
Select commit Hold shift + click to select a range
754f415
Add GRAFS N model for Spain
AliceBeckmann May 26, 2025
e416703
Adding readxl package
AliceBeckmann May 26, 2025
6ef010e
Wrap code into function
AliceBeckmann May 26, 2025
c2ef950
Adding missing functions
AliceBeckmann May 26, 2025
3d51a24
Finishing main function and sub functions, apart of plots
AliceBeckmann May 27, 2025
5e9eeb5
Added description and functions for plots
AliceBeckmann May 28, 2025
f893a98
Added the second R code (production and destinies for GRAFS) with fun…
AliceBeckmann May 30, 2025
855e181
Finalized the N production, destiny code, which should be working now
AliceBeckmann Jun 3, 2025
f687cbd
Finalized N Inputs code and created a new file with plots
AliceBeckmann Jun 3, 2025
39eed50
Adding Items to final files
AliceBeckmann Jun 3, 2025
c205dcf
Finalized GRAFS N input plots
AliceBeckmann Jun 4, 2025
61681d5
Added description to GRAFS prod destiny
AliceBeckmann Jun 4, 2025
7ac9809
Moved file and renamed function .load_inputs
AliceBeckmann Jun 5, 2025
f549f26
Revising code anf fixing errors
AliceBeckmann Jun 5, 2025
162e3d6
Creating test files
AliceBeckmann Jun 5, 2025
4dc26d9
Added Inputs to SACO and its path to codes
AliceBeckmann Jun 6, 2025
25b61f2
Revising tests
AliceBeckmann Jun 13, 2025
30e3356
Created code Typologies
AliceBeckmann Jun 16, 2025
3790855
Created a code for typologies
AliceBeckmann Jun 18, 2025
531b9a8
Creating maps with Josettes typologies
AliceBeckmann Jun 23, 2025
6effef0
Finalised file path
AliceBeckmann Jun 30, 2025
cd3f666
changed style of GRAFS_N_Inputs_git and GRAFS_Prod_Destiny_git
AliceBeckmann Jun 30, 2025
7cdca7d
revised code style
AliceBeckmann Jul 1, 2025
2078b30
revised test code style
AliceBeckmann Jul 1, 2025
7bbe4a8
deleted one file
AliceBeckmann Jul 1, 2025
e5cb4a6
revised tests
AliceBeckmann Jul 1, 2025
7d1ad81
modified branch to match style
AliceBeckmann Jul 1, 2025
dedb500
modified variables in utils
AliceBeckmann Jul 1, 2025
247fea6
revised utils (added variables)
AliceBeckmann Jul 7, 2025
84826f4
Fixing warning messages for style
AliceBeckmann Jul 7, 2025
7825b8b
Fixing warning messages
AliceBeckmann Jul 8, 2025
a021a4c
Solving conflicts or merging main branch and my branch
AliceBeckmann Jul 8, 2025
da199b2
Adding keywords internal
AliceBeckmann Jul 8, 2025
27cfb2f
Adding open functions to pkgdown
AliceBeckmann Jul 8, 2025
5ae9ddb
Adding open functions to pkgdown
AliceBeckmann Jul 8, 2025
230d54b
Final resvisions
AliceBeckmann Jul 9, 2025
cd562ea
Fixing pkgdown
AliceBeckmann Jul 9, 2025
5f6deb0
Revising @return
AliceBeckmann Jul 9, 2025
5cdc792
Update renv.lock and use dev styler
lbm364dl Jul 9, 2025
445f9bd
Revision style as Cata suggested
AliceBeckmann Jul 10, 2025
37a507a
Revisions for checks
AliceBeckmann Jul 10, 2025
befa849
Adding roxygen style components such as noRd
AliceBeckmann Jul 11, 2025
50021db
Fixing warning message
AliceBeckmann Jul 11, 2025
90fb2b7
Renaming test files
AliceBeckmann Jul 11, 2025
1093148
Adding stacked bar plots for typologies of Josette
AliceBeckmann Jul 14, 2025
42f5d98
Fixed warning message lint
AliceBeckmann Jul 14, 2025
070087b
Revised roxygen style in main functions
AliceBeckmann Jul 14, 2025
d10755e
Creating N input typology plots
AliceBeckmann Jul 15, 2025
bc12f42
Returned tibble instead of a list
AliceBeckmann Jul 16, 2025
db44080
Fixed lint warning message
AliceBeckmann Jul 16, 2025
1f30560
Revision of typology plots
AliceBeckmann Jul 16, 2025
4ffeddd
Fixed lint warning message
AliceBeckmann Jul 17, 2025
0418934
Returned only final tibble in main function
AliceBeckmann Jul 17, 2025
848d0d7
Revised final output
AliceBeckmann Jul 17, 2025
e492bed
Deleted typology R files
AliceBeckmann Jul 17, 2025
8c1e784
Deleted man typology functions
AliceBeckmann Jul 17, 2025
6163456
Deleted typology functions in namespace
AliceBeckmann Jul 17, 2025
aa27184
Deleted typology functions in pkgdown
AliceBeckmann Jul 17, 2025
f4eb327
Test revision in typologies
AliceBeckmann Jul 17, 2025
62a1c73
Getting Typologies_Josette file back
AliceBeckmann Jul 17, 2025
9a506aa
Use of devtools::document
AliceBeckmann Jul 17, 2025
1d40f29
Adding plot code for N input shares by typology
AliceBeckmann Jul 22, 2025
df7aadb
Adding ungroup operations
AliceBeckmann Jul 23, 2025
ff1af09
Merge branches
AliceBeckmann Jul 23, 2025
d3c0f24
Fix warning messages
AliceBeckmann Jul 23, 2025
69e7c05
Fix warning messages
AliceBeckmann Jul 23, 2025
b912b94
Simplifying script
AliceBeckmann Jul 23, 2025
c1fc472
Changed file path system for grafs_n_inputs
AliceBeckmann Jul 28, 2025
e3ca894
Merge branch 'main' into alice/model-grafs-spain
AliceBeckmann Jul 28, 2025
7279aef
Changed file path system for grafs_prod_destiny
AliceBeckmann Jul 28, 2025
d946b6d
Revised codes and tests as suggested, e.g. column names
AliceBeckmann Jul 28, 2025
d9ea59d
Separated and revised public function in n_balance
AliceBeckmann Jul 29, 2025
e74741a
Revised tests
AliceBeckmann Jul 29, 2025
d6d52dc
Added public functions
AliceBeckmann Jul 29, 2025
7de49f5
Added public functions
AliceBeckmann Jul 29, 2025
d966d73
Revised test for n soil inputs
AliceBeckmann Jul 30, 2025
9d9b883
Renamed and modified scripts
AliceBeckmann Jul 30, 2025
f26eaf1
Renamed scripts and revised tests
AliceBeckmann Jul 30, 2025
733d5d3
Revised tests
AliceBeckmann Jul 30, 2025
2e8e0ac
Revised n_prov_destiny
AliceBeckmann Jul 31, 2025
a118039
Revised tests
AliceBeckmann Aug 1, 2025
002d48d
Simplified n_prov_destiny
AliceBeckmann Aug 1, 2025
1ae3ba1
Apply suggestions from code review
AliceBeckmann Aug 6, 2025
d7b68b0
Apply suggestions from code review
AliceBeckmann Aug 6, 2025
fafce64
Merge branch 'main' into alice/model-grafs-spain
AliceBeckmann Aug 6, 2025
ce06288
Merge branch 'main' of https://github.com/eduaguilera/WHEP into alice…
AliceBeckmann Aug 6, 2025
92b420d
Added Residues
AliceBeckmann Aug 7, 2025
d955841
Added Residues
AliceBeckmann Aug 7, 2025
6f8a57a
Apply suggestions from code review
AliceBeckmann Aug 7, 2025
5a28217
Apply suggestions from code review
AliceBeckmann Aug 7, 2025
ccff941
Revising main function
AliceBeckmann Aug 7, 2025
093086f
Restructuring n_prov_destiny
AliceBeckmann Aug 7, 2025
131e241
Apply suggestions from code review
AliceBeckmann Aug 7, 2025
b342ad4
Apply suggestions from code review
AliceBeckmann Aug 7, 2025
62e97a4
Apply suggestions from code review
AliceBeckmann Aug 7, 2025
8301360
Implemented column Box_destiny and further changes
AliceBeckmann Aug 8, 2025
4a1baea
Apply suggestions from code review
AliceBeckmann Aug 8, 2025
df1ebe7
Assigned pets intake to food instead of feed
AliceBeckmann Aug 10, 2025
ac1d3f2
Revised names etc.
AliceBeckmann Aug 11, 2025
3cbcbf4
Apply suggestions from code review
AliceBeckmann Aug 11, 2025
f096583
Added and revised column Box_destiny
AliceBeckmann Aug 13, 2025
41223a1
Merge branch 'alice/model-grafs-spain' of https://github.com/eduaguil…
AliceBeckmann Aug 13, 2025
3b53293
Revised style
AliceBeckmann Aug 13, 2025
f055cf2
Simplify function
lbm364dl Aug 13, 2025
83fdef2
Change function name
AliceBeckmann Aug 13, 2025
6a6473c
Created Livestock NUE function
AliceBeckmann Aug 14, 2025
46b433d
Revised descriptions of main functions
AliceBeckmann Aug 14, 2025
7b3a293
Added new function for system NUE
AliceBeckmann Aug 20, 2025
86a0d87
Created new script for Alfredos typologies
AliceBeckmann Aug 21, 2025
8996195
Created new script for WHEP typologies
AliceBeckmann Aug 26, 2025
478ed69
save _pkgdown.yml
AliceBeckmann Sep 12, 2025
2daf52f
Move typology files to typology branch
AliceBeckmann Sep 12, 2025
a12f31f
remove typologie files
AliceBeckmann Sep 12, 2025
4a006f7
removed grafs_plot_df
AliceBeckmann Sep 12, 2025
21966e1
Merge branch 'alice/model-grafs-spain' into alice/typologies
AliceBeckmann Sep 12, 2025
eba5da2
added variables to utils
AliceBeckmann Sep 15, 2025
76ebf05
resolved conflicts and revised whep_typologies_spain
AliceBeckmann Sep 15, 2025
e02fdf3
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
1e3610f
Resolve conflicts
AliceBeckmann Sep 15, 2025
7bf1fda
creating new branch for grafs plot
AliceBeckmann Sep 15, 2025
97f6bb9
revised grafs_plot_df script
AliceBeckmann Sep 15, 2025
785307c
revised n_prov_destiny
AliceBeckmann Sep 24, 2025
b5c511b
revised grafs_plot
AliceBeckmann Sep 30, 2025
0f570c6
revised grafs plot code
AliceBeckmann Oct 1, 2025
a25779e
revised grafs plot code
AliceBeckmann Oct 6, 2025
a204a69
separated monogastric and ruminants livestock
AliceBeckmann Oct 7, 2025
72dd748
separated monogastric and ruminants livestock
AliceBeckmann Oct 7, 2025
e923982
added horticulture labels
AliceBeckmann Oct 9, 2025
b0f3b66
Revised livestock and crop losses
AliceBeckmann Oct 10, 2025
70865fa
Split functions into smaller functions
AliceBeckmann Oct 13, 2025
ef15365
revised main function and added sub functions
AliceBeckmann Oct 24, 2025
18ae3d4
revised CRP_LS_OTHUSES label
AliceBeckmann Oct 26, 2025
4db2b47
resolved conflicts
AliceBeckmann Oct 27, 2025
308f210
got rid of write excel
AliceBeckmann Oct 27, 2025
c7b1cf0
revised DESCRIPTION, utils, NAMESPACE
AliceBeckmann Oct 27, 2025
37013d6
Remove unnecessary test files
AliceBeckmann Oct 27, 2025
e81150d
Resolved check failures
AliceBeckmann Oct 27, 2025
0db2743
Added one test. More tests need to be written
AliceBeckmann Oct 27, 2025
2ae1fdb
Revised pkgdown.yml
AliceBeckmann Oct 27, 2025
ed3dfce
changed variable name
AliceBeckmann Oct 28, 2025
db5aa1e
changed variable name
AliceBeckmann Oct 28, 2025
87ab7b3
Added write excel function
AliceBeckmann Nov 18, 2025
7ecfb6e
changed scripts
AliceBeckmann Nov 24, 2025
9270db6
Got rid of <> in labels
AliceBeckmann Nov 27, 2025
f1b9e91
added {} to labels
AliceBeckmann Nov 28, 2025
86700f4
fixed consumption data
AliceBeckmann Nov 29, 2025
42ee69c
fixed import data
AliceBeckmann Dec 2, 2025
0f252e4
updated n_prov_destiny from model-grafs-spain
AliceBeckmann Dec 5, 2025
d114882
revised crop losses and other uses, N losses from livestock
AliceBeckmann Dec 9, 2025
5d319ad
add package name to case_when
eduaguilera Dec 19, 2025
d09e589
revised national data
AliceBeckmann Jan 20, 2026
1f3e6b0
Merge branch 'alice/grafs_plot' of https://github.com/eduaguilera/WHE…
AliceBeckmann Jan 20, 2026
d6a5830
Update grafs_plot_df.R from GRAFS_plot
AliceBeckmann Jan 30, 2026
0802384
n_prov_destiny and n_soil_inputs_nue from alice/model-grafs-spain
AliceBeckmann Jan 30, 2026
0053bd8
added national function to pkgdown
AliceBeckmann Jan 30, 2026
024e644
added test
AliceBeckmann Jan 30, 2026
f2115f2
added BNF file
AliceBeckmann Feb 2, 2026
4161581
Added all semi-natural types to ha Grassland
AliceBeckmann Feb 18, 2026
fe0f041
Update n_prov_destiny from model-grafs-spain
AliceBeckmann Apr 8, 2026
3c62515
Revised animal imports and livestock surpluses
AliceBeckmann Apr 9, 2026
6ebf099
Fixed national dataset and split irrigated/rainfed
AliceBeckmann Apr 15, 2026
4e0a648
Fixed production and export data
AliceBeckmann Apr 18, 2026
363b16d
Separated production into residues, other uses etc
AliceBeckmann Apr 20, 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
63 changes: 0 additions & 63 deletions .github/workflows/test-coverage.yaml

This file was deleted.

9 changes: 9 additions & 0 deletions NAMESPACE
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,15 @@ export(add_item_cbs_name)
export(add_item_prod_code)
export(add_item_prod_name)
export(build_supply_use)
export(calculate_nue_crops)
export(calculate_nue_livestock)
export(calculate_system_nue)
export(create_grafs_plot_df)
export(create_n_nat_destiny)
export(create_n_nat_consumption_comparison)
export(create_n_production)
export(create_n_prov_destiny)
export(create_n_soil_inputs)
export(expand_trade_sources)
export(get_bilateral_trade)
export(get_faostat_data)
Expand Down
Loading
Loading