diff --git a/src/lte/helper/phy-rx-stats-calculator.cc b/src/lte/helper/phy-rx-stats-calculator.cc index 2d3702bf4..a93391665 100644 --- a/src/lte/helper/phy-rx-stats-calculator.cc +++ b/src/lte/helper/phy-rx-stats-calculator.cc @@ -117,7 +117,7 @@ PhyRxStatsCalculator::DlPhyReception (PhyReceptionStatParameters params) return; } } - outFile << Simulator::Now ().GetSeconds () << "\t"; + outFile << params.m_timestamp << "\t"; outFile << (uint32_t) params.m_cellId << "\t"; outFile << params.m_imsi << "\t"; @@ -161,7 +161,7 @@ PhyRxStatsCalculator::UlPhyReception (PhyReceptionStatParameters params) return; } } - outFile << Simulator::Now ().GetSeconds () << "\t"; + outFile << params.m_timestamp << "\t"; outFile << (uint32_t) params.m_cellId << "\t"; outFile << params.m_imsi << "\t"; diff --git a/src/lte/helper/phy-tx-stats-calculator.cc b/src/lte/helper/phy-tx-stats-calculator.cc index e46052845..973fd1d71 100644 --- a/src/lte/helper/phy-tx-stats-calculator.cc +++ b/src/lte/helper/phy-tx-stats-calculator.cc @@ -105,7 +105,6 @@ PhyTxStatsCalculator::DlPhyTransmission (PhyTransmissionStatParameters params) return; } m_dlTxFirstWrite = false; - //outFile << "% time\tcellId\tIMSI\tRNTI\tlayer\tmcs\tsize\trv\tndi"; // txMode is not available at dl tx side outFile << "% time\tcellId\tIMSI\tRNTI\tlayer\tmcs\tsize\trv\tndi\tccId"; outFile << std::endl; } @@ -118,7 +117,7 @@ PhyTxStatsCalculator::DlPhyTransmission (PhyTransmissionStatParameters params) return; } } - outFile << Simulator::Now ().GetSeconds () << "\t"; + outFile << params.m_timestamp << "\t"; outFile << (uint32_t) params.m_cellId << "\t"; outFile << params.m_imsi << "\t"; @@ -162,7 +161,7 @@ PhyTxStatsCalculator::UlPhyTransmission (PhyTransmissionStatParameters params) return; } } - outFile << Simulator::Now ().GetSeconds () << "\t"; + outFile << params.m_timestamp << "\t"; outFile << (uint32_t) params.m_cellId << "\t"; outFile << params.m_imsi << "\t"; diff --git a/src/lte/test/epc-test-s1u-uplink.cc b/src/lte/test/epc-test-s1u-uplink.cc index 684df1230..b5b1ee76f 100644 --- a/src/lte/test/epc-test-s1u-uplink.cc +++ b/src/lte/test/epc-test-s1u-uplink.cc @@ -139,12 +139,11 @@ EpsBearerTagUdpClient::GetTypeId (void) "The time to wait between packets", TimeValue (Seconds (1.0)), MakeTimeAccessor (&EpsBearerTagUdpClient::m_interval), MakeTimeChecker ()) - .AddAttribute ( - "RemoteAddress", - "The destination Ipv4Address of the outbound packets", - Ipv4AddressValue (), - MakeIpv4AddressAccessor (&EpsBearerTagUdpClient::m_peerAddress), - MakeIpv4AddressChecker ()) + .AddAttribute ("RemoteAddress", + "The destination Ipv4Address of the outbound packets", + Ipv4AddressValue (), + MakeIpv4AddressAccessor (&EpsBearerTagUdpClient::m_peerAddress), + MakeIpv4AddressChecker ()) .AddAttribute ("RemotePort", "The destination port of the outbound packets", UintegerValue (100), MakeUintegerAccessor (&EpsBearerTagUdpClient::m_peerPort),