fix #14823

eclipse-sumo · May 5, 2024 · a34ed73 · a34ed73
1 parent a7ccca7
commit a34ed73
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/microsim/transportables/MSStage.cpp b/src/microsim/transportables/MSStage.cpp
@@ -137,7 +137,7 @@ MSStage::getArrived() const {
 
 SUMOTime
 MSStage::getDuration() const {
-    return myArrived > 0 ? myArrived - myDeparted : SUMOTime_MAX;
+    return myArrived >= 0 ? myArrived - myDeparted : SUMOTime_MAX;
 }
 
 

diff --git a/src/microsim/transportables/MSStageWaiting.cpp b/src/microsim/transportables/MSStageWaiting.cpp
@@ -70,6 +70,11 @@ MSStageWaiting::getPlannedDuration() const {
     return myWaitingDuration;
 }
 
+SUMOTime
+MSStageWaiting::getDuration() const {
+    return myType == MSStageType::WAITING_FOR_DEPART ? 0 : MSStage::getDuration();
+}
+
 Position
 MSStageWaiting::getPosition(SUMOTime /* now */) const {
     if (myStopWaitPos != Position::INVALID) {
@@ -108,7 +113,7 @@ void
 MSStageWaiting::tripInfoOutput(OutputDevice& os, const MSTransportable* const) const {
     if (myType != MSStageType::WAITING_FOR_DEPART) {
         os.openTag(SUMO_TAG_STOP);
-        os.writeAttr("duration", time2string(myArrived - myDeparted));
+        os.writeAttr("duration", getDuration() != SUMOTime_MAX ? time2string(getDuration()) : "-1");
         os.writeAttr("arrival", time2string(myArrived));
         os.writeAttr("arrivalPos", toString(myArrivalPos));
         os.writeAttr("actType", myActType == "" ? "waiting" : myActType);

diff --git a/src/microsim/transportables/MSStageWaiting.h b/src/microsim/transportables/MSStageWaiting.h
@@ -57,9 +57,12 @@ class MSStageWaiting : public MSStage {
     SUMOTime getPlannedDuration() const;
 
     SUMOTime getTravelTime() const {
+        // not a travelling stage
         return 0;
     }
 
+    SUMOTime getDuration() const;
+
     SUMOTime getStopEnd() const {
         return myStopEndTime;
     }

diff --git a/src/microsim/transportables/MSTransportable.cpp b/src/microsim/transportables/MSTransportable.cpp
@@ -250,10 +250,10 @@ MSTransportable::tripInfoOutput(OutputDevice& os) const {
             travelTimeOK = false;
         }
     }
-    //os.writeAttr(SUMO_ATTR_DURATION, durationOK ? time2string(duration) : "-1");
-    //os.writeAttr(SUMO_ATTR_WAITINGTIME, waitingTimeOK ? time2string(waitingTime) : "-1");
-    //os.writeAttr(SUMO_ATTR_TIMELOSS, timeLossOK ? time2string(timeLoss) : "-1");
-    //os.writeAttr(SUMO_ATTR_TRAVELTIME, travelTimeOK ? time2string(travelTime) : "-1");
+    os.writeAttr(SUMO_ATTR_DURATION, durationOK ? time2string(duration) : "-1");
+    os.writeAttr(SUMO_ATTR_WAITINGTIME, waitingTimeOK ? time2string(waitingTime) : "-1");
+    os.writeAttr(SUMO_ATTR_TIMELOSS, timeLossOK ? time2string(timeLoss) : "-1");
+    os.writeAttr(SUMO_ATTR_TRAVELTIME, travelTimeOK ? time2string(travelTime) : "-1");
     for (MSStage* const i : *myPlan) {
         i->tripInfoOutput(os, this);
     }