feat: correctly update arrival/departure/travel times when a node is masked

The behavior is pretty much the same as when a node is a non-stop node, except
when updating the travel time, because we need to take into account the stop times of the reduced nodes.

Signed-off-by: Clara Ni <[email protected]>

Author: clarani

src/app/services/analytics/algorithms/shortest-travel-time-search.ts

@@ -352,7 +352,7 @@ export class ShortestTravelTimeSearch {
 
   private getOutgoingEdge(trainrunSection: TrainrunSection, node: Node): ShortestDistanceEdge {
     const path: TrainrunSection[] = [];
-    const iterator = this.trainrunService.getNonStopIterator(node, trainrunSection);
+    const iterator = this.trainrunService.getNextExpandedStopIterator(node, trainrunSection);
 
     while (iterator.hasNext()) {
       iterator.next();

src/app/services/data/trainrun.service.ts

@@ -20,7 +20,7 @@ import {GeneralViewFunctions} from "../../view/util/generalViewFunctions";
 import {
   BackwardNonStopTrainrunIterator,
   BackwardTrainrunIterator,
-  NonStopTrainrunIterator,
+  NextExpandedStopIterator,
   TrainrunIterator,
 } from "../util/trainrun.iterator";
 import {LogService} from "../../logger/log.service";
@@ -663,7 +663,7 @@ export class TrainrunService {
   }
 
   getLastNonStopNode(node: Node, trainrunSection: TrainrunSection): Node {
-    const iterator = this.getNonStopIterator(node, trainrunSection);
+    const iterator = this.getNextExpandedStopIterator(node, trainrunSection);
     while (iterator.hasNext()) {
       iterator.next();
     }
@@ -680,7 +680,7 @@ export class TrainrunService {
   }
 
   getLastNonStopTrainrunSection(node: Node, trainrunSection: TrainrunSection): TrainrunSection {
-    const iterator = this.getNonStopIterator(node, trainrunSection);
+    const iterator = this.getNextExpandedStopIterator(node, trainrunSection);
     while (iterator.hasNext()) {
       iterator.next();
     }
@@ -725,7 +725,7 @@ export class TrainrunService {
 
   sumTravelTimeUpToLastNonStopNode(node: Node, trainrunSection: TrainrunSection): number {
     let summedTravelTime = 0;
-    const iterator = this.getNonStopIterator(node, trainrunSection);
+    const iterator = this.getNextExpandedStopIterator(node, trainrunSection);
     while (iterator.hasNext()) {
       const nextPair = iterator.next();
       summedTravelTime += nextPair.trainrunSection.getTravelTime();
@@ -734,7 +734,10 @@ export class TrainrunService {
   }
 
   getCumulativeTravelTime(trainrunSection: TrainrunSection) {
-    const iterator = this.getNonStopIterator(trainrunSection.getSourceNode(), trainrunSection);
+    const iterator = this.getNextExpandedStopIterator(
+      trainrunSection.getSourceNode(),
+      trainrunSection,
+    );
     while (iterator.hasNext()) {
       iterator.next();
     }
@@ -753,7 +756,7 @@ export class TrainrunService {
       },
     ];
     let summedTravelTime = 0;
-    const iterator = this.getNonStopIterator(n, ts);
+    const iterator = this.getNextExpandedStopIterator(n, ts);
     while (iterator.hasNext()) {
       const nextPair = iterator.next();
       summedTravelTime += nextPair.trainrunSection.getTravelTime();
@@ -767,7 +770,10 @@ export class TrainrunService {
   }
 
   getCumulativeTravelTimeAndNodePath(trainrunSection: TrainrunSection) {
-    const iterator = this.getNonStopIterator(trainrunSection.getSourceNode(), trainrunSection);
+    const iterator = this.getNextExpandedStopIterator(
+      trainrunSection.getSourceNode(),
+      trainrunSection,
+    );
     while (iterator.hasNext()) {
       iterator.next();
     }
@@ -788,8 +794,8 @@ export class TrainrunService {
     return new TrainrunIterator(this.logService, node, trainrunSection);
   }
 
-  public getNonStopIterator(node: Node, trainrunSection: TrainrunSection) {
-    return new NonStopTrainrunIterator(this.logService, node, trainrunSection);
+  public getNextExpandedStopIterator(node: Node, trainrunSection: TrainrunSection) {
+    return new NextExpandedStopIterator(this.logService, node, trainrunSection);
   }
 
   public getBackwardIterator(node: Node, trainrunSection: TrainrunSection) {

src/app/services/data/trainrunsection.service.ts

@@ -324,7 +324,7 @@ export class TrainrunSectionService implements OnDestroy {
     node: Node,
     stopNodeId: number,
   ) {
-    const iterator = this.trainrunService.getNonStopIterator(node, trainrunSection);
+    const iterator = this.trainrunService.getNextExpandedStopIterator(node, trainrunSection);
     while (iterator.hasNext()) {
       iterator.next();
       if (iterator.current().node.getId() === stopNodeId) {
@@ -878,12 +878,30 @@ export class TrainrunSectionService implements OnDestroy {
     const trsTimeStructure = TrainrunsectionHelper.getDefaultTimeStructure(timeStructure);
     let summedTravelTime = 0;
 
-    const iterator = this.trainrunService.getNonStopIterator(leftNode, trs);
+    const iterator = this.trainrunService.getNextExpandedStopIterator(leftNode, trs);
+    let prevInitialLeftArrival: number = null;
+    let stopTime: number;
     while (iterator.hasNext()) {
       const nextPair = iterator.next();
+      const rightIsTarget =
+        nextPair.node.getId() === nextPair.trainrunSection.getTargetNode().getId();
+
+      if (prevInitialLeftArrival !== null) {
+        stopTime = MathUtils.mod60(
+          (rightIsTarget
+            ? nextPair.trainrunSection.getSourceDeparture()
+            : nextPair.trainrunSection.getTargetDeparture()) - prevInitialLeftArrival,
+        );
+        trsTimeStructure.leftDepartureTime = trsTimeStructure.rightArrivalTime + stopTime;
+        trsTimeStructure.leftArrivalTime = trsTimeStructure.rightDepartureTime - stopTime;
+      }
+      prevInitialLeftArrival = rightIsTarget
+        ? nextPair.trainrunSection.getTargetArrival()
+        : nextPair.trainrunSection.getSourceArrival();
 
-      const isLastNode = !nextPair.node.isNonStop(nextPair.trainrunSection);
-      trsTimeStructure.travelTime = isLastNode
+      const isLastRightNode =
+        !nextPair.node.isNonStop(nextPair.trainrunSection) && !nextPair.node.getIsCollapsed();
+      trsTimeStructure.travelTime = isLastRightNode
         ? TrainrunsectionHelper.getLastSectionTravelTime(
             newTotalTravelTime,
             summedTravelTime,
@@ -894,6 +912,7 @@ export class TrainrunSectionService implements OnDestroy {
             travelTimeFactor,
             precision,
           );
+
       trsTimeStructure.rightArrivalTime = TrainrunsectionHelper.getRightArrivalTime(
         trsTimeStructure,
         precision,
@@ -902,8 +921,7 @@ export class TrainrunSectionService implements OnDestroy {
         trsTimeStructure,
         precision,
       );
-      const rightIsTarget =
-        nextPair.node.getId() === nextPair.trainrunSection.getTargetNode().getId();
+
       this.updateTrainrunSectionTime(
         nextPair.trainrunSection.getId(),
         rightIsTarget ? trsTimeStructure.leftArrivalTime : trsTimeStructure.rightArrivalTime,
@@ -913,8 +931,6 @@ export class TrainrunSectionService implements OnDestroy {
         trsTimeStructure.travelTime,
       );
 
-      trsTimeStructure.leftDepartureTime = trsTimeStructure.rightArrivalTime;
-      trsTimeStructure.leftArrivalTime = trsTimeStructure.rightDepartureTime;
       summedTravelTime += trsTimeStructure.travelTime;
     }
 

src/app/services/util/trainrun.iterator.ts

@@ -112,9 +112,13 @@ export class BackwardTrainrunIterator extends TrainrunIterator {
   }
 }
 
-export class NonStopTrainrunIterator extends TrainrunIterator {
+/** Iterate on the trainrun sections until we find a node which is a stop of the trainrun and not collapsed */
+export class NextExpandedStopIterator extends TrainrunIterator {
   public next(): TrainrunSectionNodePair {
-    if (!this.pointerElement.node.isNonStop(this.pointerElement.trainrunSection)) {
+    if (
+      !this.pointerElement.node.isNonStop(this.pointerElement.trainrunSection) &&
+      !this.pointerElement.node.getIsCollapsed()
+    ) {
       // The trainrun has a stop and break the forward iteration
       this.currentElement = Object.assign({}, this.pointerElement);
       this.pointerElement = new TrainrunSectionNodePair(undefined, undefined);

src/integration-testing/trainIterator.test.spec.ts

@@ -7,7 +7,7 @@ import {ResourceService} from "../app/services/data/resource.service";
 import {LogService} from "../app/logger/log.service";
 import {LogPublishersService} from "../app/logger/log.publishers.service";
 import {NetzgrafikUnitTesting} from "./netzgrafik.unit.testing";
-import {NonStopTrainrunIterator, TrainrunIterator} from "../app/services/util/trainrun.iterator";
+import {NextExpandedStopIterator, TrainrunIterator} from "../app/services/util/trainrun.iterator";
 import {NoteService} from "../app/services/data/note.service";
 import {LabelGroupService} from "../app/services/data/labelgroup.service";
 import {LabelService} from "../app/services/data/label.service";
@@ -146,7 +146,7 @@ describe("TrainrunSection Service Test", () => {
 
     const iteratorNodeIds = [1, 2];
 
-    const itr = new NonStopTrainrunIterator(
+    const itr = new NextExpandedStopIterator(
       logService,
       node2,
       node2.getTrainrunSection(startingTrainrunSection.getTrainrun()),