reducing dependency between battery device and energy model #2212 #2775

eclipse-sumo · Feb 2, 2024 · bbf87ea · bbf87ea
1 parent f803520
commit bbf87ea
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 20 deletions.
diff --git a/src/microsim/MSVehicleType.cpp b/src/microsim/MSVehicleType.cpp
@@ -453,8 +453,18 @@ MSVehicleType::check() {
                            toString(getVehicleClass()), getID());
         }
     }
+    if (!myParameter.wasSet(VTYPEPARS_EMISSIONCLASS_SET) && !OptionsCont::getOptions().getBool("device.battery.track-fuel")
+            && (OptionsCont::getOptions().getFloat("device.battery.probability") == 1.
+                || myParameter.getDouble("device.battery.probability", -1.) == 1.
+                || StringUtils::toBool(myParameter.getParameter("has.battery.device", "false")))) {
+        myParameter.emissionClass = PollutantsInterface::getClassByName("Energy");
+        myParameter.parametersSet |= VTYPEPARS_EMISSIONCLASS_SET;
+        WRITE_WARNINGF(TL("The battery device is active for vType '%' but no emission class is set. The emission class Energy/unknown will be used, please consider setting an explicit emission class!"),
+                       getID());
+    }
 }
 
+
 void
 MSVehicleType::setAccel(double accel) {
     if (myOriginalType != nullptr && accel < 0) {

diff --git a/src/microsim/devices/MSDevice_Battery.cpp b/src/microsim/devices/MSDevice_Battery.cpp
@@ -131,19 +131,12 @@ MSDevice_Battery::MSDevice_Battery(SUMOVehicle& holder, const std::string& id, c
         myStoppingThreshold = stoppingThreshold;
     }
 
-    EnergyParams* const params = myHolder.getEmissionParameters();
-    params->checkParam(SUMO_ATTR_VEHICLEMASS, getID());
-    params->checkParam(SUMO_ATTR_FRONTSURFACEAREA, getID());
-    params->checkParam(SUMO_ATTR_AIRDRAGCOEFFICIENT, getID());
-    params->checkParam(SUMO_ATTR_INTERNALMOMENTOFINERTIA, getID());
-    params->checkParam(SUMO_ATTR_RADIALDRAGCOEFFICIENT, getID());
-    params->checkParam(SUMO_ATTR_ROLLDRAGCOEFFICIENT, getID());
-    params->checkParam(SUMO_ATTR_CONSTANTPOWERINTAKE, getID());
-    params->checkParam(SUMO_ATTR_PROPULSIONEFFICIENCY, getID());
-    params->checkParam(SUMO_ATTR_RECUPERATIONEFFICIENCY, getID());
-    params->checkParam(SUMO_ATTR_RECUPERATIONEFFICIENCY_BY_DECELERATION, getID());
-
-    myTrackFuel = !PollutantsInterface::getEnergyHelper().includesClass(holder.getVehicleType().getEmissionClass()) && OptionsCont::getOptions().getBool("device.battery.track-fuel");
+    myTrackFuel = PollutantsInterface::getFuel(holder.getVehicleType().getEmissionClass()) != "Electricity" && OptionsCont::getOptions().getBool("device.battery.track-fuel");
+    if (!myTrackFuel && !holder.getVehicleType().getParameter().wasSet(VTYPEPARS_EMISSIONCLASS_SET)) {
+        WRITE_WARNINGF(TL("The battery device is active for vehicle '%' but no emission class is set. "
+                          "Please consider setting an explicit emission class or battery outputs might be inconsistent with emission outputs!"),
+                       holder.getID());
+    }
 }
 
 
@@ -169,14 +162,15 @@ bool MSDevice_Battery::notifyMove(SUMOTrafficObject& tObject, double /* oldPos *
     EnergyParams* const params = myHolder.getEmissionParameters();
     if (getMaximumBatteryCapacity() != 0) {
         params->setDouble(SUMO_ATTR_ANGLE, myLastAngle == std::numeric_limits<double>::infinity() ? 0. : GeomHelper::angleDiff(myLastAngle, veh.getAngle()));
-        if (myTrackFuel) {
-            // [ml]
-            myConsum = PollutantsInterface::compute(veh.getVehicleType().getEmissionClass(), PollutantsInterface::FUEL, veh.getSpeed(), veh.getAcceleration(),
-                                                    veh.getSlope(), params) * TS;
-        } else {
-            // [Wh]
+        if (!myTrackFuel && !veh.getVehicleType().getParameter().wasSet(VTYPEPARS_EMISSIONCLASS_SET)) {
+            // no explicit emission class, we fall back to the energy model; a warning has been issued on creation
             myConsum = PollutantsInterface::getEnergyHelper().compute(0, PollutantsInterface::ELEC, veh.getSpeed(), veh.getAcceleration(),
                        veh.getSlope(), params) * TS;
+        } else {
+            myConsum = PollutantsInterface::compute(veh.getVehicleType().getEmissionClass(),
+                                                    myTrackFuel ? PollutantsInterface::FUEL : PollutantsInterface::ELEC,
+                                                    veh.getSpeed(), veh.getAcceleration(),
+                                                    veh.getSlope(), params) * TS;
         }
         if (veh.isParking()) {
             // recuperation from last braking step is ok but further consumption should cease

diff --git a/src/utils/emissions/HelpersEnergy.h b/src/utils/emissions/HelpersEnergy.h
@@ -47,6 +47,13 @@ class HelpersEnergy : public PollutantsInterface::Helper {
      */
     HelpersEnergy();
 
+    /** @brief Returns the fuel type described by this emission class as described in the Amitran interface (Gasoline, Diesel, ...)
+     * @param[in] c the emission class
+     * @return always "Electricity"
+     */
+    std::string getFuel(const SUMOEmissionClass /* c */) const {
+        return "Electricity";
+    }
 
     /** @brief Computes the emitted pollutant amount using the given speed and acceleration
      *

diff --git a/src/utils/emissions/HelpersHBEFA4.cpp b/src/utils/emissions/HelpersHBEFA4.cpp
@@ -10109,6 +10109,12 @@ HelpersHBEFA4::getFuel(const SUMOEmissionClass c) const {
     if (name.find("_diesel_") != std::string::npos) {
         fuel = "Diesel";
     }
+    if (name.find("_BEV") != std::string::npos) {
+        fuel = "Electricity";
+    }
+    if (name.find("_PHEV") != std::string::npos) {
+        fuel = "Hybrid" + fuel;
+    }
     return fuel;
 }
 

diff --git a/src/utils/emissions/HelpersMMPEVEM.h b/src/utils/emissions/HelpersMMPEVEM.h
@@ -51,6 +51,14 @@ class HelpersMMPEVEM : public PollutantsInterface::Helper {
      */
     HelpersMMPEVEM();
 
+    /** @brief Returns the fuel type described by this emission class as described in the Amitran interface (Gasoline, Diesel, ...)
+     * @param[in] c the emission class
+     * @return always "Electricity"
+     */
+    std::string getFuel(const SUMOEmissionClass /* c */) const {
+        return "Electricity";
+    }
+
     /**
      * \brief Compute the amount of emitted pollutants for an emission class in a
      *        given state.

diff --git a/src/utils/emissions/HelpersPHEMlight5.cpp b/src/utils/emissions/HelpersPHEMlight5.cpp
@@ -109,6 +109,23 @@ HelpersPHEMlight5::getClassByName(const std::string& eClass, const SUMOVehicleCl
 }
 
 
+std::string
+HelpersPHEMlight5::getFuel(const SUMOEmissionClass c) const {
+    const std::string name = myEmissionClassStrings.getString(c);
+    std::string fuel = "Gasoline";
+    if (name.find("_D_") != std::string::npos) {
+        fuel = "Diesel";
+    }
+    if (name.find("_BEV_") != std::string::npos) {
+        fuel = "Electricity";
+    }
+    if (name.find("_HEV") != std::string::npos) {
+        fuel = "Hybrid" + fuel;
+    }
+    return fuel;
+}
+
+
 double
 HelpersPHEMlight5::getEmission(PHEMlightdllV5::CEP* currCep, const std::string& e, const double p, const double v, const double drivingPower) const {
     return currCep->GetEmission(e, p, v, &myHelper, drivingPower);

diff --git a/src/utils/emissions/HelpersPHEMlight5.h b/src/utils/emissions/HelpersPHEMlight5.h
@@ -59,6 +59,12 @@ class HelpersPHEMlight5 : public HelpersPHEMlight {
      */
     SUMOEmissionClass getClassByName(const std::string& eClass, const SUMOVehicleClass vc);
 
+    /** @brief Returns the fuel type described by this emission class as described in the Amitran interface (Gasoline, Diesel, ...)
+     * @param[in] c the emission class
+     * @return the fuel type
+     */
+    std::string getFuel(const SUMOEmissionClass c) const;
+
     /** @brief Returns the amount of emitted pollutant given the vehicle type and state (in mg/s or in ml/s for fuel)
      * @param[in] c The vehicle emission class
      * @param[in] v The vehicle's current velocity

diff --git a/src/utils/emissions/PollutantsInterface.h b/src/utils/emissions/PollutantsInterface.h
@@ -298,7 +298,7 @@ class PollutantsInterface {
 
     /** @brief Returns the fuel type of the given emission class
      * @param[in] c The vehicle emission class
-     * @return "Diesel", "Gasoline", "HybridDiesel", or "HybridGasoline"
+     * @return "Diesel", "Gasoline", "HybridDiesel", "HybridGasoline", or "Electricity"
      */
     static std::string getFuel(const SUMOEmissionClass c);