fixing parameter parsing #14285

eclipse-sumo · Feb 2, 2024 · 4fe225b · 4fe225b
1 parent b365dbf
commit 4fe225b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/src/utils/emissions/EnergyParams.cpp b/src/utils/emissions/EnergyParams.cpp
@@ -68,6 +68,10 @@ EnergyParams::EnergyParams(const SUMOEmissionClass c) {
     myMap[SUMO_ATTR_WAITINGTIME] = -1.;
 
     if (c != EMISSION_CLASS_UNSPECIFIED && StringUtils::startsWith(PollutantsInterface::getName(c), "PHEMlight5/")) {
+        myMap[SUMO_ATTR_VEHICLEMASS] = INVALID_DOUBLE;
+        myMap[SUMO_ATTR_FRONTSURFACEAREA] = INVALID_DOUBLE;
+        myMap[SUMO_ATTR_AIRDRAGCOEFFICIENT] = INVALID_DOUBLE;
+        myMap[SUMO_ATTR_CONSTANTPOWERINTAKE] = INVALID_DOUBLE;
         return;
     }
     // default values from
@@ -130,7 +134,7 @@ EnergyParams::getDouble(SumoXMLAttr attr) const {
 double
 EnergyParams::getDoubleOptional(SumoXMLAttr attr, const double def) const {
     auto it = myMap.find(attr);
-    if (it != myMap.end()) {
+    if (it != myMap.end() && it->second != INVALID_DOUBLE) {
         return it->second;
     }
     if (mySecondaryParams != nullptr) {

diff --git a/src/utils/emissions/HelpersPHEMlight5.cpp b/src/utils/emissions/HelpersPHEMlight5.cpp
@@ -137,7 +137,7 @@ HelpersPHEMlight5::calcPower(PHEMlightdllV5::CEP* currCep, const double v, const
     // copy of CEP::CalcPower
     const double power = calcWheelPower(currCep, v, a, slope, param) / PHEMlightdllV5::Constants::_DRIVE_TRAIN_EFFICIENCY;
     if (!(currCep->getCalcType() == "HEV" || currCep->getCalcType() == "BEV")) {
-        return power + param->getDoubleOptional(SUMO_ATTR_CONSTANTPOWERINTAKE, currCep->getAuxPower());
+        return power + param->getDoubleOptional(SUMO_ATTR_CONSTANTPOWERINTAKE, currCep->getAuxPower() * 1000.) / 1000.;
     }
     return power;
 }
@@ -247,7 +247,7 @@ HelpersPHEMlight5::compute(const SUMOEmissionClass c, const PollutantsInterface:
         }
         case PollutantsInterface::ELEC:
             if (isBEV) {
-                const double auxPower = param->getDoubleOptional(SUMO_ATTR_CONSTANTPOWERINTAKE, currCep->getAuxPower());
+                const double auxPower = param->getDoubleOptional(SUMO_ATTR_CONSTANTPOWERINTAKE, currCep->getAuxPower() * 1000.) / 1000.;
                 return (getEmission(currCep, "FC_el", power, corrSpeed, drivingPower) + auxPower) / SECONDS_PER_HOUR * 1000.;
             }
             return 0;