fix energy consumption addition bug

src/TrainDefintion/Car.cpp

@@ -120,8 +120,6 @@ std::pair<bool, double> Car::consumeFuel(double timeStep, double trainSpeed,
     // clear the variables for reassignning
     this->energyConsumed = 0.0; // the step energy consumption of 1 tech
     this->energyRegenerated = 0.0; // the step energy regeneration of 1 tech
-    this->cumEnergyConsumed = 0.0; // the step energy consumption of multiple technologies (e.g hybrid)
-    this->cumEnergyRegenerated = 0.0; // the step energy regeneration of multiple technologies (e.g hybrid)
 
     // check if the energy consumption (in kWH) is energy consumption not regenerated energy
     if (EC_kwh > 0.0) {

src/TrainDefintion/Train.cpp

@@ -99,6 +99,30 @@ double Train::getMinFollowingTrainGap() {
     return DefaultMinFollowingGap;
 }
 
+double Train::getBatteryEnergyConsumed() {
+    double total = 0.0;
+    for (auto &vehicle:this->trainVehicles) {
+        total += vehicle->getBatteryCumEnergyConsumption();
+    }
+    return total;
+}
+
+double Train::getBatteryEnergyRegenerated() {
+    double total = 0.0;
+    for (auto &vehicle:this->trainVehicles) {
+        total += vehicle->getBatteryCumEnergyRegenerated();
+    }
+    return total;
+}
+
+double Train::getBatteryNetEnergyConsumed() {
+    double total = 0.0;
+    for (auto &vehicle:this->trainVehicles) {
+        total += vehicle->getBatteryCumNetEnergyConsumption();
+    }
+    return total;
+}
+
 double Train::getAverageLocomotivesBatteryStatus() {
     double sum = 0;
     for (auto& loco : this->locomotives) {
@@ -152,7 +176,7 @@ double Train::getTrainTotalTorque() {
 double Train::getTrainConsumedTank() {
     double consumption = 0.0;
     for (auto &loco: this->locomotives) {
-        consumption += loco->getTankInitialCapacity() - loco->getTankCurrentCapacity();
+        consumption += loco->getTankCumConsumedFuel();
     }
     return consumption;
 }
@@ -210,6 +234,19 @@ Map<TrainTypes::PowerType, int> Train::LocTypeCount() {
     return typesCount;
 }
 
+Map<TrainTypes::CarType, int> Train::carTypeCount() {
+    Map<TrainTypes::CarType, int> typesCount;
+    for (auto& car : this->cars) {
+        if (typesCount.count(car->carType) > 0) {
+            typesCount[car->carType] += 1;
+        }
+        else {
+            typesCount[car->carType] = 1;
+        }
+    }
+    return typesCount;
+}
+
 void Train::rearrangeTrain() {
     this->trainVehicles.clear();
     int size = this->nlocs + this->nCars;

src/TrainDefintion/Train.h

@@ -328,6 +328,15 @@ class Train {
      */
     Map<TrainTypes::PowerType, int> LocTypeCount();
 
+    /**
+     * @brief car type count
+     *
+     * @author	Ahmed Aredah
+     * @date    4/6/2023
+     *
+     * @returns	A Map&lt;TrainTypes::CarTypes,int&gt;
+     */
+    Map<TrainTypes::CarType, int> carTypeCount();
     /**
      * \brief This function returns the centroids of all vehicles in the train
      *
@@ -348,6 +357,40 @@ class Train {
      */
     int getActiveLocomotivesNumber();
 
+    /**
+     * @brief Gets the battery energy consumed in kWh.
+     *
+     * @details Gets the battery energy consumed only.
+     *          it does not report the energy regenerated.
+     *
+     * @author	Ahmed Aredah
+     * @date	2/28/2023
+     *
+     * @return  the energy consumed in kWh.
+     */
+    double getBatteryEnergyConsumed();
+    /**
+     * @brief Gets the battery energy regenerated in kWh.
+     *
+     * @author	Ahmed Aredah
+     * @date	2/28/2023
+     *
+     * @return  the energy regenerated in kWh.
+     */
+    double getBatteryEnergyRegenerated();
+
+    /**
+     * @brief Gets the battery energy consumed in kWh.
+     *
+     * @details Gets the battery energy consumed and regenerated.
+     *
+     * @author	Ahmed Aredah
+     * @date	2/28/2023
+     *
+     * @return  the energy consumed in kWh.
+     */
+    double getBatteryNetEnergyConsumed();
+
     /**
      * \brief Gets average locomotives battery status
      *

src/TrainDefintion/TrainComponent.cpp

@@ -10,6 +10,8 @@ void TrainComponent::resetTimeStepConsumptions() {
     // reset the energy consumption for the time step.
 	this->energyConsumed = 0.0;
 	this->energyRegenerated = 0.0;
+    this->cumEnergyConsumed = 0.0; // the step energy consumption of multiple technologies (e.g hybrid)
+    this->cumEnergyRegenerated = 0.0; // the step energy regeneration of multiple technologies (e.g hybrid)
 }
 
 void TrainComponent::setCurrentWeight(double newCurrentWeight) {