From 9a5e0d74fdccd0eed9ae88d40172169bcdc2e00a Mon Sep 17 00:00:00 2001
From: Marianna Rottoli <marianna.rottoli@mail.polimi.it>
Date: Fri, 24 Apr 2020 12:35:18 +0200
Subject: [PATCH] =?UTF-8?q?Fixes=20to=20function=20calls=20in=20EDGE.?=
=?UTF-8?q?=C3=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
scripts/iterative/EDGE_transport.R | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/scripts/iterative/EDGE_transport.R b/scripts/iterative/EDGE_transport.R
index 3c60be4..241c7e6 100644
--- a/scripts/iterative/EDGE_transport.R
+++ b/scripts/iterative/EDGE_transport.R
@@ -132,7 +132,7 @@ if (file.exists(datapath("demand_previousiter.RDS"))) {
rebates_febatesBEV = FALSE
}
- nonfuel_costs = applylearning(non_fuel_costs, gdx, REMINDmapping, EDGE2teESmap, demand_learntmp, ES_demandpr, rebates_febatesBEV = rebates_febatesBEV, rebates_febatesFCEV = rebates_febatesFCEV)
+ nonfuel_costs = applylearning(nonfuel_costs, gdx, REMINDmapping, EDGE2teESmap, demand_learntmp, ES_demandpr, rebates_febatesBEV = rebates_febatesBEV, rebates_febatesFCEV = rebates_febatesFCEV)
saveRDS(nonfuel_costs, "nonfuel_costs_learning.RDS")} else {
stations = NULL
}
@@ -266,7 +266,8 @@ num_veh_stations = calc_num_vehicles_stations(
norm_dem = norm_demand[
subsector_L1 == "trn_pass_road_LDV_4W", ## only 4wheelers
c("iso", "year", "sector", "vehicle_type", "technology", "demand_F") ],
- ES_demand_all = ES_demand_all)
+ ES_demand_all = ES_demand_all,
+ techswitch = techswitch)
## save number of vehicles for next iteration
saveRDS(num_veh_stations$learntechdem, datapath("demand_learn.RDS"))
--
GitLab