From 701dc66d5a81809bd6c668f23109ed312ad32da1 Mon Sep 17 00:00:00 2001
From: steffenaxer <26229392+steffenaxer@users.noreply.github.com>
Date: Wed, 6 Mar 2024 19:47:40 +0100
Subject: [PATCH 1/3] Move StringDoubleMap

---
 .../{attributeconverters => }/StringDoubleMap.java              | 2 +-
 .../attributeconverters/StringDoubleMapConverter.java           | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)
 rename matsim/src/main/java/org/matsim/utils/objectattributes/{attributeconverters => }/StringDoubleMap.java (80%)

diff --git a/matsim/src/main/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMap.java b/matsim/src/main/java/org/matsim/utils/objectattributes/StringDoubleMap.java
similarity index 80%
rename from matsim/src/main/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMap.java
rename to matsim/src/main/java/org/matsim/utils/objectattributes/StringDoubleMap.java
index ef2d0a869f1..4125ea0e1dc 100644
--- a/matsim/src/main/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMap.java
+++ b/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;
diff --git a/matsim/src/main/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMapConverter.java b/matsim/src/main/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMapConverter.java
index e68ebc06e9c..06578bdc186 100644
--- a/matsim/src/main/java/org/matsim/utils/objectattributes/attributeconverters/StringDoubleMapConverter.java
+++ b/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);

From cc8dbe296f293f474ed20966208070b779afb924 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20H=C3=B6rl?= <sebastian.horl@irt-systemx.fr>
Date: Thu, 7 Mar 2024 10:17:30 +0100
Subject: [PATCH 2/3] feat: increase verbosity of dmc for invalid utility
 (#3145)

---
 .../model/tour_based/TourBasedModel.java               | 10 ++++++----
 .../model/trip_based/TripBasedModel.java               |  8 ++++----
 2 files changed, 10 insertions(+), 8 deletions(-)

diff --git a/contribs/discrete_mode_choice/src/main/java/org/matsim/contribs/discrete_mode_choice/model/tour_based/TourBasedModel.java b/contribs/discrete_mode_choice/src/main/java/org/matsim/contribs/discrete_mode_choice/model/tour_based/TourBasedModel.java
index 962ce8a6ee3..295e71e94c4 100644
--- a/contribs/discrete_mode_choice/src/main/java/org/matsim/contribs/discrete_mode_choice/model/tour_based/TourBasedModel.java
+++ b/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());
 	}
 }
diff --git a/contribs/discrete_mode_choice/src/main/java/org/matsim/contribs/discrete_mode_choice/model/trip_based/TripBasedModel.java b/contribs/discrete_mode_choice/src/main/java/org/matsim/contribs/discrete_mode_choice/model/trip_based/TripBasedModel.java
index ff40940b383..c45177dc427 100644
--- a/contribs/discrete_mode_choice/src/main/java/org/matsim/contribs/discrete_mode_choice/model/trip_based/TripBasedModel.java
+++ b/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());
 	}
 }

From 5b149b0f5f9fc8ab04e61544f640bbe25386254d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 7 Mar 2024 14:59:49 +0000
Subject: [PATCH 3/3] build(deps): bump org.glassfish.jaxb:jaxb-bom from 4.0.4
 to 4.0.5

Bumps org.glassfish.jaxb:jaxb-bom from 4.0.4 to 4.0.5.

---
updated-dependencies:
- dependency-name: org.glassfish.jaxb:jaxb-bom
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 1251711bfa6..0cde17b23eb 100644
--- a/pom.xml
+++ b/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>