limit charged energy by battery capacity ref #14473

Signed-off-by: m-kro <m.barthauer@t-online.de>
eclipse-sumo · Mar 6, 2024 · 7973c31 · 7973c31
1 parent 9a28efd
commit 7973c31
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/src/microsim/devices/MSDevice_Battery.cpp b/src/microsim/devices/MSDevice_Battery.cpp
@@ -240,14 +240,10 @@ bool MSDevice_Battery::notifyMove(SUMOTrafficObject& tObject, double /* oldPos *
                 myActChargingStation->setChargingVehicle(true);
 
                 // Calulate energy charged
-                myEnergyCharged = myActChargingStation->getChargingPower(myTrackFuel) * myActChargingStation->getEfficency() * TS;
+                myEnergyCharged = MIN2(myActChargingStation->getChargingPower(myTrackFuel) * myActChargingStation->getEfficency() * TS, getMaximumBatteryCapacity() - getActualBatteryCapacity());
 
                 // Update Battery charge
-                if ((myEnergyCharged + getActualBatteryCapacity()) > getMaximumBatteryCapacity()) {
-                    setActualBatteryCapacity(getMaximumBatteryCapacity());
-                } else {
-                    setActualBatteryCapacity(getActualBatteryCapacity() + myEnergyCharged);
-                }
+                setActualBatteryCapacity(getActualBatteryCapacity() + myEnergyCharged);
             }
             // add charge value for output to myActChargingStation
             myActChargingStation->addChargeValueForOutput(myEnergyCharged, this);