fixing insertion if it fails for several steps #13491

eclipse-sumo · Jun 28, 2023 · bb3a7d0 · bb3a7d0
1 parent f50be05
commit bb3a7d0
Show file tree

Hide file tree

Showing 5 changed files with 438 additions and 9 deletions.
diff --git a/src/microsim/transportables/MSPModel_JuPedSim.cpp b/src/microsim/transportables/MSPModel_JuPedSim.cpp
@@ -99,9 +99,7 @@ MSPModel_JuPedSim::tryInsertion(PState* state) {
     JPS_ErrorMessage message = nullptr;
     JPS_AgentId agentId = JPS_Simulation_AddVelocityModelAgent(myJPSSimulation, agent_parameters, &message);
     if (message != nullptr) {
-        std::ostringstream oss;
-        oss << "Error while adding an agent: " << JPS_ErrorMessage_GetMessage(message);
-        WRITE_WARNING(oss.str());
+        WRITE_WARNINGF(TL("Error while adding an agent: %"), JPS_ErrorMessage_GetMessage(message));
         JPS_ErrorMessage_Free(message);
     } else {
         state->setAgentId(agentId);
@@ -157,9 +155,7 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
         // Perform one JuPedSim iteration.
 		bool ok = JPS_Simulation_Iterate(myJPSSimulation, &message);
         if (!ok) {
-            std::ostringstream oss;
-            oss << "Error during iteration " << i << ": " << JPS_ErrorMessage_GetMessage(message);
-            WRITE_ERROR(oss.str());
+            WRITE_ERRORF(TL("Error during iteration %: %"), i, JPS_ErrorMessage_GetMessage(message));
         }
     }
 
@@ -170,6 +166,7 @@ MSPModel_JuPedSim::execute(SUMOTime time) {
         PState* const state = *stateIt;
         if (state->isWaitingToEnter()) {
             tryInsertion(state);
+            ++stateIt;
             continue;
         }
         // Updates the agent position.

diff --git a/tests/sumo/pedestrian_model/jupedsim/identical_start_pos/errors.sumo b/tests/sumo/pedestrian_model/jupedsim/identical_start_pos/errors.sumo
@@ -1 +1,8 @@
 Warning: Error while adding an agent: Model constraint violation: Agent 2 too close to agent 1
+Warning: Error while adding an agent: Model constraint violation: Agent 3 too close to agent 1
+Warning: Error while adding an agent: Model constraint violation: Agent 4 too close to agent 1
+Warning: Error while adding an agent: Model constraint violation: Agent 6 too close to agent 5
+Warning: Error while adding an agent: Model constraint violation: Agent 7 too close to agent 5
+Warning: Error while adding an agent: Model constraint violation: Agent 8 too close to agent 5
+Warning: Error while adding an agent: Model constraint violation: Agent 9 too close to agent 5
+Warning: Error while adding an agent: Model constraint violation: Agent 11 too close to agent 10