fixed compilation issues
This commit is contained in:
parent
3c310b492b
commit
52927eaac7
|
@ -6,9 +6,9 @@ namespace traffic_manager {
|
|||
std::string stage_name,
|
||||
std::shared_ptr<PlannerToControlMessenger> messenger,
|
||||
cc::Client &carla_client)
|
||||
: messenger(messenger),
|
||||
carla_client(carla_client),
|
||||
PipelineStage(stage_name) {
|
||||
: PipelineStage(stage_name),
|
||||
messenger(messenger),
|
||||
carla_client(carla_client) {
|
||||
|
||||
// Initializing messenger state.
|
||||
messenger_state = messenger->GetState();
|
||||
|
|
|
@ -4,7 +4,6 @@ namespace traffic_manager {
|
|||
|
||||
namespace CollisionStageConstants {
|
||||
static const float VERTICAL_OVERLAP_THRESHOLD = 2.0f;
|
||||
static const float ZERO_AREA = 0.0001f;
|
||||
static const float BOUNDARY_EXTENSION_MINIMUM = 2.0f;
|
||||
static const float EXTENSION_SQUARE_POINT = 7.5f;
|
||||
static const float TIME_HORIZON = 0.5f;
|
||||
|
@ -24,12 +23,12 @@ namespace CollisionStageConstants {
|
|||
cc::World &world,
|
||||
Parameters ¶meters,
|
||||
cc::DebugHelper &debug_helper)
|
||||
: localization_messenger(localization_messenger),
|
||||
: PipelineStage(stage_name),
|
||||
localization_messenger(localization_messenger),
|
||||
planner_messenger(planner_messenger),
|
||||
world(world),
|
||||
parameters(parameters),
|
||||
debug_helper(debug_helper),
|
||||
PipelineStage(stage_name) {
|
||||
debug_helper(debug_helper){
|
||||
|
||||
// Initializing clock for checking unregistered actors periodically.
|
||||
last_world_actors_pass_instance = chr::system_clock::now();
|
||||
|
@ -203,8 +202,8 @@ namespace CollisionStageConstants {
|
|||
cg::Vector3D reference_to_other = other_vehicle->GetLocation() - reference_vehicle->GetLocation();
|
||||
cg::Vector3D other_to_reference = reference_vehicle->GetLocation() - other_vehicle->GetLocation();
|
||||
|
||||
float inter_geodesic_distance = bg::distance(reference_geodesic_polygon, other_geodesic_polygon);
|
||||
float inter_bbox_distance = bg::distance(reference_polygon, other_polygon);
|
||||
auto inter_geodesic_distance = bg::distance(reference_geodesic_polygon, other_geodesic_polygon);
|
||||
auto inter_bbox_distance = bg::distance(reference_polygon, other_polygon);
|
||||
|
||||
// Whichever vehicle's path is farthest away from the other vehicle gets
|
||||
// priority to move.
|
||||
|
|
|
@ -21,14 +21,14 @@ namespace LocalizationConstants {
|
|||
InMemoryMap &local_map,
|
||||
Parameters ¶meters,
|
||||
cc::DebugHelper &debug_helper)
|
||||
: planner_messenger(planner_messenger),
|
||||
: PipelineStage(stage_name),
|
||||
planner_messenger(planner_messenger),
|
||||
collision_messenger(collision_messenger),
|
||||
traffic_light_messenger(traffic_light_messenger),
|
||||
registered_actors(registered_actors),
|
||||
local_map(local_map),
|
||||
parameters(parameters),
|
||||
debug_helper(debug_helper),
|
||||
PipelineStage(stage_name) {
|
||||
debug_helper(debug_helper) {
|
||||
|
||||
// Initializing various output frame selectors.
|
||||
planner_frame_selector = true;
|
||||
|
|
|
@ -22,15 +22,15 @@ namespace PlannerConstants {
|
|||
std::vector<float> longitudinal_parameters = URBAN_LONGITUDINAL_DEFAULTS,
|
||||
std::vector<float> highway_longitudinal_parameters = HIGHWAY_LONGITUDINAL_DEFAULTS,
|
||||
std::vector<float> lateral_parameters = LATERAL_DEFAULTS)
|
||||
: localization_messenger(localization_messenger),
|
||||
: PipelineStage(stage_name),
|
||||
localization_messenger(localization_messenger),
|
||||
collision_messenger(collision_messenger),
|
||||
traffic_light_messenger(traffic_light_messenger),
|
||||
control_messenger(control_messenger),
|
||||
parameters(parameters),
|
||||
longitudinal_parameters(longitudinal_parameters),
|
||||
highway_longitudinal_parameters(highway_longitudinal_parameters),
|
||||
lateral_parameters(lateral_parameters),
|
||||
PipelineStage(stage_name) {
|
||||
lateral_parameters(lateral_parameters) {
|
||||
|
||||
// Initializing the output frame selector.
|
||||
frame_selector = true;
|
||||
|
|
|
@ -11,11 +11,11 @@ namespace traffic_manager {
|
|||
std::shared_ptr<TrafficLightToPlannerMessenger> planner_messenger,
|
||||
cc::DebugHelper &debug_helper,
|
||||
cc::World &world)
|
||||
: localization_messenger(localization_messenger),
|
||||
: PipelineStage(stage_name),
|
||||
localization_messenger(localization_messenger),
|
||||
planner_messenger(planner_messenger),
|
||||
debug_helper(debug_helper),
|
||||
world(world),
|
||||
PipelineStage(stage_name) {
|
||||
world(world) {
|
||||
|
||||
// Initializing output frame selector.
|
||||
frame_selector = true;
|
||||
|
|
Loading…
Reference in New Issue