diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.cpp index 0c4ea10ef..7e224c612 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.cpp @@ -12,7 +12,7 @@ #include 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 upper = 163.82; // meter_per_second @@ -474,7 +474,7 @@ void CaService::AddBasicVehicleContainerHighFrequency(CAMContainer::HighFrequenc bvc.heading.headingConfidence = ITSContainer::HeadingConfidence_equalOrWithinOneDegree; // TODO // speed // speed with noise - bvc.speed.speedValue = buildSpeedValue(ComputeSpeed()); + bvc.speed.speedValue = BuildSpeedValue(ComputeSpeed()); bvc.speed.speedConfidence = ITSContainer::SpeedConfidence_equalOrWithInOneCentimerterPerSec * 3; // TODO // direction bvc.driveDirection = (mVehicle->GetVehicleForwardSpeed() / 100.0f) >= 0.0 ? ITSContainer::DriveDirection_forward : ITSContainer::DriveDirection_backward; diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.h b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.h index 070f185ad..9f644a181 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.h +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/CaService.h @@ -128,5 +128,5 @@ private: // random for noise URandomEngine *mRandomEngine; - ITSContainer::SpeedValue_t buildSpeedValue(const float vel); + ITSContainer::SpeedValue_t BuildSpeedValue(const float vel); }; diff --git a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/PathLossModel.cpp b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/PathLossModel.cpp index 79046a264..a6b404b80 100644 --- a/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/PathLossModel.cpp +++ b/Unreal/CarlaUE4/Plugins/Carla/Source/Carla/Sensor/V2X/PathLossModel.cpp @@ -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)); 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 0.0; @@ -363,7 +363,7 @@ float PathLossModel::ComputeLoss(AActor *OtherActor, FVector Source, FVector Des } else { - // fspl + multi knife edge + // fspl + knife edge // fspl double free_space_loss = 20.0 * log10(Distance3d) + 20.0 * log10(4.0 * M_PI / lambda); // add the knife edge vehicle blockage loss