Small refactoring of MSTrainHelper.

eclipse-sumo · Feb 19, 2024 · 386be62 · 386be62
1 parent 98e67f4
commit 386be62
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 23 deletions.
diff --git a/src/guisim/GUIVehicle.cpp b/src/guisim/GUIVehicle.cpp
@@ -339,7 +339,7 @@ GUIVehicle::drawAction_drawCarriageClass(const GUIVisualizationSettings& s, bool
     Position front, back;
     double angle = 0.0;
     double curCLength = trainHelper.getFirstCarriageLength();
-    std::vector<MSTrainHelper::Carriage*> carriages = trainHelper.getCarriages();
+    const std::vector<MSTrainHelper::Carriage*>& carriages = trainHelper.getCarriages();
     for (int i = 0; i < numCarriages; ++i) {
         front = carriages[i]->front;
         back = carriages[i]->back;

diff --git a/src/microsim/MSTrainHelper.h b/src/microsim/MSTrainHelper.h
@@ -56,22 +56,6 @@ class MSTrainHelper {
         return myUpscaleLength;
     }
 
-    inline double getLocomotiveLength(void) const {
-        return myLocomotiveLength;
-    } 
-
-    inline double getDefaultLength(void) const {
-        return myDefaultLength;
-    }
-
-    inline double getCarriageGap(void) const {
-        return myCarriageGap;
-    }
-
-    inline double getLength(void) const {
-        return myLength;
-    }
-
     inline double getHalfWidth(void) const {
         return myHalfWidth;
     }
@@ -80,10 +64,6 @@ class MSTrainHelper {
         return myNumCarriages;
     }
 
-    inline double getCarriageLengthWithGap(void) const {
-        return myCarriageLengthWithGap;
-    }
-
     inline double getCarriageLength(void) const {
         return myCarriageLength;
     }
@@ -114,7 +94,7 @@ class MSTrainHelper {
         std::vector<Position> doors;
     };
 
-    inline std::vector<Carriage*> getCarriages(void) const {
+    inline const std::vector<Carriage*>& getCarriages(void) const {
         return myCarriages;
     }
 

diff --git a/src/microsim/transportables/MSPModel_JuPedSim.cpp b/src/microsim/transportables/MSPModel_JuPedSim.cpp
@@ -417,7 +417,7 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
             std::vector<GEOSGeometry*> rampPolygons;
             for (const MSVehicle* train : allStoppedTrains) {
                 const MSTrainHelper trainHelper(train);
-                const std::vector<MSTrainHelper::Carriage*> carriages = trainHelper.getCarriages();
+                const std::vector<MSTrainHelper::Carriage*>& carriages = trainHelper.getCarriages();
                 for (const MSTrainHelper::Carriage* carriage : carriages) {
                     Position dir = carriage->front - carriage->back;
                         if (dir.length2D() == 0.0) {