refactoring error messages, adding default tyoe fallback #12

eclipse-sumo · Jun 30, 2023 · 41aac30 · 41aac30
1 parent 21c4fb3
commit 41aac30
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 16 deletions.
diff --git a/src/microsim/transportables/MSPModel_JuPedSim.cpp b/src/microsim/transportables/MSPModel_JuPedSim.cpp
@@ -99,20 +99,17 @@ MSPModel_JuPedSim::tryInsertion(PState* state) {
     std::map<std::string, JPS_ModelParameterProfileId>::iterator it = myJPSParameterProfileIds.find(pedestrianTypeID);
     if (it != myJPSParameterProfileIds.end()) {
         agent_parameters.profileId = it->second;
-    }
-    else {
-        std::ostringstream oss;
-        oss << "Error while adding an agent: vType " << pedestrianTypeID << " hasn't been registered as a JuPedSim parameter profile.";
-        WRITE_WARNING(oss.str());
+    } else {
+        WRITE_WARNINGF(TL("Error while adding an agent: vType '%' hasn't been registered as a JuPedSim parameter profile, using the default type."), pedestrianTypeID);
+        agent_parameters.profileId = myJPSParameterProfileIds[DEFAULT_PEDTYPE_ID];
     }
 
     JPS_ErrorMessage message = nullptr;
     JPS_AgentId agentId = JPS_Simulation_AddVelocityModelAgent(myJPSSimulation, agent_parameters, &message);
     if (message != nullptr) {
         WRITE_WARNINGF(TL("Error while adding an agent: %"), JPS_ErrorMessage_GetMessage(message));
         JPS_ErrorMessage_Free(message);
-    }
-    else {
+    } else {
         state->setAgentId(agentId);
     }
 }
@@ -577,9 +574,7 @@ MSPModel_JuPedSim::initialize() {
 
     myJPSGeometry = JPS_GeometryBuilder_Build(myJPSGeometryBuilder, &message);
     if (myJPSGeometry == nullptr) {
-        std::ostringstream oss;
-        oss << "Error while creating the geometry: " << JPS_ErrorMessage_GetMessage(message);
-        WRITE_ERROR(oss.str());
+        WRITE_WARNINGF(TL("Error creating the geometry: %"), JPS_ErrorMessage_GetMessage(message));
     }
 
     JPS_VelocityModelBuilder modelBuilder = JPS_VelocityModelBuilder_Create(8.0, 0.1, 5.0, 0.02);
@@ -592,16 +587,12 @@ MSPModel_JuPedSim::initialize() {
 
     myJPSModel = JPS_VelocityModelBuilder_Build(modelBuilder, &message);
     if (myJPSModel == nullptr) {
-        std::ostringstream oss;
-        oss << "Error while creating the pedestrian model: " << JPS_ErrorMessage_GetMessage(message);
-        WRITE_ERROR(oss.str());
+        WRITE_WARNINGF(TL("Error creating the pedestrian model: %"), JPS_ErrorMessage_GetMessage(message));
     }
 
 	myJPSSimulation = JPS_Simulation_Create(myJPSModel, myJPSGeometry, STEPS2TIME(myJPSDeltaT), &message);
     if (myJPSSimulation == nullptr) {
-        std::ostringstream oss;
-        oss << "Error while creating the simulation: " << JPS_ErrorMessage_GetMessage(message);
-        WRITE_ERROR(oss.str());
+        WRITE_WARNINGF(TL("Error creating the simulation: %"), JPS_ErrorMessage_GetMessage(message));
     }
 
     JPS_ErrorMessage_Free(message);

diff --git a/src/microsim/transportables/MSStageTrip.cpp b/src/microsim/transportables/MSStageTrip.cpp
@@ -143,6 +143,7 @@ MSStageTrip::setArrived(MSNet* net, MSTransportable* transportable, SUMOTime now
     if (transportable->getNumStages() == transportable->getNumRemainingStages()) { // this is a difficult way to check that we are the first stage
         myDepartPos = transportable->getParameter().departPos;
         if (transportable->getParameter().departPosProcedure == DepartPosDefinition::RANDOM) {
+            // TODO we should probably use the rng of the lane here
             myDepartPos = RandHelper::rand(myOrigin->getLength());
         }
         previous = new MSStageWaiting(myOrigin, nullptr, -1, transportable->getParameter().depart, myDepartPos, "start", true);