From 41e34fb6dacc971becef19ed78aa3f1e90ae14fe Mon Sep 17 00:00:00 2001 From: Marco Miozzo Date: Wed, 22 Feb 2012 12:03:52 +0100 Subject: [PATCH] Remove LteAmc::Ber parameter from LteAmc::MiErrorModel for avoiding misunderstanding --- src/lte/doc/source/lte-user.rst | 5 ++--- src/lte/model/lte-amc.cc | 4 ++-- src/lte/model/lte-amc.h | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/lte/doc/source/lte-user.rst b/src/lte/doc/source/lte-user.rst index 8c676d944..629ed7d6f 100644 --- a/src/lte/doc/source/lte-user.rst +++ b/src/lte/doc/source/lte-user.rst @@ -539,15 +539,14 @@ The simulator provides two possible schemes for what concerns the selection of t Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010)); -While, the solution based on the physical error model can be controlled with: +While, the solution based on the physical error model can be controlled with:: Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::MiErrorModel)); -Finally, the required BER can be setted for fine tuning of the AMC module thanks to the ``Ber`` attribute, for instance: +Finally, the required efficiency of the ``PiroEW2010`` AMC module can be tuned thanks to the ``Ber`` attribute (), for instance:: Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005)); -We note that the model ``PiroEW2010`` is designed for working with a BER of 0.00005, while ``MiErrorModel`` with a BER of 0.1. diff --git a/src/lte/model/lte-amc.cc b/src/lte/model/lte-amc.cc index 06c6ce06e..cdaa018e9 100644 --- a/src/lte/model/lte-amc.cc +++ b/src/lte/model/lte-amc.cc @@ -224,7 +224,7 @@ LteAmc::GetTypeId (void) .AddConstructor () .AddAttribute ("Ber", "The requested BER in assigning MCS (default is 0.00005).", - DoubleValue (0.1), + DoubleValue (0.00005), MakeDoubleAccessor (&LteAmc::m_ber), MakeDoubleChecker ()) .AddAttribute ("AmcModel", @@ -349,7 +349,7 @@ LteAmc::CreateCqiFeedbacks (const SpectrumValue& sinr, uint8_t rbgSize) while (mcs < 28) { ber = LteMiErrorModel::GetTbError (sinr, rbgMap, (uint16_t)GetTbSizeFromMcs (mcs, rbgSize), mcs); - if (ber > m_ber) + if (ber > 0.1) break; mcs++; diff --git a/src/lte/model/lte-amc.h b/src/lte/model/lte-amc.h index 85350fc7b..c322eea65 100644 --- a/src/lte/model/lte-amc.h +++ b/src/lte/model/lte-amc.h @@ -51,7 +51,7 @@ public: enum AmcModel { - PiroEW2010, // BER should be set at 0.00005 + PiroEW2010, // model based on Piro, G.; Grieco, L.A.; Boggia, G.; Camarda, P.; //A two-level scheduling algorithm for QoS support in the downlink of //LTE cellular networks European Wireless Conference (EW), 2010