fix: attributes in legs rather than in interaction activities (#245)

Author: tkchouaki

core/src/main/java/org/eqasim/core/simulation/modes/feeder_drt/mode_choice/utilities/estimator/DefaultFeederDrtUtilityEstimator.java

@@ -33,17 +33,17 @@ public double estimateUtility(Person person, DiscreteModeChoiceTrip trip, List<?
 		UtilityEstimator ptEstimator = null;
 		UtilityEstimator drtEstimator = null;
 
-		FeederDrtRoutingModule.FeederDrtTripSegmentType nextSegmentType = FeederDrtRoutingModule.FeederDrtTripSegmentType.MAIN;
+		FeederDrtRoutingModule.FeederDrtTripSegmentType previousSegmentType = null;
 
 		for (PlanElement element : elements) {
 			if (element instanceof Activity stageActivity && stageActivity.getType().equals(stageActivityType)) {
-				FeederDrtRoutingModule.FeederDrtTripSegmentType previousSegmentType = (FeederDrtRoutingModule.FeederDrtTripSegmentType) stageActivity.getAttributes().getAttribute(FeederDrtRoutingModule.STAGE_ACTIVITY_PREVIOUS_SEGMENT_TYPE_ATTR);
+				if(previousSegmentType == null) {
+					throw new IllegalStateException("Encountered Feeder interaction activity before any leg");
+				}
 				if(previousSegmentType.equals(FeederDrtRoutingModule.FeederDrtTripSegmentType.MAIN)) {
 					totalUtility += ptEstimator.estimateUtility(person, trip, currentTrip);
-					nextSegmentType = FeederDrtRoutingModule.FeederDrtTripSegmentType.DRT;
 				} else if (previousSegmentType.equals(FeederDrtRoutingModule.FeederDrtTripSegmentType.DRT)) {
 					totalUtility += drtEstimator.estimateUtility(person, trip, currentTrip);
-					nextSegmentType = FeederDrtRoutingModule.FeederDrtTripSegmentType.MAIN;
 				} else {
 					throw new IllegalStateException(String.format("Unhandled previous segment type %s in trip of person %s", previousSegmentType, person.getId().toString()));
 				}
@@ -57,14 +57,15 @@ public double estimateUtility(Person person, DiscreteModeChoiceTrip trip, List<?
 						drtEstimator = this.drtEstimators.get(routingMode);
 						stageActivityType = routingMode + " interaction";
 					}
+					previousSegmentType = (FeederDrtRoutingModule.FeederDrtTripSegmentType) leg.getAttributes().getAttribute(FeederDrtRoutingModule.CURRENT_SEGMENT_TYPE_ATTR);
 				}
 			}
 		}
 		if(currentTrip.size() > 0) {
 			if(ptEstimator == null) {
 				throw new IllegalStateException(String.format("Plan of person %s has no legs", person.getId().toString()));
 			}
-			if (nextSegmentType.equals(FeederDrtRoutingModule.FeederDrtTripSegmentType.MAIN)) {
+			if (previousSegmentType.equals(FeederDrtRoutingModule.FeederDrtTripSegmentType.MAIN)) {
 				totalUtility += ptEstimator.estimateUtility(person, trip, currentTrip);
 			} else {
 				totalUtility += drtEstimator.estimateUtility(person, trip, currentTrip);

core/src/main/java/org/eqasim/core/simulation/modes/feeder_drt/router/FeederDrtRoutingModule.java

@@ -12,9 +12,9 @@
 
 public class FeederDrtRoutingModule implements RoutingModule {
 
-    public enum FeederDrtTripSegmentType {MAIN, DRT};
+    public enum FeederDrtTripSegmentType {MAIN, DRT}
 
-    public static final String STAGE_ACTIVITY_PREVIOUS_SEGMENT_TYPE_ATTR = "previousSegmentType";
+    public static final String CURRENT_SEGMENT_TYPE_ATTR = "currentSegmentType";
 
     private final RoutingModule drtRoutingModule;
     private final RoutingModule transitRoutingModule;
@@ -63,11 +63,11 @@ public List<? extends PlanElement> calcRoute(RoutingRequest routingRequest) {
                 if (element instanceof Leg leg) {
                     accessTime = Math.max(accessTime, leg.getDepartureTime().seconds());
                     accessTime += leg.getTravelTime().seconds();
+                    leg.getAttributes().putAttribute(CURRENT_SEGMENT_TYPE_ATTR, FeederDrtTripSegmentType.DRT);
                 }
             }
             Activity accessInteractionActivity = populationFactory.createActivityFromLinkId(this.mode + " interaction", accessFacility.getLinkId());
             accessInteractionActivity.setMaximumDuration(0);
-            accessInteractionActivity.getAttributes().putAttribute(STAGE_ACTIVITY_PREVIOUS_SEGMENT_TYPE_ATTR, FeederDrtTripSegmentType.DRT);
             intermodalRoute.add(accessInteractionActivity);
         }
 
@@ -79,6 +79,7 @@ public List<? extends PlanElement> calcRoute(RoutingRequest routingRequest) {
             if (element instanceof Leg leg) {
                 egressTime = Math.max(egressTime, leg.getDepartureTime().seconds());
                 egressTime += leg.getTravelTime().seconds();
+                leg.getAttributes().putAttribute(CURRENT_SEGMENT_TYPE_ATTR, FeederDrtTripSegmentType.MAIN);
             }
         }
 
@@ -90,13 +91,15 @@ public List<? extends PlanElement> calcRoute(RoutingRequest routingRequest) {
 
         // If no valid DRT route is found, we recompute a PT route from the access facility to the trip destination
         if (drtRoute == null) {
-            intermodalRoute.addAll(transitRoutingModule.calcRoute(DefaultRoutingRequest.withoutAttributes(accessFacility, toFacility, accessTime, person)));
+            ptRoute = new LinkedList<>(transitRoutingModule.calcRoute(DefaultRoutingRequest.withoutAttributes(accessFacility, toFacility, accessTime, person)));
+            ptRoute.stream().filter(planElement -> planElement instanceof Leg).map(planElement -> (Leg) planElement).forEach(leg -> leg.getAttributes().putAttribute(CURRENT_SEGMENT_TYPE_ATTR, FeederDrtTripSegmentType.MAIN));
+            intermodalRoute.addAll(ptRoute);
         } else {
             // Otherwise we add it as an egress to the whole route
             intermodalRoute.addAll(ptRoute);
             Activity egressInteractionActivity = populationFactory.createActivityFromLinkId(this.mode + " interaction", egressFacility.getLinkId());
             egressInteractionActivity.setMaximumDuration(0);
-            egressInteractionActivity.getAttributes().putAttribute(STAGE_ACTIVITY_PREVIOUS_SEGMENT_TYPE_ATTR, FeederDrtTripSegmentType.MAIN);
+            drtRoute.stream().filter(planElement -> planElement instanceof Leg).map(planElement -> (Leg) planElement).forEach(leg -> leg.getAttributes().putAttribute(CURRENT_SEGMENT_TYPE_ATTR, FeederDrtTripSegmentType.DRT));
             intermodalRoute.add(egressInteractionActivity);
             intermodalRoute.addAll(drtRoute);
         }