Remove LteAmc::Ber parameter from LteAmc::MiErrorModel for avoiding misunderstanding
authorMarco Miozzo <marco.miozzo@cttc.es>
Wed, 22 Feb 2012 12:03:52 +0100
changeset 8648 b73a8905c1eb
parent 8647 f6fad6b36154
child 8649 1fcf6903fc0d
child 8653 d18284cdf764
Remove LteAmc::Ber parameter from LteAmc::MiErrorModel for avoiding misunderstanding
src/lte/doc/source/lte-user.rst
src/lte/model/lte-amc.cc
src/lte/model/lte-amc.h
--- a/src/lte/doc/source/lte-user.rst	Tue Feb 21 18:06:15 2012 +0100
+++ b/src/lte/doc/source/lte-user.rst	Wed Feb 22 12:03:52 2012 +0100
@@ -539,15 +539,14 @@
 
   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.
 
 
 
--- a/src/lte/model/lte-amc.cc	Tue Feb 21 18:06:15 2012 +0100
+++ b/src/lte/model/lte-amc.cc	Wed Feb 22 12:03:52 2012 +0100
@@ -224,7 +224,7 @@
   .AddConstructor<LteAmc> ()
   .AddAttribute ("Ber",
                  "The requested BER in assigning MCS (default is 0.00005).",
-                 DoubleValue (0.1),
+                 DoubleValue (0.00005),
                  MakeDoubleAccessor (&LteAmc::m_ber),
                  MakeDoubleChecker<double> ())
   .AddAttribute ("AmcModel",
@@ -349,7 +349,7 @@
             while (mcs < 28)
               {
                 ber = LteMiErrorModel::GetTbError (sinr, rbgMap, (uint16_t)GetTbSizeFromMcs (mcs, rbgSize), mcs);
-                if (ber > m_ber)
+                if (ber > 0.1)
                   break;
                 mcs++;
                 
--- a/src/lte/model/lte-amc.h	Tue Feb 21 18:06:15 2012 +0100
+++ b/src/lte/model/lte-amc.h	Wed Feb 22 12:03:52 2012 +0100
@@ -51,7 +51,7 @@
   
   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