Add MAC command tests and improve MAC layer implementation

examples/adr-example.cc

@@ -73,7 +73,7 @@ main(int argc, char* argv[])
     double mobileNodeProbability = 0;
     double sideLengthMeters = 10000;
     int gatewayDistanceMeters = 5000;
-    double maxRandomLossDB = 10;
+    double maxRandomLossDb = 10;
     double minSpeedMetersPerSecond = 2;
     double maxSpeedMetersPerSecond = 16;
     std::string adrType = "ns3::AdrComponent";
@@ -98,7 +98,7 @@ main(int argc, char* argv[])
                  sideLengthMeters);
     cmd.AddValue("maxRandomLoss",
                  "Maximum amount (dB) of the random loss component",
-                 maxRandomLossDB);
+                 maxRandomLossDb);
     cmd.AddValue("gatewayDistance", "Distance (m) between gateways", gatewayDistanceMeters);
     cmd.AddValue("initializeSF", "Whether to initialize the SFs", initializeSF);
     cmd.AddValue("MinSpeed", "Minimum speed (m/s) for mobile devices", minSpeedMetersPerSecond);
@@ -132,7 +132,7 @@ main(int argc, char* argv[])
 
     // Set the end devices to allow data rate control (i.e. adaptive data rate) from the network
     // server
-    Config::SetDefault("ns3::EndDeviceLorawanMac::DRControl", BooleanValue(true));
+    Config::SetDefault("ns3::EndDeviceLorawanMac::ADR", BooleanValue(true));
 
     // Create a simple wireless channel
     ///////////////////////////////////
@@ -143,7 +143,7 @@ main(int argc, char* argv[])
 
     Ptr<UniformRandomVariable> x = CreateObject<UniformRandomVariable>();
     x->SetAttribute("Min", DoubleValue(0.0));
-    x->SetAttribute("Max", DoubleValue(maxRandomLossDB));
+    x->SetAttribute("Max", DoubleValue(maxRandomLossDb));
 
     Ptr<RandomPropagationLossModel> randomLoss = CreateObject<RandomPropagationLossModel>();
     randomLoss->SetAttribute("Variable", PointerValue(x));

examples/aloha-throughput.cc

@@ -258,7 +258,7 @@ main(int argc, char* argv[])
     appHelper.SetPacketSize(packetSize);
     ApplicationContainer appContainer = appHelper.Install(endDevices);
 
-    appContainer.Start(Seconds(0));
+    appContainer.Start(Time(0));
     appContainer.Stop(appStopTime);
 
     std::ofstream outputFile;

examples/complete-network-example.cc

@@ -305,7 +305,7 @@ main(int argc, char* argv[])
                                                           DoubleValue(10));
     ApplicationContainer appContainer = appHelper.Install(endDevices);
 
