checking network existence in libsumo fix #11215

eclipse-sumo · Nov 11, 2023 · 07cd550 · 07cd550
1 parent 70fc57e
commit 07cd550
Show file tree

Hide file tree

Showing 9 changed files with 10 additions and 8 deletions.
diff --git a/src/libsumo/Calibrator.cpp b/src/libsumo/Calibrator.cpp
@@ -43,11 +43,11 @@ ContextSubscriptionResults Calibrator::myContextSubscriptionResults;
 // ===========================================================================
 std::vector<std::string>
 Calibrator::getIDList() {
+    MSNet::getInstance(); // just to check that we actually have a network
     std::vector<std::string> ids;
-    for (auto& item : MSCalibrator::getInstances()) {
+    for (const auto& item : MSCalibrator::getInstances()) {
         ids.push_back(item.first);
     }
-    std::sort(ids.begin(), ids.end());
     return ids;
 }
 

diff --git a/src/libsumo/Edge.cpp b/src/libsumo/Edge.cpp
@@ -47,6 +47,7 @@ ContextSubscriptionResults Edge::myContextSubscriptionResults;
 // ===========================================================================
 std::vector<std::string>
 Edge::getIDList() {
+    MSNet::getInstance(); // just to check that we actually have a network
     std::vector<std::string> ids;
     MSEdge::insertIDs(ids);
     return ids;

diff --git a/src/libsumo/Lane.cpp b/src/libsumo/Lane.cpp
@@ -49,6 +49,7 @@ ContextSubscriptionResults Lane::myContextSubscriptionResults;
 // ===========================================================================
 std::vector<std::string>
 Lane::getIDList() {
+    MSNet::getInstance(); // just to check that we actually have a network
     std::vector<std::string> ids;
     MSLane::insertIDs(ids);
     return ids;

diff --git a/src/libsumo/MeanData.cpp b/src/libsumo/MeanData.cpp
@@ -42,7 +42,7 @@ ContextSubscriptionResults MeanData::myContextSubscriptionResults;
 std::vector<std::string>
 MeanData::getIDList() {
     std::vector<std::string> ids;
-    for (auto item : MSNet::getInstance()->getDetectorControl().getMeanData()) {
+    for (const auto& item : MSNet::getInstance()->getDetectorControl().getMeanData()) {
         ids.push_back(item.first);
     }
     std::sort(ids.begin(), ids.end());

diff --git a/src/libsumo/POI.cpp b/src/libsumo/POI.cpp
@@ -48,8 +48,7 @@ NamedRTree* POI::myTree(nullptr);
 std::vector<std::string>
 POI::getIDList() {
     std::vector<std::string> ids;
-    ShapeContainer& shapeCont = MSNet::getInstance()->getShapeContainer();
-    shapeCont.getPOIs().insertIDs(ids);
+    MSNet::getInstance()->getShapeContainer().getPOIs().insertIDs(ids);
     return ids;
 }
 

diff --git a/src/libsumo/Polygon.cpp b/src/libsumo/Polygon.cpp
@@ -47,8 +47,7 @@ NamedRTree* Polygon::myTree(nullptr);
 std::vector<std::string>
 Polygon::getIDList() {
     std::vector<std::string> ids;
-    ShapeContainer& shapeCont = MSNet::getInstance()->getShapeContainer();
-    shapeCont.getPolygons().insertIDs(ids);
+    MSNet::getInstance()->getShapeContainer().getPolygons().insertIDs(ids);
     return ids;
 }
 

diff --git a/src/libsumo/Rerouter.cpp b/src/libsumo/Rerouter.cpp
@@ -40,6 +40,7 @@ ContextSubscriptionResults Rerouter::myContextSubscriptionResults;
 // ===========================================================================
 std::vector<std::string>
 Rerouter::getIDList() {
+    MSNet::getInstance(); // just to check that we actually have a network
     std::vector<std::string> ids;
     for (const auto& item : MSTriggeredRerouter::getInstances()) {
         ids.push_back(item.first);

diff --git a/src/libsumo/Route.cpp b/src/libsumo/Route.cpp
@@ -44,6 +44,7 @@ ContextSubscriptionResults Route::myContextSubscriptionResults;
 // ===========================================================================
 std::vector<std::string>
 Route::getIDList() {
+    MSNet::getInstance(); // just to check that we actually have a network
     std::vector<std::string> ids;
     MSRoute::insertIDs(ids);
     return ids;

diff --git a/src/libsumo/VariableSpeedSign.cpp b/src/libsumo/VariableSpeedSign.cpp
@@ -40,11 +40,11 @@ ContextSubscriptionResults VariableSpeedSign::myContextSubscriptionResults;
 // ===========================================================================
 std::vector<std::string>
 VariableSpeedSign::getIDList() {
+    MSNet::getInstance(); // just to check that we actually have a network
     std::vector<std::string> ids;
     for (auto& item : MSLaneSpeedTrigger::getInstances()) {
         ids.push_back(item.first);
     }
-    std::sort(ids.begin(), ids.end());
     return ids;
 }