Skip to content
Closed
Show file tree
Hide file tree
Changes from 4 commits
Commits
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
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()
}
2 changes: 1 addition & 1 deletion R/commodity_balance_sheet.R
Original file line number Diff line number Diff line change
Expand Up @@ -134,4 +134,4 @@
final_conversion_factor = cf,
final_value_processed = value_proc
)
}
}

Check warning on line 137 in R/commodity_balance_sheet.R

View workflow job for this annotation

GitHub Actions / lint

file=R/commodity_balance_sheet.R,line=137,col=2,[trailing_blank_lines_linter] Add a terminal newline.
Comment thread
lbm364dl marked this conversation as resolved.
Outdated
1 change: 1 addition & 0 deletions R/input_files.R
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
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
9 changes: 6 additions & 3 deletions inst/extdata/input/raw/input_files.csv
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
extension,alias,drive_file_id,file_url
csv,commodity_balance_sheet,,"https://saco.csic.es/public.php/dav/files/nrJ3JGPZyZeQMW8/Sources%20(proposed%20by%20alvaro)/Model%20inputs/New%20FABIO/commodity_balance_sheet.csv"
csv,bilateral_trade,,"https://saco.csic.es/public.php/dav/files/nrJ3JGPZyZeQMW8/Sources%20(proposed%20by%20alvaro)/Model%20inputs/New%20FABIO/bilateral_trade.csv"
csv,processing_coefs,,"https://saco.csic.es/public.php/dav/files/nrJ3JGPZyZeQMW8/Sources%20(proposed%20by%20alvaro)/Model%20inputs/New%20FABIO/processing_coefs.csv"
csv,commodity_balance_sheet,,https://saco.csic.es/public.php/dav/files/nrJ3JGPZyZeQMW8/Model%20inputs/commodity_balance_sheet.csv
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
461 changes: 296 additions & 165 deletions inst/extdata/input/raw/items_supply.csv

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions man/get_file_path.Rd

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading