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

wifi: Rename to reflect there might be multiple PHYs handled by helpers

Browse Source
This commit is contained in:
Sébastien Deronne
2023-09-12 21:18:32 +02:00
parent b3fc36dc9a
commit 0d12e750e8
4 changed files with 18 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/wifi/helper/spectrum-wifi-helper.cc
View File

@@ -42,8 +42,8 @@ NS_LOG_COMPONENT_DEFINE("SpectrumWifiHelper");
SpectrumWifiPhyHelper::SpectrumWifiPhyHelper(uint8_t nLinks)
: WifiPhyHelper(nLinks)
{
NS_ABORT_IF(m_phy.size() != nLinks);
for (auto& phy : m_phy)
NS_ABORT_IF(m_phys.size() != nLinks);
for (auto& phy : m_phys)
{
phy.SetTypeId("ns3::SpectrumWifiPhy");
}
@@ -113,9 +113,9 @@ SpectrumWifiPhyHelper::Create(Ptr<Node> node, Ptr<WifiNetDevice> device) const
{
std::vector<Ptr<WifiPhy>> ret;
for (std::size_t i = 0; i < m_phy.size(); i++)
for (std::size_t i = 0; i < m_phys.size(); i++)
{
Ptr<SpectrumWifiPhy> phy = m_phy.at(i).Create<SpectrumWifiPhy>();
auto phy = m_phys.at(i).Create<SpectrumWifiPhy>();
auto interference = m_interferenceHelper.Create<InterferenceHelper>();
phy->SetInterferenceHelper(interference);
Ptr<ErrorRateModel> error = m_errorRateModel.at(i).Create<ErrorRateModel>();

6
src/wifi/helper/wifi-helper.cc
View File

@@ -147,7 +147,7 @@ WifiPhyHelper::WifiPhyHelper(uint8_t nLinks)
: m_pcapDlt(PcapHelper::DLT_IEEE802_11)
{
NS_ABORT_IF(nLinks == 0);
m_phy.resize(nLinks);
m_phys.resize(nLinks);
m_errorRateModel.resize(nLinks);
m_frameCaptureModel.resize(nLinks);
m_preambleDetectionModel.resize(nLinks);
@@ -162,7 +162,7 @@ WifiPhyHelper::~WifiPhyHelper()
void
WifiPhyHelper::Set(std::string name, const AttributeValue& v)
{
for (auto& phy : m_phy)
for (auto& phy : m_phys)
{
phy.Set(name, v);
}
@@ -171,7 +171,7 @@ WifiPhyHelper::Set(std::string name, const AttributeValue& v)
void
WifiPhyHelper::Set(uint8_t linkId, std::string name, const AttributeValue& v)
{
m_phy.at(linkId).Set(name, v);
m_phys.at(linkId).Set(name, v);
}
void

8
src/wifi/helper/wifi-helper.h
View File

@@ -235,7 +235,7 @@ class WifiPhyHelper : public PcapHelperForDevice, public AsciiTraceHelperForDevi
SignalNoiseDbm signalNoise,
uint16_t staId = SU_STA_ID);
std::vector<ObjectFactory> m_phy; ///< PHY object
std::vector<ObjectFactory> m_phys; ///< PHY objects
ObjectFactory m_interferenceHelper; ///< interference helper
std::vector<ObjectFactory> m_errorRateModel; ///< error rate model
std::vector<ObjectFactory> m_frameCaptureModel; ///< frame capture model
@@ -549,7 +549,7 @@ template <typename... Args>
void
WifiPhyHelper::SetErrorRateModel(std::string type, Args&&... args)
{
for (std::size_t linkId = 0; linkId < m_phy.size(); linkId++)
for (std::size_t linkId = 0; linkId < m_phys.size(); linkId++)
{
SetErrorRateModel(linkId, type, std::forward<Args>(args)...);
}
@@ -567,7 +567,7 @@ template <typename... Args>
void
WifiPhyHelper::SetFrameCaptureModel(std::string type, Args&&... args)
{
for (std::size_t linkId = 0; linkId < m_phy.size(); linkId++)
for (std::size_t linkId = 0; linkId < m_phys.size(); linkId++)
{
SetFrameCaptureModel(linkId, type, std::forward<Args>(args)...);
}
@@ -585,7 +585,7 @@ template <typename... Args>
void
WifiPhyHelper::SetPreambleDetectionModel(std::string type, Args&&... args)
{
for (std::size_t linkId = 0; linkId < m_phy.size(); linkId++)
for (std::size_t linkId = 0; linkId < m_phys.size(); linkId++)
{
SetPreambleDetectionModel(linkId, type, std::forward<Args>(args)...);
}

14
src/wifi/helper/yans-wifi-helper.cc
View File

@@ -82,7 +82,7 @@ YansWifiPhyHelper::YansWifiPhyHelper()
: WifiPhyHelper(1), // YANS phy is not used for 11be devices
m_channel(nullptr)
{
m_phy.at(0).SetTypeId("ns3::YansWifiPhy");
m_phys.front().SetTypeId("ns3::YansWifiPhy");
SetInterferenceHelper("ns3::InterferenceHelper");
SetErrorRateModel("ns3::TableBasedErrorRateModel");
}
@@ -103,19 +103,19 @@ YansWifiPhyHelper::SetChannel(std::string channelName)
std::vector<Ptr<WifiPhy>>
YansWifiPhyHelper::Create(Ptr<Node> node, Ptr<WifiNetDevice> device) const
{
Ptr<YansWifiPhy> phy = m_phy.at(0).Create<YansWifiPhy>();
Ptr<YansWifiPhy> phy = m_phys.front().Create<YansWifiPhy>();
Ptr<InterferenceHelper> interference = m_interferenceHelper.Create<InterferenceHelper>();
phy->SetInterferenceHelper(interference);
Ptr<ErrorRateModel> error = m_errorRateModel.at(0).Create<ErrorRateModel>();
Ptr<ErrorRateModel> error = m_errorRateModel.front().Create<ErrorRateModel>();
phy->SetErrorRateModel(error);
if (m_frameCaptureModel.at(0).IsTypeIdSet())
if (m_frameCaptureModel.front().IsTypeIdSet())
{
auto frameCapture = m_frameCaptureModel.at(0).Create<FrameCaptureModel>();
auto frameCapture = m_frameCaptureModel.front().Create<FrameCaptureModel>();
phy->SetFrameCaptureModel(frameCapture);
}
if (m_preambleDetectionModel.at(0).IsTypeIdSet())
if (m_preambleDetectionModel.front().IsTypeIdSet())
{
auto preambleDetection = m_preambleDetectionModel.at(0).Create<PreambleDetectionModel>();
auto preambleDetection = m_preambleDetectionModel.front().Create<PreambleDetectionModel>();
phy->SetPreambleDetectionModel(preambleDetection);
}
phy->SetChannel(m_channel);