access to mass inside energy params #15024

eclipse-sumo · Dec 9, 2024 · fd285aa · fd285aa
1 parent b21ab68
commit fd285aa
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 1 deletion.
diff --git a/src/microsim/MSVehicleType.cpp b/src/microsim/MSVehicleType.cpp
@@ -259,6 +259,7 @@ void
 MSVehicleType::setMass(double mass) {
     myParameter.mass = mass;
     myParameter.parametersSet |= VTYPEPARS_MASS_SET;
+    const_cast<EnergyParams&>(myEnergyParams).setMass(mass);
 }
 
 

diff --git a/src/microsim/MSVehicleType.h b/src/microsim/MSVehicleType.h
@@ -204,7 +204,7 @@ class MSVehicleType {
      * @return The mass of this vehicle type
      */
     inline double getMass() const {
-        return myParameter.mass;
+        return myEnergyParams.getDouble(SUMO_ATTR_MASS);
     }
 
 

diff --git a/src/utils/emissions/EnergyParams.cpp b/src/utils/emissions/EnergyParams.cpp
@@ -118,6 +118,19 @@ EnergyParams::setDynamicValues(const SUMOTime stopDuration, const bool parking,
 }
 
 
+void
+EnergyParams::setMass(const double mass) {
+    myMap[SUMO_ATTR_MASS] = mass;
+    myHaveDefaultMass = false;
+}
+
+
+void
+EnergyParams::setTransportableMass(const double mass) {
+    myTransportableMass = mass;
+}
+
+
 double
 EnergyParams::getAngleDiff() const {
     return myLastAngle == INVALID_DOUBLE ? 0. : GeomHelper::angleDiff(myLastAngle, myAngle);

diff --git a/src/utils/emissions/EnergyParams.h b/src/utils/emissions/EnergyParams.h
@@ -60,6 +60,13 @@ class EnergyParams {
     }
 
     void setDynamicValues(const SUMOTime stopDuration, const bool parking, const SUMOTime waitingTime, const double angle);
+    void setMass(const double mass);
+
+    double getTransportableMass() const {
+        return myTransportableMass;
+    }
+
+    void setTransportableMass(const double mass);
 
     double getAngleDiff() const;
 
@@ -114,6 +121,7 @@ class EnergyParams {
     double myWaitingTimeSeconds = -1.;
     double myLastAngle = INVALID_DOUBLE;
     double myAngle = INVALID_DOUBLE;
+    double myTransportableMass = 0.;
 
     static const EnergyParams* myDefault;
     static const std::vector<SumoXMLAttr> myParamAttrs;