Skip to content

Commit

Permalink
fix #14870
Browse files Browse the repository at this point in the history
  • Loading branch information
namdre committed May 16, 2024
1 parent a67160a commit 988839f
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/microsim/output/MSE3Collector.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -158,7 +158,7 @@ MSE3Collector::MSE3EntryReminder::notifyLeave(SUMOTrafficObject& veh, double, MS
#endif
if (myCollector.myEnteredContainer.erase(&veh) > 0) {
if (!myCollector.myExpectArrival) {
WRITE_WARNINGF("Vehicle '%' arrived inside % '%'.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), myCollector.getID());
WRITE_WARNINGF("Vehicle '%' arrived inside % '%', time=%.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), myCollector.getID(), time2string(SIMSTEP));
}
}
return false;
Expand Down Expand Up @@ -290,7 +290,7 @@ MSE3Collector::MSE3LeaveReminder::notifyLeave(SUMOTrafficObject& veh, double /*
if (reason >= MSMoveReminder::NOTIFICATION_ARRIVED) {
if (myCollector.myEnteredContainer.erase(&veh) > 0) {
if (!myCollector.myExpectArrival) {
WRITE_WARNINGF("Vehicle '%' arrived inside % '%'.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), myCollector.getID());
WRITE_WARNINGF("Vehicle '%' arrived inside % '%', time=%.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), myCollector.getID(), time2string(SIMSTEP));
}
}
return false;
Expand Down Expand Up @@ -365,7 +365,7 @@ MSE3Collector::enter(const SUMOTrafficObject& veh, const double entryTimestep, c
return;
}
if (myEnteredContainer.find(&veh) != myEnteredContainer.end()) {
WRITE_WARNINGF("Vehicle '%' reentered % '%'.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), getID());
WRITE_WARNINGF("Vehicle '%' reentered % '%', time=%.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), getID(), time2string(SIMSTEP));
return;
}
#ifdef DEBUG_E3_NOTIFY_ENTER
Expand Down Expand Up @@ -411,7 +411,7 @@ MSE3Collector::leaveFront(const SUMOTrafficObject& veh, const double leaveTimest
}
if (myEnteredContainer.find(&veh) == myEnteredContainer.end()) {
if (!myOpenEntry && veh.isVehicle()) {
WRITE_WARNINGF("Vehicle '%' left % '%' without entering it.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), getID());
WRITE_WARNINGF("Vehicle '%' left % '%' without entering it, time=%.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), getID(), time2string(SIMSTEP));
}
} else {
myEnteredContainer[&veh].frontLeaveTime = leaveTimestep;
Expand Down Expand Up @@ -439,7 +439,7 @@ MSE3Collector::leave(const SUMOTrafficObject& veh, const double leaveTimestep, c
}
if (myEnteredContainer.find(&veh) == myEnteredContainer.end()) {
if (!myOpenEntry && veh.isVehicle()) {
WRITE_WARNINGF("Vehicle '%' left % '%' without entering it.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), getID());
WRITE_WARNINGF("Vehicle '%' left % '%' without entering it, time=%.", veh.getID(), toString(SUMO_TAG_E3DETECTOR), getID(), time2string(SIMSTEP));
}
} else {
#ifdef DEBUG_E3_NOTIFY_LEAVE
Expand Down

0 comments on commit 988839f

Please sign in to comment.