adding departSpeed=avg refs #2024

eclipse-sumo · Dec 23, 2021 · d66ca6c · d66ca6c
1 parent 25cd7ea
commit d66ca6c
Show file tree

Hide file tree

Showing 5 changed files with 13 additions and 1 deletion.
diff --git a/data/xsd/routeTypes.xsd b/data/xsd/routeTypes.xsd
@@ -677,6 +677,7 @@
                     <xsd:enumeration value="desired"/>
                     <xsd:enumeration value="speedLimit"/>
                     <xsd:enumeration value="last"/>
+                    <xsd:enumeration value="avg"/>
                 </xsd:restriction>
             </xsd:simpleType> 
         </xsd:union>

diff --git a/src/microsim/MSLane.cpp b/src/microsim/MSLane.cpp
@@ -522,6 +522,11 @@ MSLane::getDepartSpeed(const MSVehicle& veh, bool& patchSpeed) {
             patchSpeed = false;
             break;
         }
+        case DepartSpeedDefinition::AVG: {
+            speed = MIN2(getVehicleMaxSpeed(&veh), getMeanSpeed());
+            patchSpeed = false;
+            break;
+        }
         case DepartSpeedDefinition::DEFAULT:
         default:
             // speed = 0 was set before

diff --git a/src/traci-server/TraCIServerAPI_Vehicle.cpp b/src/traci-server/TraCIServerAPI_Vehicle.cpp
@@ -958,6 +958,8 @@ TraCIServerAPI_Vehicle::processSet(TraCIServer& server, tcpip::Storage& inputSto
                     departSpeed = "speedLimit";
                 } else if (-departSpeedCode == (int)DepartSpeedDefinition::LAST) {
                     departSpeed = "last";
+                } else if (-departSpeedCode == (int)DepartSpeedDefinition::AVG) {
+                    departSpeed = "avg";
                 }
 
                 int departLaneCode;

diff --git a/src/utils/vehicle/SUMOVehicleParameter.cpp b/src/utils/vehicle/SUMOVehicleParameter.cpp
@@ -427,6 +427,8 @@ SUMOVehicleParameter::parseDepartSpeed(const std::string& val, const std::string
         dsd = DepartSpeedDefinition::LIMIT;
     } else if (val == "last") {
         dsd = DepartSpeedDefinition::LAST;
+    } else if (val == "avg") {
+        dsd = DepartSpeedDefinition::AVG;
     } else {
         try {
             speed = StringUtils::toDouble(val);

diff --git a/src/utils/vehicle/SUMOVehicleParameter.h b/src/utils/vehicle/SUMOVehicleParameter.h
@@ -208,7 +208,9 @@ enum class DepartSpeedDefinition {
     /// @brief The maximum lane speed is used (speedLimit)
     LIMIT,
     /// @brief The speed of the last vehicle. Fallback to DepartSpeedDefinition::DESIRED if there is no vehicle on the departLane yet.
-    LAST
+    LAST,
+    /// @brief The average speed on the lane. Fallback to DepartSpeedDefinition::DESIRED if there is no vehicle on the departLane yet.
+    AVG
 };