diff --git a/src/microsim/transportables/MSPModel_JuPedSim.cpp b/src/microsim/transportables/MSPModel_JuPedSim.cpp index fcf3561532e..19a7010cc5e 100644 --- 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 index f0329449037..6ba9cf7d4c1 100644 --- 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 diff --git a/tests/sumo/pedestrian_model/jupedsim/identical_start_pos/fcd.sumo b/tests/sumo/pedestrian_model/jupedsim/identical_start_pos/fcd.sumo index 87c3f288937..2b9e252b2ec 100644 --- a/tests/sumo/pedestrian_model/jupedsim/identical_start_pos/fcd.sumo +++ b/tests/sumo/pedestrian_model/jupedsim/identical_start_pos/fcd.sumo @@ -1,6 +1,6 @@ -