Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
traci
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Model registry
Monitor
Service Desk
Analyze
Contributor analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ezCar2X
ns3
traci
Commits
cf33d1f5
Commit
cf33d1f5
authored
4 years ago
by
Henning Schepker
Committed by
Josef Jiru
4 years ago
Browse files
Options
Downloads
Patches
Plain Diff
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
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
model/sumo-config.cc
+11
-0
11 additions, 0 deletions
model/sumo-config.cc
model/sumo-config.h
+10
-0
10 additions, 0 deletions
model/sumo-config.h
with
21 additions
and
0 deletions
model/sumo-config.cc
+
11
−
0
View file @
cf33d1f5
...
@@ -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
)
{
{
...
...
This diff is collapsed.
Click to expand it.
model/sumo-config.h
+
10
−
0
View file @
cf33d1f5
...
@@ -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
;
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment