p71924506
/
carla
mirror of https://github.com/carla-simulator/carla.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

function name camel case

This commit is contained in:
Daniel Grimm 2024-04-29 08:32:20 +02:00 committed by Blyron
parent 441372b369
commit 7a540559a9
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.cpp
View File

@ -12,7 +12,7 @@
#include <chrono> #include <chrono>
static const float scLowFrequencyContainerInterval = 0.5; static const float scLowFrequencyContainerInterval = 0.5;
ITSContainer::SpeedValue_t CaService::buildSpeedValue(const float vel) ITSContainer::SpeedValue_t CaService::BuildSpeedValue(const float vel)
{ {
static const float lower = 0.0; // meter_per_second static const float lower = 0.0; // meter_per_second
static const float upper = 163.82; // meter_per_second static const float upper = 163.82; // meter_per_second
@ -474,7 +474,7 @@ void CaService::AddBasicVehicleContainerHighFrequency(CAMContainer::HighFrequenc
bvc.heading.headingConfidence = ITSContainer::HeadingConfidence_equalOrWithinOneDegree; // TODO bvc.heading.headingConfidence = ITSContainer::HeadingConfidence_equalOrWithinOneDegree; // TODO
// speed // speed
// speed with noise // speed with noise
bvc.speed.speedValue = buildSpeedValue(ComputeSpeed()); bvc.speed.speedValue = BuildSpeedValue(ComputeSpeed());
bvc.speed.speedConfidence = ITSContainer::SpeedConfidence_equalOrWithInOneCentimerterPerSec * 3; // TODO bvc.speed.speedConfidence = ITSContainer::SpeedConfidence_equalOrWithInOneCentimerterPerSec * 3; // TODO
// direction // direction
bvc.driveDirection = (mVehicle->GetVehicleForwardSpeed() / 100.0f) >= 0.0 ? ITSContainer::DriveDirection_forward : ITSContainer::DriveDirection_backward; bvc.driveDirection = (mVehicle->GetVehicleForwardSpeed() / 100.0f) >= 0.0 ? ITSContainer::DriveDirection_forward : ITSContainer::DriveDirection_backward;

2
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.h
View File

@ -128,5 +128,5 @@ private:
// random for noise // random for noise
URandomEngine *mRandomEngine; URandomEngine *mRandomEngine;
ITSContainer::SpeedValue_t buildSpeedValue(const float vel); ITSContainer::SpeedValue_t BuildSpeedValue(const float vel);
}; };

4
Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/PathLossModel.cpp
View File

@ -278,7 +278,7 @@ double PathLossModel::CalcVehicleLoss(const double d1, const double d2, const do
{ {
double V = h * sqrt(2.0 * (d1 + d2) / (lambda * d1 * d2)); double V = h * sqrt(2.0 * (d1 + d2) / (lambda * d1 * d2));
if (V >= -0.78) { if (V >= -0.78) {
double T = std::pow(V - 0.1, 2) + 1.0; double T = std::pow(V - 0.1, 2);
return 6.9 + 20.0 * log10(sqrt(T + 1.0) + V - 0.1); return 6.9 + 20.0 * log10(sqrt(T + 1.0) + V - 0.1);
} }
return 0.0; return 0.0;
@ -363,7 +363,7 @@ float PathLossModel::ComputeLoss(AActor *OtherActor, FVector Source, FVector Des
} }
else else
{ {
// fspl + multi knife edge // fspl + knife edge
// fspl // fspl
double free_space_loss = 20.0 * log10(Distance3d) + 20.0 * log10(4.0 * M_PI / lambda); double free_space_loss = 20.0 * log10(Distance3d) + 20.0 * log10(4.0 * M_PI / lambda);
// add the knife edge vehicle blockage loss // add the knife edge vehicle blockage loss