Skip to content
Snippets Groups Projects
Commit cf33d1f5 authored by Henning Schepker's avatar Henning Schepker Committed by Josef Jiru
Browse files

Resolve "Add option for acceleration in fcd output of SUMO"

parent f1f7aad7
No related branches found
No related tags found
No related merge requests found
...@@ -45,6 +45,7 @@ SumoConfig::SetupCommandLine (CommandLine& cmd) ...@@ -45,6 +45,7 @@ SumoConfig::SetupCommandLine (CommandLine& cmd)
cmd.AddValue ("sumo-args", "SUMO custom command line options with ':' instead of spaces", m_args); cmd.AddValue ("sumo-args", "SUMO custom command line options with ':' instead of spaces", m_args);
cmd.AddValue ("sumo-copy", "List of files to copy to the SUMO launcher, separated by ':'", m_copy); cmd.AddValue ("sumo-copy", "List of files to copy to the SUMO launcher, separated by ':'", m_copy);
cmd.AddValue ("sumo-fcd-output", "Filename for fcd output of the SUMO launcher", m_fcd_out); cmd.AddValue ("sumo-fcd-output", "Filename for fcd output of the SUMO launcher", m_fcd_out);
cmd.AddValue ("sumo-fcd-accel", "Log acceleration in fcd output", m_fcd_accel);
cmd.AddValue ("sumo-lat-resolution", "Lateral resolution for the SUMO sub-lane model", m_lat_resolution); cmd.AddValue ("sumo-lat-resolution", "Lateral resolution for the SUMO sub-lane model", m_lat_resolution);
} }
...@@ -112,6 +113,10 @@ SumoConfig::GetRunArguments () const ...@@ -112,6 +113,10 @@ SumoConfig::GetRunArguments () const
{ {
list.push_back ("--fcd-output"); list.push_back ("--fcd-output");
list.push_back (m_fcd_out); list.push_back (m_fcd_out);
if (m_fcd_accel)
{
list.push_back ("--fcd-output.acceleration");
}
} }
if (!m_lat_resolution.empty ()) if (!m_lat_resolution.empty ())
...@@ -227,6 +232,12 @@ SumoConfig::SetFcdOutput (std::string fcd_file) ...@@ -227,6 +232,12 @@ SumoConfig::SetFcdOutput (std::string fcd_file)
m_fcd_out = fcd_file; m_fcd_out = fcd_file;
} }
void
SumoConfig::SetFcdAccel (bool log_accel)
{
m_fcd_accel = log_accel;
}
void void
SumoConfig::SetLatResolution (std::string resolution) SumoConfig::SetLatResolution (std::string resolution)
{ {
......
...@@ -186,6 +186,13 @@ public: ...@@ -186,6 +186,13 @@ public:
void void
SetFcdOutput (std::string fcd_file); SetFcdOutput (std::string fcd_file);
/*!
* @brief Manually set filename for fcd output
* @param fcd_accel if acceleration should be logged in fcd output
*/
void
SetFcdAccel (bool log_accel);
/*! /*!
* @brief Manually set the lateral resolution for the SUMO sub-lane model. * @brief Manually set the lateral resolution for the SUMO sub-lane model.
* @param step lateral resolution in m (float) * @param step lateral resolution in m (float)
...@@ -232,6 +239,9 @@ private: ...@@ -232,6 +239,9 @@ private:
//! filename for fcd output of SUMO launcher //! filename for fcd output of SUMO launcher
std::string m_fcd_out; std::string m_fcd_out;
//! Logging acceleration in fcd output
bool m_fcd_accel = false;
//! lateral resolution for sub-lane model in SUMO //! lateral resolution for sub-lane model in SUMO
std::string m_lat_resolution; std::string m_lat_resolution;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment