fixing warnings #3

eclipse-sumo · May 17, 2024 · cc39136 · cc39136
1 parent b83e3a5
commit cc39136
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/microsim/devices/MSDevice_Transportable.cpp b/src/microsim/devices/MSDevice_Transportable.cpp
@@ -186,11 +186,11 @@ MSDevice_Transportable::notifyMove(SUMOTrafficObject& /*tObject*/, double /*oldP
                         // no boarding / unboarding time in meso
                         arrivalTime += 1;
                     } else {
-                        const double bf = transportable->getVehicleType().getBoardingFactor();
+                        const SUMOTime boardingTime = (SUMOTime)((double)boardingDuration * transportable->getVehicleType().getBoardingFactor());
                         if (timeForNext > currentTime - DELTA_T) {
-                            timeForNext += boardingDuration * bf;
+                            timeForNext += boardingTime;
                         } else {
-                            timeForNext = currentTime + boardingDuration * bf;
+                            timeForNext = currentTime + boardingTime;
                         }
                     }
                     //ensure that vehicle stops long enough for deboarding

diff --git a/src/microsim/transportables/MSStageTrip.h b/src/microsim/transportables/MSStageTrip.h
@@ -101,18 +101,13 @@ class MSStageTrip : public MSStage {
     }
 
     /// @brief trip doesn't participate in plan summary
-    SUMOTime getTimeLoss() const {
-        return 0;
-    }
     SUMOTime getDuration() const {
         return 0;
     }
+
     SUMOTime getTravelTime() const {
         return 0;
     }
-    SUMOTime getWaitingTime() const {
-        return 0;
-    }
 
     /** @brief Called on writing vehroute output
     *

diff --git a/src/microsim/transportables/MSTransportableControl.cpp b/src/microsim/transportables/MSTransportableControl.cpp
@@ -286,7 +286,7 @@ MSTransportableControl::loadAnyWaiting(const MSEdge* edge, SUMOVehicle* vehicle,
                     t->setAbortWaiting(-1);
                 }
                 if (timeToLoadNext >= 0) { // meso does not have loading times
-                    const SUMOTime loadingDuration = vehicle->getVehicleType().getLoadingDuration(t->isPerson()) * t->getVehicleType().getBoardingFactor();
+                    const SUMOTime loadingDuration = (SUMOTime)((double)vehicle->getVehicleType().getLoadingDuration(t->isPerson()) * t->getVehicleType().getBoardingFactor());
                     //update the time point at which the next transportable can be loaded on the vehicle
                     if (timeToLoadNext > currentTime - DELTA_T) {
                         timeToLoadNext += loadingDuration;