rechnung mit CO2 700 und InvCostTUD

matsim-vsp · Jan 18, 2025 · 26d1408 · 26d1408
1 parent 5f041b8
commit 26d1408
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 15 deletions.
diff --git a/src/main/java/org/tub/vsp/bvwp/data/Headers.java b/src/main/java/org/tub/vsp/bvwp/data/Headers.java
@@ -182,13 +182,21 @@ public final class Headers{
 	public static final String NProCo2_ELTTIME_CARBON2000_EMOB_INVCOSTTUD = "Nutzen_pro_CO2 mit Inv.Kosten+/Str.mehrverk.+/CO2-Preis++ & EMob";
 	public static final String NProCo2_ORIG = "Nutzen_pro_CO2 lt. BVWP'30";
 
+
 	/**
 	 * NKV bei erhöten vkm (hEART-Paper 2025)
 	 * KMT Jan25
 	 */
-	public static final String NKV_ADDTL_PKWKM_EL06 = "NKV_"+ADDTL_PKWKM_EL06;
-	public static final String NKV_ADDTL_PKWKM_EL0306_HALF = "NKV_"+ADDTL_PKWKM_EL0306_HALF;
-	public static final String NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP = "NKV_"+ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP;
+	private static final String NKV_praefix = "NKV_";
+
+	public static final String NKV_ADDTL_PKWKM_EL06 = NKV_praefix +ADDTL_PKWKM_EL06;
+	public static final String NKV_ADDTL_PKWKM_EL0306_HALF = NKV_praefix +ADDTL_PKWKM_EL0306_HALF;
+	public static final String NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP = NKV_praefix +ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP;
+
+	private static final String CARBON_700_INVCOST_TUD_suffix = "_carbon700_invcostTud";
+	public static final String NKV_ADDTL_PKWKM_EL06_CARBON700_INVCOSTTUD = NKV_praefix +ADDTL_PKWKM_EL06 + CARBON_700_INVCOST_TUD_suffix;
+	public static final String NKV_ADDTL_PKWKM_EL0306_HALF_CARBON700_INVCOSTTUD = NKV_praefix +ADDTL_PKWKM_EL0306_HALF + CARBON_700_INVCOST_TUD_suffix;
+	public static final String NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP_CARBON700_INVCOSTTUD = NKV_praefix +ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP + CARBON_700_INVCOST_TUD_suffix;
 
 
 	/**

diff --git a/src/main/java/org/tub/vsp/bvwp/data/container/analysis/StreetAnalysisDataContainer.java b/src/main/java/org/tub/vsp/bvwp/data/container/analysis/StreetAnalysisDataContainer.java
@@ -210,6 +210,11 @@ private void addComputations() {
         entries.put( NKV_ADDTL_PKWKM_EL06, nkvCalculator.calculateNkv( new Modifications( co2PriceBVWP, addVkmEla06-addVkmPrins, 1, 1, 1. ) ) );
         entries.put( NKV_ADDTL_PKWKM_EL0306_HALF, nkvCalculator.calculateNkv( new Modifications( co2PriceBVWP, addVkmEla0306_half-addVkmPrins, 1, 1, 1. ) ) );
         entries.put( NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP, nkvCalculator.calculateNkv( new Modifications( co2PriceBVWP, addVkmFromTT29inklBvwp - addVkmPrins, 1, 1, 1. ) ) );
+
+       //Nun nochmal mit CO2-Preis 700 und investmentkosten tud
+        entries.put( NKV_ADDTL_PKWKM_EL06_CARBON700_INVCOSTTUD, nkvCalculator.calculateNkv( new Modifications( co2Price700, addVkmEla06-addVkmPrins, constructionCostFactorTud, 1, 1. ) ) );
+        entries.put( NKV_ADDTL_PKWKM_EL0306_HALF_CARBON700_INVCOSTTUD, nkvCalculator.calculateNkv( new Modifications( co2Price700, addVkmEla0306_half-addVkmPrins, constructionCostFactorTud, 1, 1. ) ) );
+        entries.put( NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP_CARBON700_INVCOSTTUD, nkvCalculator.calculateNkv( new Modifications( co2Price700, addVkmFromTT29inklBvwp - addVkmPrins, constructionCostFactorTud, 1, 1. ) ) );
         //End heart25
 
         if ( streetBaseData.getProjectInformation().getProjectNumber().contains("A1-G50-NI" )) {

diff --git a/src/main/java/org/tub/vsp/bvwp/users/kmt/RunLocalCsvScrapingKMT2_hEART.java b/src/main/java/org/tub/vsp/bvwp/users/kmt/RunLocalCsvScrapingKMT2_hEART.java
@@ -142,28 +142,50 @@ private static void plotKMTforHeartFigures(Table table) throws IOException {
         //####
         figures.add( Pair.create( Figures2KN.createHeader1( "Kombiniert" ), null ) );
 
-        var y1 = new DataNameRecord(ADDTL_PKWKM_EL06, "elasticity = 0.6");
-        var y2 = new DataNameRecord(ADDTL_PKWKM_EL0306_HALF, "reduced");
-        var y3 = new DataNameRecord(ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP, "from travel Time gains");
-
-        fig = FiguresKMT.createFigureElaChange(table, "Changes in additional vkm/a depending on calculation approach", ADDTL_PKWKM_ORIG, y1, y2, y3, "original additional mileage (mio vkm/a) from BVWP 2030", "updated additional mileage (mio vkm/a)", 8);
-        figures.add( Pair.create( Figures2KN.createHeader2( "Kombiniert die verschiedenen Ansätze"), Collections.singletonList( fig )));
+        {
+            var y1 = new DataNameRecord(ADDTL_PKWKM_EL06, "elasticity = 0.6");
+            var y2 = new DataNameRecord(ADDTL_PKWKM_EL0306_HALF, "reduced");
+            var y3 = new DataNameRecord(ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP, "from travel Time gains");
 
+            fig = FiguresKMT.createFigureElaChange(table, "Changes in additional vkm/a depending on calculation approach", ADDTL_PKWKM_ORIG, y1, y2, y3, "original additional mileage (mio vkm/a) from BVWP 2030", "updated additional mileage (mio vkm/a)", 8);
+            figures.add( Pair.create( Figures2KN.createHeader2( "Kombiniert die verschiedenen Ansätze"), Collections.singletonList( fig )));
+        }
         //
+
         figures.add( Pair.create( Figures2KN.createHeader1( "NKV" ), null ) );
         figures.add( Pair.create( Figures2KN.createHeader2( "Kombiniert die verschiedenen Ansätze - Co2-Preis BVWP"),null));
 
-        y1 = new DataNameRecord(NKV_ADDTL_PKWKM_EL06, "elasticity = 0.6");
-        y2 = new DataNameRecord(NKV_ADDTL_PKWKM_EL0306_HALF, "reduced");
-        y3 = new DataNameRecord(NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP, "from travel Time gains");
-        fig = FiguresKMT.createFigureNkvChange(table, "Changes in BCR depending on calculation approach", NKV_ORIG_EN, y1, y2, y3, "original BCR from BVWP 2030", "updated BCR", 8);
-        figures.add( Pair.create( Figures2KN.createHeader2( "Kombiniert die verschiedenen Ansätze"), Collections.singletonList( fig )));
+        {
+            var y1 = new DataNameRecord(NKV_ADDTL_PKWKM_EL06, "elasticity = 0.6");
+            var y2 = new DataNameRecord(NKV_ADDTL_PKWKM_EL0306_HALF, "reduced");
+            var y3 = new DataNameRecord(NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP, "from travel time gains");
+            fig = FiguresKMT.createFigureNkvChange(table, "Changes in BCR depending on calculation approach", NKV_ORIG_EN, y1, y2, y3, "original BCR from BVWP 2030", "updated BCR", 8);
+            figures.add( Pair.create( Figures2KN.createHeader2( "Kombiniert die verschiedenen Ansätze"), Collections.singletonList( fig )));
+        }
+
+        figures.add( Pair.create( Figures2KN.createHeader2( "Kombiniert die verschiedenen Ansätze -- Co2-Preis 700 -- Investmentcosts TUD"),null));
+
+        {
+            var y1 = new DataNameRecord(NKV_ADDTL_PKWKM_EL06_CARBON700_INVCOSTTUD, "elasticity = 0.6");
+            var y2 = new DataNameRecord(NKV_ADDTL_PKWKM_EL0306_HALF_CARBON700_INVCOSTTUD, "reduced");
+            var y3 = new DataNameRecord(NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP_CARBON700_INVCOSTTUD, "from travel time gains");
+            fig = FiguresKMT.createFigureNkvChange(table, "Changes in BCR depending on calculation approach; co2-price 700 EUR/t; updated inv. costs", NKV_ORIG_EN, y1, y2, y3, "original BCR from BVWP 2030", "updated BCR", 8);
+            figures.add( Pair.create( Figures2KN.createHeader2( "Kombiniert die verschiedenen Ansätze"), Collections.singletonList( fig )));
+        }
 
         plotFigures("multiplot_hEART.html", figures);
 
         // ===
         //Berechnungen NKV < 1
-        List<String> headers = List.of( NKV_ORIG_EN, NKV_ADDTL_PKWKM_EL06, NKV_ADDTL_PKWKM_EL0306_HALF, NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP);
+        List<String> headers = List.of(
+                NKV_ORIG_EN,
+                NKV_ADDTL_PKWKM_EL06,
+                NKV_ADDTL_PKWKM_EL0306_HALF,
+                NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP,
+                NKV_ADDTL_PKWKM_EL06_CARBON700_INVCOSTTUD,
+                NKV_ADDTL_PKWKM_EL0306_HALF_CARBON700_INVCOSTTUD,
+                NKV_ADDTL_PKWKM_FROM_TTIME_29_HALF_InklBVWP_CARBON700_INVCOSTTUD
+        );
         TableCalculationsKMT.printNkvTablesKMT(table, headers);
 
     }