From becb7d23b2ed6bd1b39110a7f7333fb5184cac4c Mon Sep 17 00:00:00 2001 From: Kai Nagel Date: Fri, 7 Jun 2024 13:07:30 +0200 Subject: [PATCH] make nonCo2benefitsFactor actually work --- .../vsp/bvwp/computation/ComputationKN.java | 4 +++ .../bvwp/users/kn/RunLocalCsvScrapingKN.java | 36 +++++++++---------- 2 files changed, 22 insertions(+), 18 deletions(-) diff --git a/src/main/java/org/tub/vsp/bvwp/computation/ComputationKN.java b/src/main/java/org/tub/vsp/bvwp/computation/ComputationKN.java index c82fb46..6d73cc3 100644 --- a/src/main/java/org/tub/vsp/bvwp/computation/ComputationKN.java +++ b/src/main/java/org/tub/vsp/bvwp/computation/ComputationKN.java @@ -202,6 +202,10 @@ static double nkvOhneKR_induz(Modifications modifications, Amounts amounts, Bene b_all -= b_co2_verl; b_all -= b_co2_induz; + // ### then rescale the remaining benefit with the corresponding modification: + + b_all *= modifications.nonCo2BenefitsFactor(); + // ### then add the CO2 components with the new values: // co2 Bau diff --git a/src/main/java/org/tub/vsp/bvwp/users/kn/RunLocalCsvScrapingKN.java b/src/main/java/org/tub/vsp/bvwp/users/kn/RunLocalCsvScrapingKN.java index c10b099..fbe0b55 100644 --- a/src/main/java/org/tub/vsp/bvwp/users/kn/RunLocalCsvScrapingKN.java +++ b/src/main/java/org/tub/vsp/bvwp/users/kn/RunLocalCsvScrapingKN.java @@ -88,28 +88,28 @@ public static void main(String[] args) throws IOException{ // plots1.add( figures1.dtv() ); // plots1.add( figures1.fzkmNew() ); // -// plots2.add( figures2.invcost_tud_vs_orig() ); -// plots2.add( figures2.nkvVsDtv() ); -// + plots2.add( figures2.invcost_tud_vs_orig() ); + plots2.add( figures2.nkvVsDtv() ); + // plots2.add( figures2.cost_VS_nkvOrig() ); -// + // plots2.add( figures2.costOrigVsCumulativeCostOrig() ); -// -// plots2.addAll( figures2.nkvElttimeCarbon215(5 ) ); -// -// plots2.add( figures2.invcosttud_vs_nkvEl03Cprice215Invcosttud( 5) ); -// plots2.add( figures2.cumulativeCostTud_vs_nkvEl03Cprice215InvcostTud(5 ) ); -// plots2.add( figures2.cumulativeCostTud_vs_nkvEl03Cprice215InvcostTud(Integer.MAX_VALUE ) ); -// plots2.add( figures2.invcosttud_vs_nkvEl03Cprice215Invcosttud( Integer.MAX_VALUE) ); -// -// plots2.add( figures2.invcosttud_vs_nkvElttimeCarbon700Invcosttud(5) ); + + plots2.addAll( figures2.nkvElttimeCarbon215(5 ) ); + + plots2.add( figures2.invcosttud_vs_nkvEl03Cprice215Invcosttud( 5) ); + plots2.add( figures2.cumulativeCostTud_vs_nkvEl03Cprice215InvcostTud(5 ) ); + plots2.add( figures2.cumulativeCostTud_vs_nkvEl03Cprice215InvcostTud(Integer.MAX_VALUE ) ); + plots2.add( figures2.invcosttud_vs_nkvEl03Cprice215Invcosttud( Integer.MAX_VALUE) ); + + plots2.add( figures2.invcosttud_vs_nkvElttimeCarbon700Invcosttud(5) ); // plots2.add( figures2.invcost50_vs_NkvEl03Cprice700InvcostTud() ); // plots2.add( figures2.cumcost50_vs_nkvEl03Cprice700InvcostTud() ); -// plots2.add( figures2.invcosttud_vs_nkvElttimeCarbon2000Invcosttud() ); -// -// plots2.add( figures2.carbon_vs_nkvEl03Cprice215Invcost50Capped5() ); -// -// plots2.add( figures2.nco2v_vs_vs_nkvElttimeCarbon700Invcosttud(5 ) ); + plots2.add( figures2.invcosttud_vs_nkvElttimeCarbon2000Invcosttud() ); + + plots2.add( figures2.carbon_vs_nkvEl03Cprice215Invcost50Capped5() ); + + plots2.add( figures2.nco2v_vs_vs_nkvElttimeCarbon700Invcosttud(5 ) ); plots2.add( figures2.carbon_vs_inv() );