EDGE-T Validation Output - Fix
Compare changes
Files
2- Marianna Rottoli authored
+ 99
− 75
@@ -35,12 +47,9 @@ EDGE_scenario <- cfg$gms$cm_EDGEtr_scen
@@ -35,12 +47,9 @@ EDGE_scenario <- cfg$gms$cm_EDGEtr_scen
EDGEscenarios <- fread("../../modules/35_transport/edge_esm/input/EDGEscenario_description.csv")[scenario_name == EDGE_scenario]
@@ -53,22 +62,22 @@ if (EDGE_scenario == "Conservative_liquids") {
@@ -53,22 +62,22 @@ if (EDGE_scenario == "Conservative_liquids") {
rebates_febates <<- EDGEscenarios[options== "rebates_febates", switch] ##NB THEY ARE ONLY IN PSI! ONLY WORKING IN EUROPE
REMIND2ISO_MAPPING <- fread(REMINDpath(cfg$regionmapping))[, .(iso = CountryCode, region = RegionCode)]
@@ -77,27 +86,21 @@ int_dat = inputdata$int_dat
@@ -77,27 +86,21 @@ int_dat = inputdata$int_dat
@@ -111,6 +114,7 @@ REMIND_prices <- merge_prices(
@@ -111,6 +114,7 @@ REMIND_prices <- merge_prices(
@@ -122,13 +126,13 @@ iter <- as.vector(gdxrrw::rgdx(gdx, list(name="o_iterationNumber"))$val)
@@ -122,13 +126,13 @@ iter <- as.vector(gdxrrw::rgdx(gdx, list(name="o_iterationNumber"))$val)
@@ -138,10 +142,10 @@ if(average_prices){
@@ -138,10 +142,10 @@ if(average_prices){
@@ -157,7 +161,9 @@ if (inconvenience) {
@@ -157,7 +161,9 @@ if (inconvenience) {
@@ -177,47 +183,65 @@ shares <- logit_data[["share_list"]] ## shares of alternatives for each level of
@@ -177,47 +183,65 @@ shares <- logit_data[["share_list"]] ## shares of alternatives for each level of