Merge branch 'master' into gpkg-support

contribs/discrete_mode_choice/src/main/java/org/matsim/contribs/discrete_mode_choice/model/tour_based/TourBasedModel.java

@@ -93,7 +93,7 @@ public List<TripCandidate> chooseModes(Person person, List<DiscreteModeChoiceTri
 					TourCandidate candidate = estimator.estimateTour(person, tourModes, tourTrips, tourCandidates);
 
 					if (!Double.isFinite(candidate.getUtility())) {
-						logger.warn(buildIllegalUtilityMessage(tripIndex, person));
+						logger.warn(buildIllegalUtilityMessage(tripIndex, person, candidate));
 						continue;
 					}
 
@@ -173,9 +173,11 @@ private String buildFallbackMessage(int tripIndex, Person person, String appendi
 				tripIndex, person.getId().toString(), appendix);
 	}
 
-	private String buildIllegalUtilityMessage(int tripIndex, Person person) {
+	private String buildIllegalUtilityMessage(int tripIndex, Person person, TourCandidate candidate) {
+		TripCandidate trip = candidate.getTripCandidates().get(tripIndex);
+
 		return String.format(
-				"Received illegal utility for for tour starting at trip %d of agent %s. Continuing with next candidate.",
-				tripIndex, person.getId().toString());
+				"Received illegal utility for for tour starting at trip %d (%s) of agent %s. Continuing with next candidate.",
+				tripIndex, trip.getMode(), person.getId().toString());
 	}
 }

contribs/discrete_mode_choice/src/main/java/org/matsim/contribs/discrete_mode_choice/model/trip_based/TripBasedModel.java

@@ -78,7 +78,7 @@ public List<TripCandidate> chooseModes(Person person, List<DiscreteModeChoiceTri
 					TripCandidate candidate = estimator.estimateTrip(person, mode, trip, tripCandidates);
 
 					if (!Double.isFinite(candidate.getUtility())) {
-						logger.warn(buildIllegalUtilityMessage(tripIndex, person));
+						logger.warn(buildIllegalUtilityMessage(tripIndex, person, candidate));
 						continue;
 					}
 
@@ -139,8 +139,8 @@ private String buildFallbackMessage(int tripIndex, Person person, String appendi
 				person.getId().toString(), appendix);
 	}
 
-	private String buildIllegalUtilityMessage(int tripIndex, Person person) {
-		return String.format("Received illegal utility for trip %d of agent %s. Continuing with next candidate.",
-				tripIndex, person.getId().toString());
+	private String buildIllegalUtilityMessage(int tripIndex, Person person, TripCandidate candidate) {
+		return String.format("Received illegal utility for trip %d (%s) of agent %s. Continuing with next candidate.",
+				tripIndex, candidate.getMode(), person.getId().toString());
 	}
 }

matsim/src/main/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMap.java → matsim/src/main/java/org/matsim/utils/objectattributes/StringDoubleMap.java

@@ -1,4 +1,4 @@
-package org.matsim.utils.objectattributes.attributeconverters;
+package org.matsim.utils.objectattributes;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

matsim/src/main/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMapConverter.java

@@ -9,6 +9,7 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.type.MapType;
 import com.fasterxml.jackson.databind.type.TypeFactory;
+import org.matsim.utils.objectattributes.StringDoubleMap;
 
 public class StringDoubleMapConverter implements AttributeConverter<StringDoubleMap> {
     private static final Logger LOG = LogManager.getLogger(StringDoubleMapConverter.class);

pom.xml

@@ -192,7 +192,7 @@
             <dependency>
                 <groupId>org.glassfish.jaxb</groupId>
                 <artifactId>jaxb-bom</artifactId>
-                <version>4.0.4</version>
+                <version>4.0.5</version>
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>