F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: Use std::optional instead of magic value

Browse Source
This commit is contained in:
Sébastien Deronne
2024-06-29 08:43:25 +02:00
committed by Sébastien Deronne
parent 4aea7e751e
commit dc860e90fe
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/wifi/model/phy-entity.cc
View File

@@ -1004,14 +1004,14 @@ PhyEntity::EndPreambleDetectionPeriod(Ptr<Event> event)
// calculate PER on the measurement channel for PHY headers
const auto measurementChannelWidth = GetMeasurementChannelWidth(event->GetPpdu());
auto measurementBand = GetPrimaryBand(measurementChannelWidth);
double maxRxPowerW = -1; // in case current event may not be sent on measurement channel
// (rxPowerW would be equal to 0)
std::optional<double>
maxRxPowerW; // in case current event may not be sent on measurement channel
Ptr<Event> maxEvent;
NS_ASSERT(!m_wifiPhy->m_currentPreambleEvents.empty());
for (auto preambleEvent : m_wifiPhy->m_currentPreambleEvents)
{
double rxPowerW = preambleEvent.second->GetRxPowerW(measurementBand);
if (rxPowerW > maxRxPowerW)
const auto rxPowerW = preambleEvent.second->GetRxPowerW(measurementBand);
if (!maxRxPowerW || (rxPowerW > *maxRxPowerW))
{
maxRxPowerW = rxPowerW;
maxEvent = preambleEvent.second;
@@ -1047,7 +1047,7 @@ PhyEntity::EndPreambleDetectionPeriod(Ptr<Event> event)
measurementBand);
NS_LOG_DEBUG("SNR(dB)=" << RatioToDb(snr) << " at end of preamble detection period");
if ((!m_wifiPhy->m_preambleDetectionModel && maxRxPowerW > 0.0) ||
if ((!m_wifiPhy->m_preambleDetectionModel && maxRxPowerW && (*maxRxPowerW > 0.0)) ||
(m_wifiPhy->m_preambleDetectionModel &&
m_wifiPhy->m_preambleDetectionModel->IsPreambleDetected(
m_wifiPhy->m_currentEvent->GetRxPowerW(measurementBand),