first round of cep refactoring #12 #14285

eclipse-sumo · Jan 31, 2024 · 67031b1 · 67031b1
1 parent 051a4b8
commit 67031b1
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 44 deletions.
diff --git a/src/foreign/PHEMlight/V5/cpp/CEP.cpp b/src/foreign/PHEMlight/V5/cpp/CEP.cpp
@@ -142,18 +142,8 @@ namespace PHEMlightdllV5 {
         }
 
         // looping through matrix and assigning values for pollutants
-        double pollutantMultiplyer = 1;
-        setNormalizingPower(CalcPower(Constants::NORMALIZING_SPEED, Constants::NORMALIZING_ACCELARATION, 0, (getCalcType() == "HEV" || getCalcType() == "BEV")));
-        setDrivingPower(getNormalizingPower());
-        if (getHeavyVehicle()) {
-            setNormalizingPower(getRatedPower());
-            setNormalizingType(eNormalizingType_RatedPower);
-            pollutantMultiplyer = getRatedPower();
-        }
-        else {
-            setNormalizingPower(getDrivingPower());
-            setNormalizingType(eNormalizingType_DrivingPower);
-        }
+        const double pollutantMultiplyer = getHeavyVehicle() ? getRatedPower() : 1.;
+        const double normalizingPower = getHeavyVehicle() ? getRatedPower() : CalcPower(Constants::NORMALIZING_SPEED, Constants::NORMALIZING_ACCELARATION, 0, (getCalcType() == "HEV" || getCalcType() == "BEV"));
 
         _powerPatternPollutants = std::vector<double>();
         _normailzedPowerPatternPollutants = std::vector<double>();
@@ -168,7 +158,7 @@ namespace PHEMlightdllV5 {
 
                 if (j == 0) {
                     _normailzedPowerPatternPollutants.push_back(matrixPollutants[i][j]);
-                    _powerPatternPollutants.push_back(matrixPollutants[i][j] * getNormalizingPower());
+                    _powerPatternPollutants.push_back(matrixPollutants[i][j] * normalizingPower);
                 }
                 else {
                     pollutantMeasures[j - 1].push_back(matrixPollutants[i][j] * pollutantMultiplyer);
@@ -213,14 +203,6 @@ namespace PHEMlightdllV5 {
         privateCalcType = value;
     }
 
-    const CEP::eNormalizingType& CEP::getNormalizingType() const {
-        return privateNormalizingType;
-    }
-
-    void CEP::setNormalizingType(const eNormalizingType& value) {
-        privateNormalizingType = value;
-    }
-
     const double& CEP::getRatedPower() const {
         return privateRatedPower;
     }
@@ -229,22 +211,6 @@ namespace PHEMlightdllV5 {
         privateRatedPower = value;
     }
 
-    const double& CEP::getNormalizingPower() const {
-        return privateNormalizingPower;
-    }
-
-    void CEP::setNormalizingPower(const double& value) {
-        privateNormalizingPower = value;
-    }
-
-    const double& CEP::getDrivingPower() const {
-        return privateDrivingPower;
-    }
-
-    void CEP::setDrivingPower(const double& value) {
-        privateDrivingPower = value;
-    }
-
     double CEP::CalcPower(double speed, double acc, double gradient, bool HBEV) {
         //Declaration
         double power = 0;

diff --git a/src/foreign/PHEMlight/V5/cpp/CEP.h b/src/foreign/PHEMlight/V5/cpp/CEP.h
@@ -65,15 +65,8 @@ namespace PHEMlightdllV5 {
         void setCalcType(const std::string& value);
 
     public:
-        const eNormalizingType&  getNormalizingType() const;
-        void setNormalizingType(const eNormalizingType&  value);
-
         const double&  getRatedPower() const;
         void setRatedPower(const double&  value);
-        const double&  getNormalizingPower() const;
-        void setNormalizingPower(const double&  value);
-        const double&  getDrivingPower() const;
-        void setDrivingPower(const double&  value);
         double getAuxPower() const {
             return _auxPower * getRatedPower();
         }