Changed debug messages

matsim-org · Dec 17, 2024 · 03d44dd · 03d44dd
1 parent 426d78c
commit 03d44dd
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 15 deletions.
diff --git a/contribs/emissions/src/main/java/org/matsim/contrib/emissions/HbefaVehicleAttributes.java b/contribs/emissions/src/main/java/org/matsim/contrib/emissions/HbefaVehicleAttributes.java
@@ -29,10 +29,10 @@ final class HbefaVehicleAttributes {
 	private String hbefaTechnology = "average";
 	private String hbefaSizeClass = "average";
 	private String hbefaEmConcept = "average";
-	
+
 	public HbefaVehicleAttributes(){
 	}
-	
+
 	private static final String TECHNOLOGY_CMT="Normally something like |diesel| or |petrol|." ;
 	/**
 	 * @return {@value #TECHNOLOGY_CMT}
@@ -44,10 +44,10 @@ String getHbefaTechnology(){
 	 * @param hbefaTechnology - {@value #TECHNOLOGY_CMT}
 	 */
 	public void setHbefaTechnology(String hbefaTechnology) {
-		this.hbefaTechnology = hbefaTechnology;		
+		this.hbefaTechnology = hbefaTechnology;
 	}
-	
-	
+
+
 	private static final String SIZE_CLASS_CMT="Normally something like |<1,4L| or |>=2L|." ;
 	/**
 	 * @return {@value #SIZE_CLASS_CMT}
@@ -100,9 +100,9 @@ public int hashCode() {
 	@Override
 	public String toString() {
 		return
-				hbefaTechnology + "; "
-						+ hbefaSizeClass + "; "
-						+ hbefaEmConcept;
+				"hbefaTechnology: " + hbefaTechnology + "; " +
+				"hbefasizeClass: " + hbefaSizeClass + "; " +
+					"hbefaEmConcept: " + hbefaEmConcept;
 	}
 
 	public boolean isDetailed() {

diff --git a/...ribs/emissions/src/main/java/org/matsim/contrib/emissions/WarmEmissionAnalysisModule.java b/...ribs/emissions/src/main/java/org/matsim/contrib/emissions/WarmEmissionAnalysisModule.java
@@ -431,8 +431,8 @@ private HbefaWarmEmissionFactor getEf(Tuple<HbefaVehicleCategory, HbefaVehicleAt
 						attribs2.setHbefaSizeClass( "average" );
 						attribs2.setHbefaEmConcept( "average" );
 						if ( detailedFallbackTechAverageWarnCnt <= 1 ) {
-							logger.warn("did not find emission factor for efkey={}", efkey);
-							logger.warn(" re-written to {}", efkey2);
+							logger.warn("Did not find emission factor in the detailed-table for efkey={}", efkey);
+							logger.warn("We are now trying to search in the detailed-table, but with an technology-averaged-key : efkey was re-written to {}", efkey2);
 							logger.warn( "will try it with '<technology>; average; average'" );
 							logger.warn( Gbl.ONLYONCE );
 							logger.warn( Gbl.FUTURE_SUPPRESSED );
@@ -444,7 +444,7 @@ private HbefaWarmEmissionFactor getEf(Tuple<HbefaVehicleCategory, HbefaVehicleAt
 							return ef2;
 						}
 						//lookups of type "<technology>; average; average" should, I think, just be entered as such. kai, feb'20
-						logger.error( "That also did not worked " );
+						logger.error( "Could not find an entry in the technology-averaged-table for <technology>; average; average. " );
 					}
 				}
 			}
@@ -483,8 +483,8 @@ private HbefaWarmEmissionFactor getEf(Tuple<HbefaVehicleCategory, HbefaVehicleAt
 						attribs2.setHbefaSizeClass( "average" );
 						attribs2.setHbefaEmConcept( "average" );
 						if ( detailedFallbackTechAverageWarnCnt <= 1 ) {
-							logger.warn("did not find emission factor for efkey={}", efkey);
-							logger.warn(" re-written to {}", efkey2);
+							logger.warn("Did not find emission factor in the detailed-table for efkey={}", efkey);
+							logger.warn("We are now trying to search in the detailed-table, but with an technology-averaged-key : efkey was re-written to {}", efkey2);
 							logger.warn( "will try it with '<technology>; average; average'" );
 							logger.warn( Gbl.ONLYONCE );
 							logger.warn( Gbl.FUTURE_SUPPRESSED );
@@ -499,7 +499,7 @@ private HbefaWarmEmissionFactor getEf(Tuple<HbefaVehicleCategory, HbefaVehicleAt
 					}
 				}
 				if ( detailedFallbackAverageTableWarnCnt <= 1 ) {
-					logger.warn( "That also did not work." );
+					logger.error( "Could not find an technology-averaged entry for <technology>; average; average. " );
 					logger.warn( "Now trying with setting to vehicle attributes to \"average; average; average\" and try it with the average table" );
 					logger.warn( Gbl.ONLYONCE );
 					logger.warn( Gbl.FUTURE_SUPPRESSED );
@@ -528,7 +528,7 @@ private HbefaWarmEmissionFactor getEf(Tuple<HbefaVehicleCategory, HbefaVehicleAt
 					Gbl.assertNotNull( ef );
 					return ef;
 				} else {
-					logger.warn("did not find average emission factor for efkey={}", efkey);
+					logger.warn("Did not find average emission factor in average-table for efkey={}", efkey);
 					List<HbefaWarmEmissionFactorKey> list = new ArrayList<>( this.avgHbefaWarmTable.keySet() );
 					list.sort( Comparator.comparing( HbefaWarmEmissionFactorKey::toString ) );
 					for ( HbefaWarmEmissionFactorKey key : list ) {