--- a/src/lte/test/lte-test-phy-error-model.cc Mon May 21 06:57:19 2012 -0700
+++ b/src/lte/test/lte-test-phy-error-model.cc Mon May 21 07:25:00 2012 -0700
@@ -46,6 +46,7 @@
#include <ns3/config.h>
#include <ns3/boolean.h>
#include <ns3/enum.h>
+#include <ns3/unused.h>
NS_LOG_COMPONENT_DEFINE ("LenaTestPhyErrorModel");
@@ -244,7 +245,10 @@
int lambda = (double)dlDataRxed.at (i) / m_tbSize;
double ber = 2.0 - ((double)dlDataRxed.at (i)/txed);
double np = n-n*m_berRef;
- NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " bytes rxed " << (double)dlDataRxed.at (i) << " txed " << txed << " BER " << ber << " Err " << fabs (m_berRef - ber) << " lambda " << lambda << " np " << np << " difference " << abs(lambda - np) << " quantile " << m_bernQuantile);
+ NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " bytes rxed " << (double)dlDataRxed.at (i) << " txed " << txed
+ << " BER " << ber << " Err " << fabs (m_berRef - ber) << " lambda " << lambda
+ << " np " << np << " difference " << abs(lambda - np) << " quantile " << m_bernQuantile);
+ NS_UNUSED (ber);
// the quantiles are evaluated offline according to a Bernoulli
// ditribution with n equal to the number of packet sent and p equal
// to the BER (see /reference/bernuolliDistribution.m for details)
--- a/src/lte/test/lte-test-rr-ff-mac-scheduler.cc Mon May 21 06:57:19 2012 -0700
+++ b/src/lte/test/lte-test-rr-ff-mac-scheduler.cc Mon May 21 07:25:00 2012 -0700
@@ -316,9 +316,8 @@
uint64_t imsi = ueDevs.Get (i)->GetObject<LteUeNetDevice> ()->GetImsi ();
// get the lcId
uint8_t lcId = ueDevs.Get (i)->GetObject<LteUeNetDevice> ()->GetRrc ()->GetLcIdVector ().at (0);
- double txed = rlcStats->GetUlTxData (imsi, lcId);
ulDataRxed.push_back (rlcStats->GetUlRxData (imsi, lcId));
- NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " bytes txed " << (double)ulDataRxed.at (i) << " thr " << (double)ulDataRxed.at (i) / simulationTime << " ref " << m_thrRefUl << " txed " << txed / simulationTime);
+ NS_LOG_INFO ("\tUser " << i << " imsi " << imsi << " bytes txed " << (double)ulDataRxed.at (i) << " thr " << (double)ulDataRxed.at (i) / simulationTime << " ref " << m_thrRefUl << " txed " << rlcStats->GetUlTxData (imsi, lcId) / simulationTime);
NS_TEST_ASSERT_MSG_EQ_TOL ((double)ulDataRxed.at (i) / simulationTime, m_thrRefUl, m_thrRefUl * tolerance, " Unfair Throughput!");
}