forwarding params on trip expansion and cloning #14198

eclipse-sumo · Jan 12, 2024 · 0c92dc1 · 0c92dc1
1 parent 774437b
commit 0c92dc1
Show file tree

Hide file tree

Showing 6 changed files with 35 additions and 20 deletions.
diff --git a/src/microsim/transportables/MSPerson.cpp b/src/microsim/transportables/MSPerson.cpp
@@ -106,7 +106,9 @@ MSPerson::MSPersonStage_Walking::clone() const {
             departLane = route[0]->getNumLanes() - 1;
         }
     }
-    return new MSPersonStage_Walking("dummyID", route, myDestinationStop, myWalkingTime, mySpeed, departPos, arrivalPos, myDepartPosLat, departLane, myRouteID);
+    MSStage* clon = new MSPersonStage_Walking("dummyID", route, myDestinationStop, myWalkingTime, mySpeed, departPos, arrivalPos, myDepartPosLat, departLane, myRouteID);
+    clon->setParameters(*this);
+    return clon;
 }
 
 

diff --git a/src/microsim/transportables/MSStageDriving.cpp b/src/microsim/transportables/MSStageDriving.cpp
@@ -70,8 +70,11 @@ MSStageDriving::MSStageDriving(const MSEdge* origin, const MSEdge* destination,
 
 MSStage*
 MSStageDriving::clone() const {
-    return new MSStageDriving(myOrigin, myDestination, myDestinationStop, myArrivalPos, std::vector<std::string>(myLines.begin(), myLines.end()),
-                              myGroup, myIntendedVehicleID, myIntendedDepart);
+    MSStage* const clon = new MSStageDriving(myOrigin, myDestination, myDestinationStop, myArrivalPos,
+                                             std::vector<std::string>(myLines.begin(), myLines.end()),
+                                             myGroup, myIntendedVehicleID, myIntendedDepart);
+    clon->setParameters(*this);
+    return clon;
 }
 
 

diff --git a/src/microsim/transportables/MSStageTranship.cpp b/src/microsim/transportables/MSStageTranship.cpp
@@ -62,7 +62,9 @@ MSStageTranship::~MSStageTranship() {
 
 MSStage*
 MSStageTranship::clone() const {
-    return new MSStageTranship(myRoute, myDestinationStop, mySpeed, myDepartPos, myArrivalPos);
+    MSStage* const clon = new MSStageTranship(myRoute, myDestinationStop, mySpeed, myDepartPos, myArrivalPos);
+    clon->setParameters(*this);
+    return clon;
 }
 
 

diff --git a/src/microsim/transportables/MSStageTrip.cpp b/src/microsim/transportables/MSStageTrip.cpp
@@ -70,9 +70,12 @@ MSStageTrip::~MSStageTrip() {}
 
 MSStage*
 MSStageTrip::clone() const {
-    return new MSStageTrip(myOrigin, const_cast<MSStoppingPlace*>(myOriginStop),
-                           myDestination, myDestinationStop, myDuration,
-                           myModeSet, myVTypes, mySpeed, myWalkFactor, myGroup, myDepartPosLat, myHaveArrivalPos, myArrivalPos);
+    MSStage* const clon = new MSStageTrip(myOrigin, const_cast<MSStoppingPlace*>(myOriginStop),
+                                          myDestination, myDestinationStop, myDuration,
+                                          myModeSet, myVTypes, mySpeed, myWalkFactor, myGroup,
+                                          myDepartPosLat, myHaveArrivalPos, myArrivalPos);
+    clon->setParameters(*this);
+    return clon;
 }
 
 
@@ -230,6 +233,9 @@ MSStageTrip::setArrived(MSNet* net, MSTransportable* transportable, SUMOTime now
                             }
                         }
                         previous = new MSPerson::MSPersonStage_Walking(transportable->getID(), it->edges, bs, myDuration, mySpeed, depPos, localArrivalPos, myDepartPosLat);
+                        if (knowsParameter("pushParam")) {
+                            previous->setParameters(*this);
+                        }
                         transportable->appendStage(previous, stageIndex++);
                     } else if (isTaxi) {
                         const ConstMSEdgeVector& prevEdges = previous->getEdges();
@@ -245,13 +251,19 @@ MSStageTrip::setArrived(MSNet* net, MSTransportable* transportable, SUMOTime now
                             }
                         }
                         previous = new MSStageDriving(rideOrigin, it->edges.back(), bs, localArrivalPos, std::vector<std::string>({ "taxi" }), myGroup);
+                        if (knowsParameter("pushParam")) {
+                            previous->setParameters(*this);
+                        }
                         transportable->appendStage(previous, stageIndex++);
                     } else if (vehicle != nullptr && it->line == vehicle->getID()) {
                         if (bs == nullptr && it + 1 != result.end()) {
                             // we have no defined endpoint and are in the middle of the trip, drive as far as possible
                             localArrivalPos = it->edges.back()->getLength();
                         }
                         previous = new MSStageDriving(rideOrigin, it->edges.back(), bs, localArrivalPos, std::vector<std::string>({ it->line }));
+                        if (knowsParameter("pushParam")) {
+                            previous->setParameters(*this);
+                        }
                         transportable->appendStage(previous, stageIndex++);
                         vehicle->replaceRouteEdges(it->edges, -1, 0, "person:" + transportable->getID(), true);
                         vehicle->setArrivalPos(localArrivalPos);
@@ -260,6 +272,9 @@ MSStageTrip::setArrived(MSNet* net, MSTransportable* transportable, SUMOTime now
                         carUsed = true;
                     } else {
                         previous = new MSStageDriving(rideOrigin, it->edges.back(), bs, localArrivalPos, std::vector<std::string>({ it->line }), myGroup, it->intended, TIME2STEPS(it->depart));
+                        if (knowsParameter("pushParam")) {
+                            previous->setParameters(*this);
+                        }
                         transportable->appendStage(previous, stageIndex++);
                     }
                 }

diff --git a/src/microsim/transportables/MSStageWaiting.cpp b/src/microsim/transportables/MSStageWaiting.cpp
@@ -53,7 +53,10 @@ MSStageWaiting::~MSStageWaiting() {}
 
 MSStage*
 MSStageWaiting::clone() const {
-    return new MSStageWaiting(myDestination, myDestinationStop, myWaitingDuration, myWaitingUntil, myArrivalPos, myActType, myType == MSStageType::WAITING_FOR_DEPART);
+    MSStage* const clon = new MSStageWaiting(myDestination, myDestinationStop, myWaitingDuration, myWaitingUntil, myArrivalPos,
+                                             myActType, myType == MSStageType::WAITING_FOR_DEPART);
+    clon->setParameters(*this);
+    return clon;
 }
 
 SUMOTime

diff --git a/src/utils/common/Parameterised.cpp b/src/utils/common/Parameterised.cpp
@@ -146,23 +146,13 @@ Parameterised::getParametersStr(const std::string kvsep, const std::string sep)
 
 void
 Parameterised::setParameters(const Parameterised& params) {
-    // first clear map
-    myMap.clear();
-    // set parameter
-    for (const auto& keyValue : params.getParametersMap()) {
-        setParameter(keyValue.first, keyValue.second);
-    }
+    myMap = params.getParametersMap();
 }
 
 
 void
 Parameterised::setParametersMap(const Parameterised::Map& paramsMap) {
-    // first clear map
-    myMap.clear();
-    // set parameter
-    for (const auto& keyValue : paramsMap) {
-        setParameter(keyValue.first, keyValue.second);
-    }
+    myMap = paramsMap;
 }