From d54e5c4e911f8717633577187f777345d63f2b4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=A9bastien=20Deronne?= Date: Thu, 13 Jun 2024 20:40:24 +0200 Subject: [PATCH] wifi: Use meter_u weak alias --- examples/wireless/wifi-80211e-txop.cc | 2 +- examples/wireless/wifi-aggregation.cc | 2 +- examples/wireless/wifi-eht-network.cc | 2 +- examples/wireless/wifi-he-network.cc | 4 +-- examples/wireless/wifi-ht-network.cc | 6 ++-- examples/wireless/wifi-multi-tos.cc | 2 +- .../wifi-power-adaptation-distance.cc | 2 +- examples/wireless/wifi-simple-adhoc-grid.cc | 2 +- examples/wireless/wifi-simple-interference.cc | 2 +- examples/wireless/wifi-spatial-reuse.cc | 6 ++-- .../wireless/wifi-spectrum-per-example.cc | 2 +- .../wifi-spectrum-per-interference.cc | 2 +- .../wifi-spectrum-saturation-example.cc | 2 +- examples/wireless/wifi-txop-aggregation.cc | 2 +- examples/wireless/wifi-vht-network.cc | 4 +-- examples/wireless/wifi-wired-bridging.cc | 2 +- src/wifi/examples/wifi-bianchi.cc | 12 ++++---- src/wifi/examples/wifi-phy-test.cc | 2 +- .../examples/wifi-test-interference-helper.cc | 4 +-- src/wifi/test/inter-bss-test-suite.cc | 30 +++++++++---------- 20 files changed, 46 insertions(+), 46 deletions(-) diff --git a/examples/wireless/wifi-80211e-txop.cc b/examples/wireless/wifi-80211e-txop.cc index e06b89679..4dd09877f 100644 --- a/examples/wireless/wifi-80211e-txop.cc +++ b/examples/wireless/wifi-80211e-txop.cc @@ -85,7 +85,7 @@ main(int argc, char* argv[]) { uint32_t payloadSize{1472}; // bytes Time simulationTime{"10s"}; - double distance{5}; // meters + meter_u distance{5}; bool enablePcap{false}; bool verifyResults{false}; // used for regression Time txopLimit{"4096us"}; diff --git a/examples/wireless/wifi-aggregation.cc b/examples/wireless/wifi-aggregation.cc index abb8fd0ad..24652e04c 100644 --- a/examples/wireless/wifi-aggregation.cc +++ b/examples/wireless/wifi-aggregation.cc @@ -73,7 +73,7 @@ main(int argc, char* argv[]) { uint32_t payloadSize{1472}; // bytes Time simulationTime{"10s"}; - double distance{5}; // meters + meter_u distance{5}; bool enableRts{false}; bool enablePcap{false}; bool verifyResults{false}; // used for regression diff --git a/examples/wireless/wifi-eht-network.cc b/examples/wireless/wifi-eht-network.cc index 63d035502..a5ee804fd 100644 --- a/examples/wireless/wifi-eht-network.cc +++ b/examples/wireless/wifi-eht-network.cc @@ -144,7 +144,7 @@ main(int argc, char* argv[]) uint16_t auxPhyChWidth{20}; bool auxPhyTxCapable{true}; Time simulationTime{"10s"}; - double distance{1.0}; // meters + meter_u distance{1.0}; double frequency{5}; // whether the first link operates in the 2.4, 5 or 6 GHz double frequency2{0}; // whether the second link operates in the 2.4, 5 or 6 GHz (0 means no // second link exists) diff --git a/examples/wireless/wifi-he-network.cc b/examples/wireless/wifi-he-network.cc index dbfc9a19d..602e20328 100644 --- a/examples/wireless/wifi-he-network.cc +++ b/examples/wireless/wifi-he-network.cc @@ -64,8 +64,8 @@ main(int argc, char* argv[]) bool use80Plus80{false}; bool useExtendedBlockAck{false}; Time simulationTime{"10s"}; - double distance{1.0}; // meters - double frequency{5}; // whether 2.4, 5 or 6 GHz + meter_u distance{1.0}; + double frequency{5}; // whether 2.4, 5 or 6 GHz std::size_t nStations{1}; std::string dlAckSeqType{"NO-OFDMA"}; bool enableUlOfdma{false}; diff --git a/examples/wireless/wifi-ht-network.cc b/examples/wireless/wifi-ht-network.cc index 737d3e412..4d94b2acd 100644 --- a/examples/wireless/wifi-ht-network.cc +++ b/examples/wireless/wifi-ht-network.cc @@ -57,9 +57,9 @@ main(int argc, char* argv[]) bool udp{true}; bool useRts{false}; Time simulationTime{"10s"}; - double distance{1.0}; // meters - double frequency{5}; // whether 2.4 or 5 GHz - int mcs{-1}; // -1 indicates an unset value + meter_u distance{1.0}; + double frequency{5}; // whether 2.4 or 5 GHz + int mcs{-1}; // -1 indicates an unset value double minExpectedThroughput{0.0}; double maxExpectedThroughput{0.0}; diff --git a/examples/wireless/wifi-multi-tos.cc b/examples/wireless/wifi-multi-tos.cc index f4caae68a..66d2aa3cb 100644 --- a/examples/wireless/wifi-multi-tos.cc +++ b/examples/wireless/wifi-multi-tos.cc @@ -38,7 +38,7 @@ main(int argc, char* argv[]) { uint32_t nWifi{4}; Time simulationTime{"10s"}; - double distance{1.0}; // meters + meter_u distance{1.0}; uint16_t mcs{7}; uint8_t channelWidth{20}; // MHz bool useShortGuardInterval{false}; diff --git a/examples/wireless/wifi-power-adaptation-distance.cc b/examples/wireless/wifi-power-adaptation-distance.cc index ea1c02a2e..f0da9a720 100644 --- a/examples/wireless/wifi-power-adaptation-distance.cc +++ b/examples/wireless/wifi-power-adaptation-distance.cc @@ -393,7 +393,7 @@ main(int argc, char* argv[]) int sta1_x{5}; int sta1_y{0}; uint32_t steps{200}; - uint32_t stepsSize{1}; + meter_u stepsSize{1}; Time stepsTime{"1s"}; CommandLine cmd(__FILE__); diff --git a/examples/wireless/wifi-simple-adhoc-grid.cc b/examples/wireless/wifi-simple-adhoc-grid.cc index cec5d45e7..630e2ef96 100644 --- a/examples/wireless/wifi-simple-adhoc-grid.cc +++ b/examples/wireless/wifi-simple-adhoc-grid.cc @@ -139,7 +139,7 @@ int main(int argc, char* argv[]) { std::string phyMode{"DsssRate1Mbps"}; - double distance{100}; // m + meter_u distance{100}; uint32_t packetSize{1000}; // bytes uint32_t numPackets{1}; uint32_t numNodes{25}; // by default, 5x5 diff --git a/examples/wireless/wifi-simple-interference.cc b/examples/wireless/wifi-simple-interference.cc index 34f770729..5d8a8882c 100644 --- a/examples/wireless/wifi-simple-interference.cc +++ b/examples/wireless/wifi-simple-interference.cc @@ -161,7 +161,7 @@ main(int argc, char* argv[]) uint32_t numPackets{1}; Time interPacketInterval{"1s"}; Time startTime{"10s"}; - double distanceToRx{100.0}; // meters + meter_u distanceToRx{100.0}; double offset{91}; // This is a magic number used to set the // transmit power, based on other configuration diff --git a/examples/wireless/wifi-spatial-reuse.cc b/examples/wireless/wifi-spatial-reuse.cc index 54a7091f6..356a5f6a4 100644 --- a/examples/wireless/wifi-spatial-reuse.cc +++ b/examples/wireless/wifi-spatial-reuse.cc @@ -146,9 +146,9 @@ int main(int argc, char* argv[]) { Time duration{"10s"}; - double d1{30.0}; // meters - double d2{30.0}; // meters - double d3{150.0}; // meters + meter_u d1{30.0}; + meter_u d2{30.0}; + meter_u d3{150.0}; dBm_u powSta1{10.0}; dBm_u powSta2{10.0}; dBm_u powAp1{21.0}; diff --git a/examples/wireless/wifi-spectrum-per-example.cc b/examples/wireless/wifi-spectrum-per-example.cc index 79037d6d8..1736e06be 100644 --- a/examples/wireless/wifi-spectrum-per-example.cc +++ b/examples/wireless/wifi-spectrum-per-example.cc @@ -118,7 +118,7 @@ int main(int argc, char* argv[]) { bool udp{true}; - double distance{50}; + meter_u distance{50}; Time simulationTime{"10s"}; uint16_t index{256}; std::string wifiType{"ns3::SpectrumWifiPhy"}; diff --git a/examples/wireless/wifi-spectrum-per-interference.cc b/examples/wireless/wifi-spectrum-per-interference.cc index 4e7189dbf..ebd34563c 100644 --- a/examples/wireless/wifi-spectrum-per-interference.cc +++ b/examples/wireless/wifi-spectrum-per-interference.cc @@ -169,7 +169,7 @@ int main(int argc, char* argv[]) { bool udp{true}; - double distance{50}; + meter_u distance{50}; Time simulationTime{"10s"}; uint16_t index{256}; std::string wifiType{"ns3::SpectrumWifiPhy"}; diff --git a/examples/wireless/wifi-spectrum-saturation-example.cc b/examples/wireless/wifi-spectrum-saturation-example.cc index 2e2bbae0f..f2fd34cff 100644 --- a/examples/wireless/wifi-spectrum-saturation-example.cc +++ b/examples/wireless/wifi-spectrum-saturation-example.cc @@ -89,7 +89,7 @@ NS_LOG_COMPONENT_DEFINE("WifiSpectrumSaturationExample"); int main(int argc, char* argv[]) { - double distance{1}; + meter_u distance{1}; Time simulationTime{"10s"}; uint16_t index{256}; uint32_t channelWidth{0}; diff --git a/examples/wireless/wifi-txop-aggregation.cc b/examples/wireless/wifi-txop-aggregation.cc index b720a5e26..e0807cfa5 100644 --- a/examples/wireless/wifi-txop-aggregation.cc +++ b/examples/wireless/wifi-txop-aggregation.cc @@ -100,7 +100,7 @@ main(int argc, char* argv[]) uint32_t payloadSize{1472}; // bytes Time simulationTime{"10s"}; double txopLimit{3520}; // microseconds - double distance{5}; // meters + meter_u distance{5}; bool enableRts{false}; bool enablePcap{false}; bool verifyResults{false}; // used for regression diff --git a/examples/wireless/wifi-vht-network.cc b/examples/wireless/wifi-vht-network.cc index 139abb5de..5aa3bc387 100644 --- a/examples/wireless/wifi-vht-network.cc +++ b/examples/wireless/wifi-vht-network.cc @@ -57,8 +57,8 @@ main(int argc, char* argv[]) bool useRts{false}; bool use80Plus80{false}; Time simulationTime{"10s"}; - double distance{1.0}; // meters - int mcs{-1}; // -1 indicates an unset value + meter_u distance{1.0}; + int mcs{-1}; // -1 indicates an unset value std::string phyModel{"Yans"}; double minExpectedThroughput{0.0}; double maxExpectedThroughput{0.0}; diff --git a/examples/wireless/wifi-wired-bridging.cc b/examples/wireless/wifi-wired-bridging.cc index 401a9560a..6dd7a9547 100644 --- a/examples/wireless/wifi-wired-bridging.cc +++ b/examples/wireless/wifi-wired-bridging.cc @@ -81,7 +81,7 @@ main(int argc, char* argv[]) backboneDevices = csma.Install(backboneNodes); - double wifiX = 0.0; + meter_u wifiX = 0.0; YansWifiPhyHelper wifiPhy; wifiPhy.SetPcapDataLinkType(WifiPhyHelper::DLT_IEEE802_11_RADIO); diff --git a/src/wifi/examples/wifi-bianchi.cc b/src/wifi/examples/wifi-bianchi.cc index 76c3d989a..9f5cb37b6 100644 --- a/src/wifi/examples/wifi-bianchi.cc +++ b/src/wifi/examples/wifi-bianchi.cc @@ -2399,7 +2399,7 @@ class Experiment * \param pcap flag to enable/disable PCAP files generation * \param infra flag to enable infrastructure model, ring adhoc network if not set * \param guardIntervalNs the guard interval in ns - * \param distanceM the distance in meters + * \param distance the distance * \param apTxPower the AP transmit power * \param staTxPower the STA transmit power * \param pktInterval the packet interval @@ -2415,7 +2415,7 @@ class Experiment bool pcap, bool infra, uint16_t guardIntervalNs, - double distanceM, + meter_u distance, dBm_u apTxPower, dBm_u staTxPower, Time pktInterval); @@ -2436,7 +2436,7 @@ Experiment::Run(const WifiHelper& helper, bool pcap, bool infra, uint16_t guardIntervalNs, - double distance, + meter_u distance, dBm_u apTxPower, dBm_u staTxPower, Time pktInterval) @@ -2705,9 +2705,9 @@ main(int argc, char* argv[]) uint16_t pktInterval = 1000; ///< The socket packet interval in microseconds (a higher value is needed to reach ///< saturation conditions as the channel bandwidth or the MCS increases) - double distance = 0.001; ///< The distance in meters between the AP and the STAs - dBm_u apTxPower = 16; ///< The transmit power of the AP (if infrastructure only) - dBm_u staTxPower = 16; ///< The transmit power of each STA (or all STAs if adhoc) + meter_u distance = 0.001; ///< The distance in meters between the AP and the STAs + dBm_u apTxPower = 16; ///< The transmit power of the AP (if infrastructure only) + dBm_u staTxPower = 16; ///< The transmit power of each STA (or all STAs if adhoc) // Disable fragmentation and RTS/CTS Config::SetDefault("ns3::WifiRemoteStationManager::FragmentationThreshold", diff --git a/src/wifi/examples/wifi-phy-test.cc b/src/wifi/examples/wifi-phy-test.cc index ce5b36ccf..ff2ccf518 100644 --- a/src/wifi/examples/wifi-phy-test.cc +++ b/src/wifi/examples/wifi-phy-test.cc @@ -28,7 +28,7 @@ class PsrExperiment struct Input { Input(); - double distance; ///< distance + meter_u distance; ///< distance std::string txMode; ///< transmit mode uint8_t txPowerLevel; ///< transmit power level uint32_t packetSize; ///< packet size diff --git a/src/wifi/examples/wifi-test-interference-helper.cc b/src/wifi/examples/wifi-test-interference-helper.cc index 68fbc0e97..7bc51f2e6 100644 --- a/src/wifi/examples/wifi-test-interference-helper.cc +++ b/src/wifi/examples/wifi-test-interference-helper.cc @@ -73,8 +73,8 @@ class InterferenceExperiment { Input(); Time interval; ///< interval - double xA; ///< x A - double xB; ///< x B + meter_u xA; ///< x A + meter_u xB; ///< x B std::string txModeA; ///< transmit mode A std::string txModeB; ///< transmit mode B double txPowerLevelA; ///< transmit power level A diff --git a/src/wifi/test/inter-bss-test-suite.cc b/src/wifi/test/inter-bss-test-suite.cc index 299b51f1e..566d49bc7 100644 --- a/src/wifi/test/inter-bss-test-suite.cc +++ b/src/wifi/test/inter-bss-test-suite.cc @@ -87,18 +87,18 @@ class TestInterBssConstantObssPdAlgo : public TestCase /** * Allocate the node positions - * \param d1 distance d1 (in meters) - * \param d2 distance d2 (in meters) - * \param d3 distance d3 (in meters) - * \param d4 distance d4 (in meters) - * \param d5 distance d5 (in meters) + * \param d1 distance d1 + * \param d2 distance d2 + * \param d3 distance d3 + * \param d4 distance d4 + * \param d5 distance d5 * \return the node positions */ - Ptr AllocatePositions(double d1, - double d2, - double d3, - double d4, - double d5); + Ptr AllocatePositions(meter_u d1, + meter_u d2, + meter_u d3, + meter_u d4, + meter_u d5); /** * Set the expected transmit power @@ -233,11 +233,11 @@ TestInterBssConstantObssPdAlgo::~TestInterBssConstantObssPdAlgo() } Ptr -TestInterBssConstantObssPdAlgo::AllocatePositions(double d1, - double d2, - double d3, - double d4, - double d5) +TestInterBssConstantObssPdAlgo::AllocatePositions(meter_u d1, + meter_u d2, + meter_u d3, + meter_u d4, + meter_u d5) { Ptr positionAlloc = CreateObject(); positionAlloc->Add(Vector(0.0, 0.0, 0.0)); // AP1