Merge pull request opentripplanner#7206 from entur/baselineDuration_of_carpool_trip_fix

Baseline duration of carpool trip fix

Author: sigtot

application/src/ext/java/org/opentripplanner/ext/carpooling/routing/InsertionCandidate.java

@@ -22,14 +22,15 @@ public record InsertionCandidate(
   int pickupPosition,
   int dropoffPosition,
   List<GraphPath<State, Edge, Vertex>> routeSegments,
-  Duration baselineDuration,
+  Duration durationBetweenOriginAndDestination,
   Duration totalDuration
 ) {
   /**
-   * Calculates the additional duration caused by inserting this passenger.
+   * Calculates the difference between the total duration when inserting this passenger,
+   * and the duration when driving directly from the start to the end of the trip.
    */
   public Duration additionalDuration() {
-    return totalDuration.minus(baselineDuration);
+    return totalDuration.minus(durationBetweenOriginAndDestination);
   }
 
   /**

application/src/ext/java/org/opentripplanner/ext/carpooling/routing/InsertionEvaluator.java

@@ -1,6 +1,7 @@
 package org.opentripplanner.ext.carpooling.routing;
 
 import static org.opentripplanner.ext.carpooling.util.GraphPathUtils.calculateCumulativeDurations;
+import static org.opentripplanner.ext.carpooling.util.GraphPathUtils.calculateDuration;
 
 import java.time.Duration;
 import java.util.ArrayList;
@@ -57,24 +58,18 @@ public InsertionEvaluator(
   }
 
   /**
-   * Routes all baseline segments and caches the results.
+   * Routes all segments of routePoints.
    *
    * @return Array of routed segments, or null if any segment fails to route
    */
   @SuppressWarnings("unchecked")
-  private GraphPath<State, Edge, Vertex>[] routeBaselineSegments(List<WgsCoordinate> routePoints) {
+  private GraphPath<State, Edge, Vertex>[] routeSegments(List<WgsCoordinate> routePoints) {
     GraphPath<State, Edge, Vertex>[] segments = new GraphPath[routePoints.size() - 1];
 
     for (int i = 0; i < routePoints.size() - 1; i++) {
       var fromCoord = routePoints.get(i);
       var toCoord = routePoints.get(i + 1);
-      GenericLocation from = GenericLocation.fromCoordinate(
-        fromCoord.latitude(),
-        fromCoord.longitude()
-      );
-      GenericLocation to = GenericLocation.fromCoordinate(toCoord.latitude(), toCoord.longitude());
-
-      GraphPath<State, Edge, Vertex> segment = routingFunction.route(from, to, linkingContext);
+      GraphPath<State, Edge, Vertex> segment = routeSegment(fromCoord, toCoord);
       if (segment == null) {
         LOG.debug("Baseline routing failed for segment {} → {}", i, i + 1);
         return null;
@@ -86,6 +81,18 @@ private GraphPath<State, Edge, Vertex>[] routeBaselineSegments(List<WgsCoordinat
     return segments;
   }
 
+  private GraphPath<State, Edge, Vertex> routeSegment(WgsCoordinate from, WgsCoordinate to) {
+    GenericLocation fromGenericLocation = GenericLocation.fromCoordinate(
+      from.latitude(),
+      from.longitude()
+    );
+    GenericLocation toGenericLocation = GenericLocation.fromCoordinate(
+      to.latitude(),
+      to.longitude()
+    );
+    return routingFunction.route(fromGenericLocation, toGenericLocation, linkingContext);
+  }
+
   /**
    * Evaluates pre-filtered insertion positions using A* routing.
    * <p>
@@ -107,17 +114,30 @@ public InsertionCandidate findBestInsertion(
     WgsCoordinate passengerPickup,
     WgsCoordinate passengerDropoff
   ) {
-    GraphPath<State, Edge, Vertex>[] baselineSegments = routeBaselineSegments(trip.routePoints());
+    GraphPath<State, Edge, Vertex>[] baselineSegments = routeSegments(trip.routePoints());
     if (baselineSegments == null) {
       LOG.warn("Could not route baseline for trip {}", trip.getId());
       return null;
     }
 
     Duration[] cumulativeDurations = calculateCumulativeDurations(baselineSegments);
 
+    GraphPath<State, Edge, Vertex> pathBetweenOriginAndDestination = routeSegment(
+      trip.stops().getFirst().getCoordinate(),
+      trip.stops().getLast().getCoordinate()
+    );
+
+    if (pathBetweenOriginAndDestination == null) {
+      LOG.warn("Could not create route between start and stop for trip {}", trip.getId());
+      return null;
+    }
+
+    Duration durationBetweenOriginAndDestination = calculateDuration(
+      pathBetweenOriginAndDestination
+    );
+
     InsertionCandidate bestCandidate = null;
     Duration minAdditionalDuration = INITIAL_ADDITIONAL_DURATION;
-    Duration baselineDuration = cumulativeDurations[cumulativeDurations.length - 1];
 
     for (InsertionPosition position : viablePositions) {
       InsertionCandidate candidate = evaluateInsertion(
@@ -128,7 +148,7 @@ public InsertionCandidate findBestInsertion(
         passengerDropoff,
         baselineSegments,
         cumulativeDurations,
-        baselineDuration
+        durationBetweenOriginAndDestination
       );
 
       if (candidate == null) {
@@ -168,7 +188,7 @@ private InsertionCandidate evaluateInsertion(
     WgsCoordinate passengerDropoff,
     GraphPath<State, Edge, Vertex>[] baselineSegments,
     Duration[] originalCumulativeDurations,
-    Duration baselineDuration
+    Duration durationBetweenOriginAndDestination
   ) {
     // Build modified route segments by reusing cached baseline segments
     List<GraphPath<State, Edge, Vertex>> modifiedSegments = buildModifiedSegments(
@@ -217,7 +237,7 @@ private InsertionCandidate evaluateInsertion(
       pickupPos,
       dropoffPos,
       modifiedSegments,
-      baselineDuration,
+      durationBetweenOriginAndDestination,
       totalDuration
     );
   }

application/src/ext/java/org/opentripplanner/ext/carpooling/util/GraphPathUtils.java

@@ -16,13 +16,20 @@ public static Duration[] calculateCumulativeDurations(GraphPath<State, Edge, Ver
     cumulativeDurations[0] = Duration.ZERO;
 
     for (int i = 0; i < segments.length; i++) {
-      Duration segmentDuration = Duration.between(
-        segments[i].states.getFirst().getTime(),
-        segments[i].states.getLast().getTime()
-      );
+      Duration segmentDuration = calculateDuration(segments[i]);
       cumulativeDurations[i + 1] = cumulativeDurations[i].plus(segmentDuration);
     }
 
     return cumulativeDurations;
   }
+
+  /**
+   * Calculates duration for a segment
+   */
+  public static Duration calculateDuration(GraphPath<State, Edge, Vertex> segment) {
+    return Duration.between(
+      segment.states.getFirst().getTime(),
+      segment.states.getLast().getTime()
+    );
+  }
 }