Skip to content
Snippets Groups Projects
Commit 291cd11d authored by Andreas Rauschert's avatar Andreas Rauschert
Browse files

Merge branch 'update_traffic_swarm_parameters' into 'master'

Update TrafficSwarmParameters

See merge request eclipse/openpass/mantle-api!111
parents d90af5aa cc3409da
No related branches found
No related tags found
1 merge request!111Update TrafficSwarmParameters
Pipeline #30206 passed
......@@ -25,9 +25,15 @@ namespace mantle_api
struct TrafficSwarmParameters
{
struct SpeedRange
{
units::velocity::meters_per_second_t minimum;
units::velocity::meters_per_second_t maximum;
};
std::string central_entity_name;
size_t maximum_number_of_vehicles;
units::velocity::meters_per_second_t vehicle_velocity;
SpeedRange speed_range;
units::length::meter_t exclusion_radius;
units::length::meter_t semi_minor_spawning_radius;
units::length::meter_t semi_major_spawning_radius;
......@@ -39,7 +45,8 @@ class ITrafficSwarmService
public:
virtual std::vector<mantle_api::Pose> GetAvailableSpawningPoses() const = 0;
virtual mantle_api::VehicleProperties GetVehicleProperties(mantle_api::VehicleClass vehicle_class) const = 0;
virtual void UpdateControllerParameters(std::unique_ptr<mantle_api::ExternalControllerConfig>& config) = 0;
virtual void UpdateControllerConfig(std::unique_ptr<mantle_api::ExternalControllerConfig>& config,
units::velocity::meters_per_second_t speed) = 0;
virtual void SetSwarmEntitiesCount(size_t count) = 0;
};
......
......@@ -492,8 +492,8 @@ class MockTrafficSwarmService : public mantle_api::ITrafficSwarmService
(const, override));
MOCK_METHOD(void,
UpdateControllerParameters,
(std::unique_ptr<mantle_api::ExternalControllerConfig>&),
UpdateControllerConfig,
(std::unique_ptr<mantle_api::ExternalControllerConfig>&, units::velocity::meters_per_second_t),
(override));
MOCK_METHOD(void,
......
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