Skip to content
Snippets Groups Projects
Commit 063e2c2c authored by Marianna Rottoli's avatar Marianna Rottoli
Browse files

Added new expected dependencies to calls of functions from edgeTrpLib.

parent 63c406ac
No related branches found
No related tags found
1 merge request!159Pullreq1
......@@ -116,7 +116,8 @@ if (file.exists(datapath("demand_previousiter.RDS"))) {
stations = readRDS(datapath("stations.RDS"))
## calculate non fuel costs for technologies subjected to learning and merge the resulting values with the historical values
nonfuel_costs = merge(nonfuel_costs, unique(int_dat[, c("iso", "vehicle_type")]), by = c("iso", "vehicle_type"), all.y = TRUE)
nonfuel_costs = applylearning(non_fuel_costs, gdx, REMINDmapping, EDGE2teESmap, demand_BEVtmp, ES_demandpr)
rebates_febates = EDGEscenarios[options== "rebates_febates", switch]
nonfuel_costs = applylearning(non_fuel_costs, gdx, REMINDmapping, EDGE2teESmap, demand_BEVtmp, ES_demandpr, rebates_febates = rebates_febates)
saveRDS(nonfuel_costs, "nonfuel_costs_learning.RDS")
} else {
stations = NULL
......@@ -178,7 +179,8 @@ if (inconvenience) {
logit_params = logit_params,
intensity_data = int_dat,
price_nonmot = price_nonmot,
stations = if (!is.null(stations)) stations)
stations = if (!is.null(stations)) stations,
techswitch = techswitch)
} else{
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment