Skip to content

Commit

Permalink
Set Technology to average, not the EmissionConcept. EmConcept contain…
Browse files Browse the repository at this point in the history
…s Diesel, Electricity, etc. -> this is the information, we want to keep.
  • Loading branch information
kt86 committed Mar 3, 2024
1 parent 923cfce commit 02581b5
Showing 1 changed file with 3 additions and 3 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
*
*
* *********************************************************************** */
package org.matsim.contrib.emissions;

Expand Down Expand Up @@ -295,7 +295,7 @@ private HbefaColdEmissionFactor getEmissionsFactor(Tuple<HbefaVehicleCategory, H
//if not possible, try "<technology>; average; average":
if (ecg.getDetailedVsAverageLookupBehavior() == EmissionsConfigGroup.DetailedVsAverageLookupBehavior.tryDetailedThenTechnologyAverageElseAbort || ecg.getDetailedVsAverageLookupBehavior() == EmissionsConfigGroup.DetailedVsAverageLookupBehavior.tryDetailedThenTechnologyAverageThenAverageTable) {
attribs2.setHbefaSizeClass("average");
attribs2.setHbefaEmConcept("average");
attribs2.setHbefaTechnology("average");
if (detailedFallbackTechAverageWarnCnt <= 1) {
logger.warn("did not find emission factor for efkey=" + efkey);
logger.warn(" re-written to " + efkey2);
Expand Down Expand Up @@ -359,7 +359,7 @@ private HbefaColdEmissionFactor getEmissionsFactor(Tuple<HbefaVehicleCategory, H
//if not possible, try "<technology>; average; average":
if (ecg.getDetailedVsAverageLookupBehavior() == EmissionsConfigGroup.DetailedVsAverageLookupBehavior.tryDetailedThenTechnologyAverageElseAbort || ecg.getDetailedVsAverageLookupBehavior() == EmissionsConfigGroup.DetailedVsAverageLookupBehavior.tryDetailedThenTechnologyAverageThenAverageTable) {
attribs2.setHbefaSizeClass("average");
attribs2.setHbefaEmConcept("average");
attribs2.setHbefaTechnology("average");
if (detailedFallbackTechAverageWarnCnt <= 1) {
logger.warn("did not find emission factor for efkey=" + efkey);
logger.warn(" re-written to " + efkey2);
Expand Down

0 comments on commit 02581b5

Please sign in to comment.