Merge branch 'master' into feat/raptor-transport-mode-utilities

matsim-org · Mar 10, 2024 · ac875ac · ac875ac
2 parents 42d67c5 + fb55a1b
commit ac875ac
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/...rg/matsim/contribs/discrete_mode_choice/components/constraints/TransitWalkConstraint.java b/...rg/matsim/contribs/discrete_mode_choice/components/constraints/TransitWalkConstraint.java
@@ -13,6 +13,7 @@
 import org.matsim.contribs.discrete_mode_choice.model.trip_based.TripConstraintFactory;
 import org.matsim.contribs.discrete_mode_choice.model.trip_based.candidates.RoutedTripCandidate;
 import org.matsim.contribs.discrete_mode_choice.model.trip_based.candidates.TripCandidate;
+import org.matsim.pt.routes.TransitPassengerRoute;
 
 /**
  * This contraint forbids "pt" trips that only consist of walk legs, i.e. there
@@ -29,7 +30,7 @@ public boolean validateAfterEstimation(DiscreteModeChoiceTrip trip, TripCandidat
 				// Go through all plan elments
 				for (PlanElement element : ((RoutedTripCandidate) candidate).getRoutedPlanElements()) {
 					if (element instanceof Leg) {
-						if (((Leg) element).getMode().equals(TransportMode.pt)) {
+						if (((Leg) element).getRoute() instanceof TransitPassengerRoute) {
 							// If we find at least one pt leg, we're good
 							return true;
 						}