From c4d0298a07194c9a49daf60bf8251bd123a7f4b1 Mon Sep 17 00:00:00 2001
From: Alois Dirnaichner <alodi@directbox.com>
Date: Mon, 24 Feb 2020 10:16:38 +0100
Subject: [PATCH] Merge changes from 19085a04bad62d372ce18f6f10b98424f75f1c9c.
---
scripts/iterative/EDGE_transport.R | 19 +------------------
1 file changed, 1 insertion(+), 18 deletions(-)
diff --git a/scripts/iterative/EDGE_transport.R b/scripts/iterative/EDGE_transport.R
index 8c4e50b..6b900eb 100644
--- a/scripts/iterative/EDGE_transport.R
+++ b/scripts/iterative/EDGE_transport.R
@@ -226,6 +226,7 @@ if (opt$reporting) {
saveRDS(shares_int_dem$demandF_plot_pkm,
datapath("demandF_plot_pkm.RDS"))
saveRDS(logit_data$annual_sales, file = datapath("annual_sales.RDS"))
+ quit()
}
demand_BEV=calc_num_vehicles(
@@ -242,24 +243,6 @@ setnames(ES_demand, old ="demand", new = "demandpr")
saveRDS(ES_demand, datapath("demand_previousiter.RDS"))
-if (opt$reporting) {
- saveRDS(vintages, file=datapath("vintages.RDS"))
-
- saveRDS(logit_data$share_list, file = datapath("share_newvehicles.RDS"))
- saveRDS(logit_data$EF_shares, file = datapath("EF_shares.RDS"))
- saveRDS(logit_data$mj_km_data, file = datapath("mj_km_data.RDS"))
- saveRDS(nonfuel_costs, file=datapath("nonfuel_costs.RDS"))
- saveRDS(logit_data$inconv_cost, file=datapath("inco_costs.RDS"))
-
- saveRDS(shares_intensity_demand$demandF_plot_EJ,
- file=datapath("demandF_plot_EJ.RDS"))
- saveRDS(shares_intensity_demand$demandF_plot_pkm,
- file=datapath("demandF_plot_pkm.RDS"))
- quit()
-}
-
-
-
## use logit to calculate costs
budget <- calculate_capCosts(
base_price=prices$base,
--
GitLab