From e73cc9cd3eb35e5f21733e2f5ae74a36546cfbf3 Mon Sep 17 00:00:00 2001 From: jnin Date: Mon, 6 Jun 2011 10:56:10 +0200 Subject: [PATCH] Fixed bug in DlRlcStats fixed typo in lte-spectrum-phy --- src/lte/helper/rlc-stats-calculator.cc | 3 ++- src/lte/model/lte-spectrum-phy.cc | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lte/helper/rlc-stats-calculator.cc b/src/lte/helper/rlc-stats-calculator.cc index afe327996..a65f9c4df 100644 --- a/src/lte/helper/rlc-stats-calculator.cc +++ b/src/lte/helper/rlc-stats-calculator.cc @@ -291,7 +291,7 @@ RlcStatsCalculator::WriteDlResults (std::ofstream& outFile) { // Get the unique IMSI list std::vector pairVector; - for (Uint32Map::iterator it = m_ulTxPackets.begin(); it != m_ulTxPackets.end(); ++it) + for (Uint32Map::iterator it = m_dlTxPackets.begin(); it != m_dlTxPackets.end(); ++it) { if (find (pairVector.begin (), pairVector.end (), (*it).first ) == pairVector.end () ) { @@ -351,6 +351,7 @@ RlcStatsCalculator::CheckEpoch (void) { if ( Simulator::Now () > m_startTime + m_epochDuration ) { + std::cout << "JNNNNNNNNNG New epoch! startTime " << m_startTime << " epoch duration " << m_epochDuration << std::endl; ShowResults(); ResetResults(); StartEpoch(); diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc index 396c15723..6dcc66384 100644 --- a/src/lte/model/lte-spectrum-phy.cc +++ b/src/lte/model/lte-spectrum-phy.cc @@ -327,7 +327,7 @@ LteSpectrumPhy::StartRx (Ptr pb, Ptr rxPsd, S switch (m_state) { case TX: - NS_FATAL_ERROR ("cannot RX while TX: according to FDD channel acces, the physical layer for transmission cannot be used for reception"); + NS_FATAL_ERROR ("cannot RX while TX: according to FDD channel access, the physical layer for transmission cannot be used for reception"); break; case IDLE: @@ -366,7 +366,7 @@ LteSpectrumPhy::StartRx (Ptr pb, Ptr rxPsd, S && (m_firstRxDuration == duration)); } - ChangeState (RX); + ChangeState (RX); m_interference->StartRx (rxPsd); m_phyRxStartTrace (pb);