-    appContainer.Start(Seconds(0));
+    appContainer.Start(Time(0));
     appContainer.Stop(appStopTime);
 
     /**************************
@@ -353,7 +353,7 @@ main(int argc, char* argv[])
     NS_LOG_INFO("Computing performance metrics...");
 
     LoraPacketTracker& tracker = helper.GetPacketTracker();
-    std::cout << tracker.CountMacPacketsGlobally(Seconds(0), appStopTime + Hours(1)) << std::endl;
+    std::cout << tracker.CountMacPacketsGlobally(Time(0), appStopTime + Hours(1)) << std::endl;
 
     return 0;
 }

examples/frame-counter-update.cc

@@ -239,14 +239,14 @@ main(int argc, char* argv[])
 
     Time appStopTime = Seconds(simulationTimeSeconds);
     OneShotSenderHelper appHelper = OneShotSenderHelper();
-    appHelper.SetSendTime(Seconds(0));
+    appHelper.SetSendTime(Time(0));
     ApplicationContainer appContainer = appHelper.Install(endDevices);
     appHelper.SetSendTime(Seconds(100));
     appContainer.Add(appHelper.Install(endDevices));
     appHelper.SetSendTime(Seconds(200));
     appContainer.Add(appHelper.Install(endDevices));
 
-    appContainer.Start(Seconds(0));
+    appContainer.Start(Time(0));
     appContainer.Stop(appStopTime);
 
     Simulator::Schedule(Seconds(110), &ChangeEndDevicePosition, endDevices.Get(0), true);
@@ -298,7 +298,7 @@ main(int argc, char* argv[])
 
     LoraPacketTracker& tracker = helper.GetPacketTracker();
     NS_LOG_INFO("Printing total sent MAC-layer packets and successful MAC-layer packets");
-    std::cout << tracker.CountMacPacketsGlobally(Seconds(0), appStopTime + Hours(1)) << std::endl;
+    std::cout << tracker.CountMacPacketsGlobally(Time(0), appStopTime + Hours(1)) << std::endl;
 
     return 0;
 }

helper/lora-helper.cc

@@ -20,8 +20,8 @@
 NS_LOG_COMPONENT_DEFINE("LoraHelper");
 
 LoraHelper::LoraHelper()
-    : m_lastPhyPerformanceUpdate(Seconds(0)),
-      m_lastGlobalPerformanceUpdate(Seconds(0))
+    : m_lastPhyPerformanceUpdate(Time(0)),
+      m_lastGlobalPerformanceUpdate(Time(0))
 {
 }
 
@@ -47,7 +47,7 @@
         Ptr<LoraNetDevice> device = CreateObject<LoraNetDevice>();
 
         // Create the PHY
-        Ptr<LoraPhy> phy = phyHelper.Create(node, device);
+        Ptr<LoraPhy> phy = phyHelper.Install(node, device);
         NS_ASSERT(phy);
         device->SetPhy(phy);
         NS_LOG_DEBUG("Done creating the PHY");
@@ -85,7 +85,7 @@
         }
 
         // Create the MAC
-        Ptr<LorawanMac> mac = macHelper.Create(node, device);
+        Ptr<LorawanMac> mac = macHelper.Install(node, device);
         NS_ASSERT(mac);
         mac->SetPhy(phy);
         NS_LOG_DEBUG("Done creating the MAC");
@@ -151,7 +151,7 @@
 LoraHelper::EnableSimulationTimePrinting(Time interval)
 {
     m_oldtime = std::time(nullptr);
-    Simulator::Schedule(Seconds(0), &LoraHelper::DoPrintSimulationTime, this, interval);
+    Simulator::Schedule(Time(0), &LoraHelper::DoPrintSimulationTime, this, interval);
 }
 
 void
@@ -181,7 +181,7 @@
 {
     const char* c = filename.c_str();
     std::ofstream outputFile;
-    if (Simulator::Now() == Seconds(0))
+    if (Now().IsZero())
     {
         // Delete contents of the file as it is opened
         outputFile.open(c, std::ofstream::out | std::ofstream::trunc);
@@ -192,7 +192,7 @@
         outputFile.open(c, std::ofstream::out | std::ofstream::app);
     }
 
-    Time currentTime = Simulator::Now();
+    Time currentTime = Now();
     for (auto j = endDevices.Begin(); j != endDevices.End(); ++j)
     {
         Ptr<Node> object = *j;
@@ -204,9 +204,9 @@
         Ptr<ClassAEndDeviceLorawanMac> mac =
             DynamicCast<ClassAEndDeviceLorawanMac>(loraNetDevice->GetMac());
         int dr = int(mac->GetDataRate());
-        double txPower = mac->GetTransmissionPower();
+        double txPower = mac->GetTransmissionPowerDbm();
         Vector pos = position->GetPosition();
-        outputFile << currentTime.GetSeconds() << " " << object->GetId() << " " << pos.x << " "
+        outputFile << currentTime.As(Time::S) << " " << object->GetId() << " " << pos.x << " "
                    << pos.y << " " << dr << " " << unsigned(txPower) << std::endl;
     }
     // for (NodeContainer::Iterator j = gateways.Begin (); j != gateways.End (); ++j)
@@ -245,7 +245,7 @@
 
     const char* c = filename.c_str();
     std::ofstream outputFile;
-    if (Simulator::Now() == Seconds(0))
+    if (Now().IsZero())
     {
         // Delete contents of the file as it is opened
         outputFile.open(c, std::ofstream::out | std::ofstream::trunc);
@@ -259,14 +259,14 @@
     for (auto it = gateways.Begin(); it != gateways.End(); ++it)
     {
         int systemId = (*it)->GetId();
-        outputFile << Simulator::Now().GetSeconds() << " " << std::to_string(systemId) << " "
+        outputFile << Now().As(Time::S) << " " << std::to_string(systemId) << " "
                    << m_packetTracker->PrintPhyPacketsPerGw(m_lastPhyPerformanceUpdate,
-                                                            Simulator::Now(),
+                                                            Now(),
                                                             systemId)
                    << std::endl;
     }
 
-    m_lastPhyPerformanceUpdate = Simulator::Now();
+    m_lastPhyPerformanceUpdate = Now();
 
     outputFile.close();
 }
@@ -292,7 +292,7 @@
 
     const char* c = filename.c_str();
     std::ofstream outputFile;
-    if (Simulator::Now() == Seconds(0))
+    if (Now().IsZero())
     {
         // Delete contents of the file as it is opened
         outputFile.open(c, std::ofstream::out | std::ofstream::trunc);
@@ -303,21 +303,20 @@
         outputFile.open(c, std::ofstream::out | std::ofstream::app);
     }
 
-    outputFile << Simulator::Now().GetSeconds() << " "
-               << m_packetTracker->CountMacPacketsGlobally(m_lastGlobalPerformanceUpdate,
-                                                           Simulator::Now())
+    outputFile << Now().As(Time::S) << " "
+               << m_packetTracker->CountMacPacketsGlobally(m_lastGlobalPerformanceUpdate, Now())
                << std::endl;
 
-    m_lastGlobalPerformanceUpdate = Simulator::Now();
+    m_lastGlobalPerformanceUpdate = Now();
 
     outputFile.close();
 }
 
 void
 LoraHelper::DoPrintSimulationTime(Time interval)
 {
-    // NS_LOG_INFO ("Time: " << Simulator::Now().GetHours());
-    std::cout << "Simulated time: " << Simulator::Now().GetHours() << " hours" << std::endl;
+    // NS_LOG_INFO ("Time: " << Now().As(Time::H));
+    std::cout << "Simulated time: " << Now().As(Time::H) << std::endl;
     std::cout << "Real time from last call: " << std::time(nullptr) - m_oldtime << " seconds"
               << std::endl;
     m_oldtime = std::time(nullptr);

helper/lora-packet-tracker.cc

@@ -44,7 +44,7 @@ LoraPacketTracker::MacTransmissionCallback(Ptr<const Packet> packet)
 
         MacPacketStatus status;
         status.packet = packet;
-        status.sendTime = Simulator::Now();
+        status.sendTime = Now();
         status.senderId = Simulator::GetContext();
         status.receivedTime = Time::Max();
 
@@ -60,11 +60,11 @@ LoraPacketTracker::RequiredTransmissionsCallback(uint8_t reqTx,
 {
     NS_LOG_INFO("Finished retransmission attempts for a packet");
     NS_LOG_DEBUG("Packet: " << packet << "ReqTx " << unsigned(reqTx) << ", succ: " << success
-                            << ", firstAttempt: " << firstAttempt.GetSeconds());
+                            << ", firstAttempt: " << firstAttempt.As(Time::S));
 
     RetransmissionStatus entry;
     entry.firstAttempt = firstAttempt;
-    entry.finishTime = Simulator::Now();
+    entry.finishTime = Now();
     entry.reTxAttempts = reqTx;
     entry.successful = success;
 
@@ -84,7 +84,7 @@ LoraPacketTracker::MacGwReceptionCallback(Ptr<const Packet> packet)
         if (it != m_macPacketTracker.end())
         {
             (*it).second.receptionTimes.insert(
-                std::pair<int, Time>(Simulator::GetContext(), Simulator::Now()));
+                std::pair<int, Time>(Simulator::GetContext(), Now()));
         }
         else
         {
@@ -106,7 +106,7 @@ LoraPacketTracker::TransmissionCallback(Ptr<const Packet> packet, uint32_t edId)
         // Create a packetStatus
         PacketStatus status;
         status.packet = packet;
-        status.sendTime = Simulator::Now();
+        status.sendTime = Now();
         status.senderId = edId;
 
         m_packetTracker.insert(std::pair<Ptr<const Packet>, PacketStatus>(packet, status));

helper/lora-phy-helper.cc

@@ -60,7 +60,7 @@ LoraPhyHelper::Set(std::string name, const AttributeValue& v)
 }
 
 Ptr<LoraPhy>
-LoraPhyHelper::Create(Ptr<Node> node, Ptr<NetDevice> device) const
+LoraPhyHelper::Install(Ptr<Node> node, Ptr<NetDevice> device) const
 {
     NS_LOG_FUNCTION(this << node->GetId() << device);
 

helper/lora-phy-helper.h

@@ -80,7 +80,7 @@ class LoraPhyHelper
      * \param device The device within which this PHY will be created.
      * \return A newly-created PHY object.
      */
-    Ptr<LoraPhy> Create(Ptr<Node> node, Ptr<NetDevice> device) const;
+    Ptr<LoraPhy> Install(Ptr<Node> node, Ptr<NetDevice> device) const;
 
     /**
      * Set the maximum number of gateway receive paths.