small cleanups

Author: kt86

contribs/emissions/src/main/java/org/matsim/contrib/emissions/events/EmissionEventsReader.java

@@ -67,9 +67,12 @@ public EmissionEventsReader( EventsManager events ){
 					case WarmEmissionEvent.ATTRIBUTE_LINK_ID -> linkId = Id.createLinkId(entry.getValue());
 					case WarmEmissionEvent.ATTRIBUTE_VEHICLE_ID -> vehicleId = Id.createVehicleId(entry.getValue());
 					case null, default -> {
-						String pollutant = entry.getKey().equals("NOX") ?
-							"NOx" :
-							entry.getKey(); // the previous versions would write NOX instead of NOx
+						String pollutant = null; // the previous versions would write NOX instead of NOx
+						if (entry.getKey() != null) {
+							pollutant = entry.getKey().equals("NOX") ?
+								"NOx" :
+								entry.getKey();
+						}
 
 						Double value = Double.parseDouble(entry.getValue());
 						warmEmissions.put(Pollutant.valueOf(pollutant), value);
@@ -100,9 +103,12 @@ public EmissionEventsReader( EventsManager events ){
 					case ColdEmissionEvent.ATTRIBUTE_LINK_ID -> linkId = Id.createLinkId(entry.getValue());
 					case ColdEmissionEvent.ATTRIBUTE_VEHICLE_ID -> vehicleId = Id.createVehicleId(entry.getValue());
 					case null, default -> {
-						String pollutant = entry.getKey().equals("NOX") ?
-							"NOx" :
-							entry.getKey(); // the previous versions would write NOX instead of NOx
+						String pollutant = null; // the previous versions would write NOX instead of NOx
+						if (entry.getKey() != null) {
+							pollutant = entry.getKey().equals("NOX") ?
+								"NOx" :
+								entry.getKey();
+						}
 
 						Double value = Double.parseDouble(entry.getValue());
 						coldEmissions.put(Pollutant.valueOf(pollutant), value);

contribs/emissions/src/main/java/org/matsim/contrib/emissions/package-info.java

@@ -46,7 +46,8 @@
  * or see {@link org.matsim.contrib.emissions.utils.EmissionsConfigGroup} for a detailed description.
  *
  * <li>emissionVehicleFile: This data type is defined in the EmissionsConfigGroup,
- * see {@link org.matsim.contrib.emissions.utils.EmissionsConfigGroup}. The following information is surrounded by {@link org.matsim.contrib.emissions.EmissionUtils.EmissionSpecificationMarker}. It is described as "definition of a vehicle
+ * see {@link org.matsim.contrib.emissions.utils.EmissionsConfigGroup}.
+ * The following information is surrounded by {@link org.matsim.contrib.emissions.EmissionUtils.EmissionSpecificationMarker}. It is described as "definition of a vehicle
  *  for every person (who is allowed to choose a vehicle in the simulation):
  *  <ul>
  *  <li> REQUIRED: Vehicle description must start with the respective HbefaVehicleCategory followed by ";"

contribs/emissions/src/test/java/org/matsim/contrib/emissions/analysis/EmissionsByPollutantTest.java

@@ -45,8 +45,7 @@ void addEmission() {
         final Pollutant pollutant = CO;
         final double expectedValue = emissions.get(pollutant) + valueToAdd;
 
-        Map<Pollutant,Double> map = new LinkedHashMap<>();
-		map.putAll(emissions);
+		Map<Pollutant, Double> map = new LinkedHashMap<>(emissions);
 
         EmissionsByPollutant emissionsByPollutant = new EmissionsByPollutant(map);
 
@@ -78,13 +77,11 @@ void addEmissions() {
 
         Map<Pollutant, Double> emissions = EmissionUtilsTest.createEmissions();
 
-        Map<Pollutant,Double> map = new LinkedHashMap<>();
-		map.putAll(emissions);
+		Map<Pollutant, Double> map = new LinkedHashMap<>(emissions);
 
         EmissionsByPollutant linkEmissions = new EmissionsByPollutant(map);
 
-        Map<Pollutant,Double> map2 = new LinkedHashMap<>();
-		map2.putAll(emissions);
+		Map<Pollutant, Double> map2 = new LinkedHashMap<>(emissions);
 
         linkEmissions.addEmissions(map2);
 

contribs/emissions/src/test/java/org/matsim/contrib/emissions/events/TestColdEmissionEventImpl.java

@@ -62,7 +62,7 @@ final void testGetAttributesForCompleteEmissionMaps(){
 		Map<Pollutant, Double> coldEmissionsMap = new HashMap<>();
 		setColdEmissions(coldEmissionsMap);
 		ColdEmissionEvent ce = new ColdEmissionEvent(0.0, linkId, vehicleId, coldEmissionsMap);
-		
+
 		Map<String, String> ceg = ce.getAttributes();
 		Assertions.assertEquals(Double.parseDouble(ceg.get(CO.name())), co, MatsimTestUtils.EPSILON, "the CO value of this cold emission event was "+ Double.parseDouble(ceg.get(CO.name()))+ "but should have been "+ co);
 		Assertions.assertEquals(Double.parseDouble(ceg.get(FC.name())), fc, MatsimTestUtils.EPSILON, "the FC value of this cold emission event was "+ Double.parseDouble(ceg.get(FC.name()))+ "but should have been "+ fc);
@@ -71,7 +71,7 @@ final void testGetAttributesForCompleteEmissionMaps(){
 		Assertions.assertEquals(Double.parseDouble(ceg.get(NO2.name())), n2, MatsimTestUtils.EPSILON, "the NO2 value of this cold emission event was "+ Double.parseDouble(ceg.get(NO2.name()))+ "but should have been "+ n2);
 		Assertions.assertEquals(Double.parseDouble(ceg.get(NOx.name())), nx, MatsimTestUtils.EPSILON, "the NOx value of this cold emission event was "+ Double.parseDouble(ceg.get(NOx.name()))+ "but should have been "+ nx);
 		Assertions.assertEquals(Double.parseDouble(ceg.get(PM.name())), pm, MatsimTestUtils.EPSILON, "the PM value of this cold emission event was "+ Double.parseDouble(ceg.get(PM.name()))+ "but should have been "+ pm);
-		
+
 	}
 
 	private void setColdEmissions( Map<Pollutant, Double> coldEmissionsMap ) {
@@ -90,12 +90,12 @@ final void testGetAttributesForIncompleteMaps(){
 		//the getAttributesMethod should
 		// - return null if the emission map is empty
 		// - throw NullPointerExceptions if the emission values are not set
-		// - throw NullPointerExceptions if no emission map is assigned 
-		
+		// - throw NullPointerExceptions if no emission map is assigned
+
 		//empty map
 		Map<Pollutant, Double> emptyMap = new HashMap<>();
 		ColdEmissionEvent emptyMapEvent = new ColdEmissionEvent(22., linkId, vehicleId, emptyMap);
-		
+
 		//values not set
 		Map<Pollutant, Double> valuesNotSet = new HashMap<>();
 		valuesNotSet.put(CO, null);
@@ -106,30 +106,30 @@ final void testGetAttributesForIncompleteMaps(){
 		valuesNotSet.put(NOx, null);
 		valuesNotSet.put(PM, null);
 		ColdEmissionEvent valuesNotSetEvent = new ColdEmissionEvent(44., linkId, vehicleId, valuesNotSet);
-		
+
 		//no map
 		ColdEmissionEvent noMap = new ColdEmissionEvent(50., linkId, vehicleId, null);
-		
+
 		int numberOfColdPollutants = coldPollutants.size();
 
 		int valNullPointers = 0, noMapNullPointers=0;
-		
+
 		for(Pollutant cp : coldPollutants){
 
 			//empty map
-			Assertions.assertNull(emptyMapEvent.getAttributes().get(cp));
-			
+			Assertions.assertNull(emptyMapEvent.getAttributes().get(cp.name()));
+
 			//values not set
 			try{
-				valuesNotSetEvent.getAttributes().get(cp);
+				valuesNotSetEvent.getAttributes().get(cp.name());
 			}
 			catch(NullPointerException e){
 				valNullPointers ++;
 			}
-			
+
 			//no map
 			try{
-				noMap.getAttributes().get(cp);
+				noMap.getAttributes().get(cp.name());
 			}
 			catch(NullPointerException e){
 				noMapNullPointers++;
@@ -138,5 +138,5 @@ final void testGetAttributesForIncompleteMaps(){
 		Assertions.assertEquals(numberOfColdPollutants, valNullPointers);
 		Assertions.assertEquals(numberOfColdPollutants, noMapNullPointers);
 	}
-	
+
 }

contribs/emissions/src/test/java/org/matsim/contrib/emissions/events/TestWarmEmissionEventImpl.java

@@ -111,9 +111,7 @@ final void testGetAttributesForIncompleteMaps(){
 		valuesNotSet.put(NOx, null);
 		valuesNotSet.put(PM, null);
 
-		Map<Pollutant,Double> map = new LinkedHashMap<>();
-		valuesNotSet.forEach(map::put);
-		// (this could be made more direct)
+		Map<Pollutant, Double> map = new LinkedHashMap<>(valuesNotSet);
 
 		WarmEmissionEvent valuesNotSetEvent = new WarmEmissionEvent(44., linkId, vehicleId, map);