refactoring refs #12, #14698

eclipse-sumo · Apr 11, 2024 · dba8eb0 · dba8eb0
1 parent 1876fd8
commit dba8eb0
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 6 deletions.
diff --git a/src/guisim/GUIChargingStation.cpp b/src/guisim/GUIChargingStation.cpp
@@ -133,7 +133,7 @@ GUIChargingStation::drawGL(const GUIVisualizationSettings& s) const {
     glTranslated(0, 0, getType());
 
     // set color depending if charging station is charging
-    if (myChargingVehicle == true) {
+    if (myChargingVehicle) {
         GLHelper::setColor(s.colorSettings.chargingStationColorCharge);
     } else {
         GLHelper::setColor(s.colorSettings.chargingStationColor);

diff --git a/src/microsim/devices/MSDevice_FCD.h b/src/microsim/devices/MSDevice_FCD.h
@@ -100,7 +100,7 @@ class MSDevice_FCD : public MSVehicleDevice {
 
     /// @brief is there a filter based on shapes?
     inline static bool hasShapeFilter() {
-        return myShapeFilterDesired == true;
+        return myShapeFilterDesired;
     }
 
 private:

diff --git a/src/microsim/trigger/MSChargingStation.cpp b/src/microsim/trigger/MSChargingStation.cpp
@@ -158,13 +158,13 @@ MSChargingStation::addChargeValueForOutput(double WCharged, MSDevice_Battery* ba
     if (battery->getChargingStartTime() > myChargeDelay) {
         if (battery->getHolder().getSpeed() < battery->getStoppingThreshold()) {
             status = "chargingStopped";
-        } else if (myChargeInTransit == true) {
+        } else if (myChargeInTransit) {
             status = "chargingInTransit";
         } else {
             status = "noCharging";
         }
     } else {
-        if (myChargeInTransit == true) {
+        if (myChargeInTransit) {
             status = "waitingChargeInTransit";
         } else if (battery->getHolder().getSpeed() < battery->getStoppingThreshold()) {
             status = "waitingChargeStopped";

diff --git a/src/netbuild/NBEdgeCont.cpp b/src/netbuild/NBEdgeCont.cpp
@@ -322,7 +322,7 @@ NBEdgeCont::retrievePossiblySplit(const std::string& id, bool downstream) const
     // NOTE: (TODO) for multiply split edges (e.g. 15[0][0]) one could try recursion
     if ((retrieve(id + "[0]") != nullptr) && (retrieve(id + "[1]") != nullptr)) {
         // Edge was split during the netbuilding process
-        if (downstream == true) {
+        if (downstream) {
             return retrieve(id + "[1]");
         } else {
             return retrieve(id + "[0]");

diff --git a/src/utils/vehicle/SUMOVehicleParameter.cpp b/src/utils/vehicle/SUMOVehicleParameter.cpp
@@ -300,7 +300,7 @@ SUMOVehicleParameter::Stop::write(OutputDevice& dev, const bool close, const boo
         dev.writeAttr(SUMO_ATTR_COLLISION, collision);
     }
     // only write friendly position if is true
-    if (friendlyPos == true) {
+    if (friendlyPos) {
         dev.writeAttr(SUMO_ATTR_FRIENDLY_POS, friendlyPos);
     }
     // only write act type if isn't empty