Skip to content

Edu/relocation of SACO input files and changes in items_supply #14

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.

Sign up for GitHub

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

Closed
eduaguilera wants to merge 6 commits into from
Closed

Edu/relocation of SACO input files and changes in items_supply #14

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fef4f2b
update items_use.csv with own items and processes
eduaguilera May 22, 2025
3dfea0d
add devtools::load_all() to Rprfile to automatically add project func…
eduaguilera May 22, 2025
75d51b2
Rebuild man
lbm364dl May 23, 2025
9ddbb80
Load functions only if devtools package installed
lbm364dl May 23, 2025
8f09bab
Add missing newline to pass linter
lbm364dl May 23, 2025
f5ee28b
Merge branch 'main' into edu/add-feed-use
lbm364dl May 29, 2025
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
4 changes: 4 additions & 0 deletions .Rprofile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,7 @@
if (Sys.getenv("USE_RENV", unset = "TRUE") == "TRUE") {
source("renv/activate.R")
}

if (requireNamespace("devtools", quietly = TRUE)) {
Comment thread
lbm364dl marked this conversation as resolved.
devtools::load_all()
}
1 change: 1 addition & 0 deletions R/input_files.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
#' - `"commodity_balance_sheet"`: Intended for `get_wide_cbs()`.
#' - `"bilateral_trade"`: Intended for `get_bilateral_trade()`.
#' - `"processing_coefs"`: Intended for `get_processing_coefs()`.
#' - `"feed_intake"`: Intended for `get_feed_intake()`.
#' @param force_download If `TRUE`, does not try to cache the file and
#' redownloads it anyway.
#'
Expand Down
1 change: 1 addition & 0 deletions WHEP.Rproj
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
Version: 1.0
ProjectId: 724dcbc7-53e8-4b5f-bd5b-008bea0bef7a

RestoreWorkspace: Default
SaveWorkspace: Default
Expand Down
3 changes: 3 additions & 0 deletions inst/extdata/input/raw/input_files.csv
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@ csv,commodity_balance_sheet,,https://saco.csic.es/public.php/dav/files/nrJ3JGPZy
csv,bilateral_trade,,https://saco.csic.es/public.php/dav/files/nrJ3JGPZyZeQMW8/Model%20inputs/bilateral_trade.csv
csv,processing_coefs,,https://saco.csic.es/public.php/dav/files/nrJ3JGPZyZeQMW8/Model%20inputs/processing_coefs.csv
csv,example_cbs_drive,1N6N4DI3PDowKvWwreFbcSe3YwYjV24k9,
csv,feed_intake,,https://saco.csic.es/public.php/dav/files/nrJ3JGPZyZeQMW8/Model%20inputs/Feed_intake.csv
csv,primary_prod,,https://saco.csic.es/public.php/dav/files/nrJ3JGPZyZeQMW8/Model%20inputs/Primary_all.csv
csv,crop_residues,,https://saco.csic.es/public.php/dav/files/nrJ3JGPZyZeQMW8/Model%20inputs/Crop_NPPr_NoFallow.csv
Loading