diff --git a/src/lte/doc/source/figures/fading_pedestrian.png b/src/lte/doc/source/figures/fading_pedestrian.png index e2c2582f6..ccbb720be 100644 Binary files a/src/lte/doc/source/figures/fading_pedestrian.png and b/src/lte/doc/source/figures/fading_pedestrian.png differ diff --git a/src/lte/doc/source/figures/fading_urban_3kmph.png b/src/lte/doc/source/figures/fading_urban_3kmph.png index c318a2c0d..03ad3447b 100644 Binary files a/src/lte/doc/source/figures/fading_urban_3kmph.png and b/src/lte/doc/source/figures/fading_urban_3kmph.png differ diff --git a/src/lte/doc/source/figures/fading_vehicular.png b/src/lte/doc/source/figures/fading_vehicular.png index f3242a2e9..29158ac93 100644 Binary files a/src/lte/doc/source/figures/fading_vehicular.png and b/src/lte/doc/source/figures/fading_vehicular.png differ diff --git a/src/lte/doc/source/index.rst b/src/lte/doc/source/index.rst index 7d9084000..b8c80c23d 100644 --- a/src/lte/doc/source/index.rst +++ b/src/lte/doc/source/index.rst @@ -11,4 +11,5 @@ This is the stand-alone version of the ns-3 LTE module documentation. lte-design lte-user lte-testing + lte-references diff --git a/src/lte/doc/source/lte-design.rst b/src/lte/doc/source/lte-design.rst index 3bc334682..6bc429dc6 100644 --- a/src/lte/doc/source/lte-design.rst +++ b/src/lte/doc/source/lte-design.rst @@ -77,13 +77,10 @@ figures :ref:`fig-lte-enb-architecture` and :ref:`fig-lte-ue-architecture`, whic deal respectively with the eNB and the UE. A detailed description of the most important components are provided in the following sections. - -.. figure:: figures/lte-ue-architecture.* - :align: right - .. _fig-lte-enb-architecture: .. figure:: figures/lte-enb-architecture.* + :align: center Architecture of the LTE eNB @@ -92,6 +89,7 @@ important components are provided in the following sections. .. _fig-lte-ue-architecture: .. figure:: figures/lte-ue-architecture.* + :align: center Architecture of the LTE UE @@ -104,7 +102,6 @@ The MAC Scheduler interface is **specified** or defined as **abstract classes**. * Provider Side is specified in the ``FfMacSchedSapProvider`` class * User Side is specified in the ``FfMacSchedSapUser`` class -* CSCHED SAP API The FemtoForum MAC Scheduler Interface ++++++++++++++++++++++++++++++++++++++ @@ -144,6 +141,7 @@ between the blocks and the SAPs defined in our implementation of the MAC Scheduler Interface. .. figure:: figures/ff-mac-saps.* + :align: center In addition to the above principles, the following design choices have been taken: @@ -170,6 +168,7 @@ The figure below shows how the MAC Scheduler Interface is used within the eNB. .. figure:: figures/ff-example.* + :align: center The User side of both the CSCHED SAP and the SCHED SAP are implemented within the eNB MAC, i.e., in the file ``lte-enb-mac.cc``. @@ -359,8 +358,7 @@ discussed in [Ofcom2.6GHz]_. -.. [4] 3GPP R1-081483 (available on - http://www.3gpp.org/ftp/tsg_ran/WG1_RL1/TSGR1_52b/Docs/R1-081483.zip ) +.. [4] 3GPP R1-081483 (available `here `_ ) Physical layer diff --git a/src/lte/doc/source/lte-references.rst b/src/lte/doc/source/lte-references.rst index 1169e6182..b268ea143 100644 --- a/src/lte/doc/source/lte-references.rst +++ b/src/lte/doc/source/lte-references.rst @@ -1,5 +1,10 @@ +.. include:: replace.txt ++++++++++++++++++++++++++++++++++ + References ++++++++++++++++++++++++++++++++++ + .. [Sesia2009] S. Sesia, I. Toufik and M. Baker, "LTE - The UMTS Long Term Evolution - from theory to practice", Wiley, 2009 @@ -34,13 +39,13 @@ .. [TS36.104] 3GPP TS 36.104 "E-UTRA Base Station (BS) radio transmission and reception" -.. [R1-081483] 3GPP R1-081483 "Conveying MCS and TB size via PDCCH" http://www.3gpp.org/ftp/tsg_ran/WG1_RL1/TSGR1_52b/Docs/R1-081483.zip +.. [R1-081483] 3GPP R1-081483 `Conveying MCS and TB size via PDCCH `_ -.. [FFAPI] FemtoForum LTE MAC Scheduler Interface Specification v1.11 http://www.femtoforum.org/femto/technical.php +.. [FFAPI] `FemtoForum LTE MAC Scheduler Interface Specification v1.11 `_ -.. [ns3tutorial] The ns-3 Tutorial http://www.nsnam.org/docs/tutorial/html/ +.. [ns3tutorial] `The ns-3 Tutorial `_ -.. [ns3manual] The ns-3 Tutorial http://www.nsnam.org/docs/manual/html/ +.. [ns3manual] `The ns-3 Manual `_ .. [pl26ghz] Sun Kun; Wang Ping; Li Yingze, "Path loss models for suburban scenario at 2.3GHz, 2.6GHz and 3.5GHz", in Proc. of ISAPE 2008, Kunming, China, Nov 2008. @@ -54,5 +59,5 @@ .. [cost231] "Digital Mobile Radio: COST 231 View on the Evolution Towards 3rd Generation Systems", Commission of the European Communities, L-2920, Luxembourg, 1989 -.. [mathworks] Matlab R2011b Documentation Communications System Toolbox, "Methodology for Simulating Multipath Fading Channels" http://www.mathworks.es/help/toolbox/comm/ug/a1069449399.html#bq5zk36 +.. [mathworks] Matlab R2011b Documentation Communications System Toolbox, `Methodology for Simulating Multipath Fading Channels `_ diff --git a/src/lte/doc/source/lte-user.rst b/src/lte/doc/source/lte-user.rst index 4fe7f3379..dc9766752 100644 --- a/src/lte/doc/source/lte-user.rst +++ b/src/lte/doc/source/lte-user.rst @@ -365,13 +365,14 @@ While, for setting the parameters:: lena->SetFadingModelAttribute ("WindowSize", TimeValue (Seconds (0.5))); lena->SetFadingModelAttribute ("RbNum", UintegerValue (100)); -It has to be noted that, ``TraceFilename`` does not have a default value, therefore is has to be always set for using the fading module in the simulator. The simulator provide natively three fading traces generated according to the configurations defined in in Annex B.2 of [TS36.104]_ (available in the folder ``src/lte/model/fading-traces/``); examples of such traces are reported in `fig-fadingPedestrianTrace_`, `fig-fadingVehicularTrace_` and `fig-fadingUrbanTrace_`. +It has to be noted that, ``TraceFilename`` does not have a default value, therefore is has to be always set for using the fading module in the simulator. The simulator provide natively three fading traces generated according to the configurations defined in in Annex B.2 of [TS36.104]_ (available in the folder ``src/lte/model/fading-traces/``); examples of such traces are reported in the following figures. .. _fig-fadingPedestrianTrace: .. figure:: figures/fading_pedestrian.* :align: center + :alt: Fading trace 3 kmph Example of the fading trace included in the simulator for a pedestrian scenario (speed of 3 kmph). @@ -379,6 +380,7 @@ It has to be noted that, ``TraceFilename`` does not have a default value, theref .. figure:: figures/fading_vehicular.* :align: center + :alt: Fading trace 60 kmph Example of the fading trace included in the simulator for a vehicular scenario (speed of 60 kmph). @@ -386,6 +388,7 @@ It has to be noted that, ``TraceFilename`` does not have a default value, theref .. figure:: figures/fading_urban_3kmph.* :align: center + :alt: Fading trace 3 kmph Example of the fading trace included in the simulator for an urban scenario (speed of 3 kmph).