fix #4031

eclipse-sumo · Jul 2, 2018 · 518b95f · 518b95f
1 parent abcb09e
commit 518b95f
Show file tree

Hide file tree

Showing 9 changed files with 42 additions and 12 deletions.
diff --git a/src/guinetload/GUITriggerBuilder.cpp b/src/guinetload/GUITriggerBuilder.cpp
@@ -60,8 +60,9 @@ MSTriggeredRerouter*
 GUITriggerBuilder::buildRerouter(MSNet& net, const std::string& id,
                                  MSEdgeVector& edges,
                                  double prob, const std::string& file, bool off,
-                                 SUMOTime timeThreshold) {
-    GUITriggeredRerouter* rr = new GUITriggeredRerouter(id, edges, prob, file, off, timeThreshold,
+                                 SUMOTime timeThreshold,
+                                 const std::string& vTypes) {
+    GUITriggeredRerouter* rr = new GUITriggeredRerouter(id, edges, prob, file, off, timeThreshold, vTypes,
             dynamic_cast<GUINet&>(net).getVisualisationSpeedUp());
     return rr;
 }

diff --git a/src/guinetload/GUITriggerBuilder.h b/src/guinetload/GUITriggerBuilder.h
@@ -93,7 +93,8 @@ class GUITriggerBuilder : public NLTriggerBuilder {
     virtual MSTriggeredRerouter* buildRerouter(MSNet& net,
             const std::string& id, MSEdgeVector& edges,
             double prob, const std::string& file, bool off,
-            SUMOTime timeThreshold);
+            SUMOTime timeThreshold,
+            const std::string& vTypes);
 
 
     /** @brief Builds a bus stop

diff --git a/src/guisim/GUIEdge.cpp b/src/guisim/GUIEdge.cpp
@@ -525,7 +525,7 @@ void
 GUIEdge::addRerouter() {
     MSEdgeVector edges;
     edges.push_back(this);
-    GUITriggeredRerouter* rr = new GUITriggeredRerouter(getID() + "_dynamic_rerouter", edges, 1, "", false, 0,
+    GUITriggeredRerouter* rr = new GUITriggeredRerouter(getID() + "_dynamic_rerouter", edges, 1, "", false, 0, "",
             GUINet::getGUIInstance()->getVisualisationSpeedUp());
 
     MSTriggeredRerouter::RerouteInterval ri;

diff --git a/src/guisim/GUITriggeredRerouter.cpp b/src/guisim/GUITriggeredRerouter.cpp
@@ -215,8 +215,8 @@ GUITriggeredRerouter::GUITriggeredRerouterPopupMenu::onCmdOpenManip(FXObject*,
 // -------------------------------------------------------------------------
 
 GUITriggeredRerouter::GUITriggeredRerouter(const std::string& id, const MSEdgeVector& edges, double prob, 
-    const std::string& aXMLFilename, bool off, SUMOTime timeThreshold, SUMORTree& rtree) :
-    MSTriggeredRerouter(id, edges, prob, aXMLFilename, off, timeThreshold),
+    const std::string& aXMLFilename, bool off, SUMOTime timeThreshold, const std::string& vTypes, SUMORTree& rtree) :
+    MSTriggeredRerouter(id, edges, prob, aXMLFilename, off, timeThreshold, vTypes),
     GUIGlObject_AbstractAdd(GLO_REROUTER, id) {
     // add visualisation objects for edges which trigger the rerouter
     for (MSEdgeVector::const_iterator it = edges.begin(); it != edges.end(); ++it) {

diff --git a/src/guisim/GUITriggeredRerouter.h b/src/guisim/GUITriggeredRerouter.h
@@ -63,6 +63,7 @@ class GUITriggeredRerouter
                          const MSEdgeVector& edges, double prob,
                          const std::string& aXMLFilename, bool off,
                          SUMOTime timeThreshold,
+                         const std::string& vTypes,
                          SUMORTree& rtree);
 
 

diff --git a/src/microsim/trigger/MSTriggeredRerouter.cpp b/src/microsim/trigger/MSTriggeredRerouter.cpp
@@ -69,7 +69,8 @@ MSEdge MSTriggeredRerouter::mySpecialDest_terminateRoute("MSTriggeredRerouter_te
 MSTriggeredRerouter::MSTriggeredRerouter(const std::string& id,
         const MSEdgeVector& edges,
         double prob, const std::string& file, bool off,
-        SUMOTime timeThreshold) :
+        SUMOTime timeThreshold,
+        const std::string& vTypes) :
     MSTrigger(id),
     MSMoveReminder(id),
     SUMOSAXHandler(file),
@@ -93,6 +94,8 @@ MSTriggeredRerouter::MSTriggeredRerouter(const std::string& id,
         setUserMode(true);
         setUserUsageProbability(0);
     }
+    const std::vector<std::string> vt = StringTokenizer(vTypes).getVector();
+    myVehicleTypes.insert(vt.begin(), vt.end());
 }
 
 
@@ -353,6 +356,9 @@ MSTriggeredRerouter::notifyLeave(SUMOVehicle& /*veh*/, double /*lastPos*/,
 
 bool
 MSTriggeredRerouter::notifyEnter(SUMOVehicle& veh, MSMoveReminder::Notification /*reason*/, const MSLane* /* enteredLane */) {
+    if (!vehicleApplies(veh)) {
+        return false;
+    }
     // check whether the vehicle shall be rerouted
     const SUMOTime time = MSNet::getInstance()->getCurrentTimeStep();
     const MSTriggeredRerouter::RerouteInterval* rerouteDef = getCurrentReroute(time, veh);
@@ -806,5 +812,10 @@ MSTriggeredRerouter::rerouteParkingArea(const MSTriggeredRerouter::RerouteInterv
     return nearParkArea;
 }
 
+
+bool 
+MSTriggeredRerouter::vehicleApplies(const SUMOVehicle& veh) const {
+    return myVehicleTypes.empty() || myVehicleTypes.count(veh.getVehicleType().getID()) > 0;
+}
 /****************************************************************************/
 
diff --git a/src/microsim/trigger/MSTriggeredRerouter.h b/src/microsim/trigger/MSTriggeredRerouter.h
@@ -75,7 +75,8 @@ class MSTriggeredRerouter :
     MSTriggeredRerouter(const std::string& id,
                         const MSEdgeVector& edges,
                         double prob, const std::string& file, bool off,
-                        SUMOTime timeThreshold);
+                        SUMOTime timeThreshold,
+                        const std::string& vTypes);
 
 
     /** @brief Destructor */
@@ -178,6 +179,7 @@ class MSTriggeredRerouter :
     MSParkingArea* rerouteParkingArea(const MSTriggeredRerouter::RerouteInterval* rerouteDef,
                                       SUMOVehicle& veh, bool& newDestination) const;
 
+
 protected:
     /// @name inherited from GenericSAXHandler
     //@{
@@ -201,6 +203,14 @@ class MSTriggeredRerouter :
      */
     virtual void myEndElement(int element);
     //@}
+
+    /** @brief Checks whether the detector measures vehicles of the given type.
+    *
+    * @param[in] veh the vehicle of which the type is checked.
+    * @return whether it should be measured
+    */
+    bool vehicleApplies(const SUMOVehicle& veh) const;
+
 
 protected:
     /// List of rerouting definition intervals
@@ -215,6 +225,9 @@ class MSTriggeredRerouter :
     // @brief waiting time threshold for activation
     SUMOTime myTimeThreshold;
 
+    /// @brief The vehicle types to look for (empty means all)
+    std::set<std::string> myVehicleTypes;
+
     /// @name members used during loading
     //@{
 

diff --git a/src/netload/NLTriggerBuilder.cpp b/src/netload/NLTriggerBuilder.cpp
@@ -371,10 +371,11 @@ NLTriggerBuilder::parseAndBuildRerouter(MSNet& net, const SUMOSAXAttributes& att
     double prob = attrs.getOpt<double>(SUMO_ATTR_PROB, id.c_str(), ok, 1);
     bool off = attrs.getOpt<bool>(SUMO_ATTR_OFF, id.c_str(), ok, false);
     SUMOTime timeThreshold = TIME2STEPS(attrs.getOpt<double>(SUMO_ATTR_HALTING_TIME_THRESHOLD, id.c_str(), ok, 0));
+    const std::string vTypes = attrs.getOpt<std::string>(SUMO_ATTR_VTYPES, id.c_str(), ok, "");
     if (!ok) {
         throw InvalidArgument("Could not parse MSTriggeredRerouter '" + id + "'.");
     }
-    MSTriggeredRerouter* trigger = buildRerouter(net, id, edges, prob, file, off, timeThreshold);
+    MSTriggeredRerouter* trigger = buildRerouter(net, id, edges, prob, file, off, timeThreshold, vTypes);
     // read in the trigger description
     if (file == "") {
         trigger->registerParent(SUMO_TAG_REROUTER, myHandler);
@@ -422,8 +423,9 @@ MSTriggeredRerouter*
 NLTriggerBuilder::buildRerouter(MSNet&, const std::string& id,
                                 MSEdgeVector& edges,
                                 double prob, const std::string& file, bool off,
-                                SUMOTime timeThreshold) {
-    return new MSTriggeredRerouter(id, edges, prob, file, off, timeThreshold);
+                                SUMOTime timeThreshold,
+                                const std::string& vTypes) {
+    return new MSTriggeredRerouter(id, edges, prob, file, off, timeThreshold, vTypes);
 }
 
 

diff --git a/src/netload/NLTriggerBuilder.h b/src/netload/NLTriggerBuilder.h
@@ -337,7 +337,8 @@ class NLTriggerBuilder {
     virtual MSTriggeredRerouter* buildRerouter(MSNet& net,
             const std::string& id, MSEdgeVector& edges,
             double prob, const std::string& file, bool off,
-            SUMOTime timeThreshold);
+            SUMOTime timeThreshold,
+            const std::string& vTypes);
     //@}