diff --git a/src/fd-net-device/doc/fd-net-device.rst b/src/fd-net-device/doc/fd-net-device.rst index 1f3eebebb..d5a0d45ef 100644 --- a/src/fd-net-device/doc/fd-net-device.rst +++ b/src/fd-net-device/doc/fd-net-device.rst @@ -273,7 +273,7 @@ It is always up to the user to determine that using these MAC addresses is okay on your network and won't conflict with anything else (including another simulation using such devices) on your network. If you are using the emulated FdNetDevice configuration in separate simulations, - you must consider global MAC address +you must consider global MAC address assignment issues and ensure that MAC addresses are unique across all simulations. The emulated net device respects the MAC address provided in the ``Address`` attribute so you can do this manually. For larger simulations, you diff --git a/src/lte/doc/source/figures/lte-subframe-structure.dia b/src/lte/doc/source/figures/lte-subframe-structure.dia index 6fe433c78..b88255bff 100644 Binary files a/src/lte/doc/source/figures/lte-subframe-structure.dia and b/src/lte/doc/source/figures/lte-subframe-structure.dia differ diff --git a/src/lte/doc/source/lte-design.rst b/src/lte/doc/source/lte-design.rst index 58ceddeb2..22a5c7d74 100644 --- a/src/lte/doc/source/lte-design.rst +++ b/src/lte/doc/source/lte-design.rst @@ -1044,7 +1044,7 @@ where :math:`|\cdot|` indicates the cardinality of the set; finally, \right)}{\tau} -For what concern the HARQ, PF implements the non adaptive version, which implies that in allocating the retransmission attempts the scheduler uses the same allocation configuration of the original block, which means maintaining the same RBGs and MCS. UEs that are allocated for HARQ retransmissions are not considered for the transmission of new data in case they have a transmission opportunity available in the same TTI. Finally, HARQ can be disabled with ns3 attribute system for maintaining backward compatibility with old test cases and code, in detail:: +For what concern the HARQ, PF implements the non adaptive version, which implies that in allocating the retransmission attempts the scheduler uses the same allocation configuration of the original block, which means maintaining the same RBGs and MCS. UEs that are allocated for HARQ retransmissions are not considered for the transmission of new data in case they have a transmission opportunity available in the same TTI. Finally, HARQ can be disabled with ns3 attribute system for maintaining backward compatibility with old test cases and code, in detail. Maximum Throughput (MT) Scheduler @@ -1061,7 +1061,7 @@ Let :math:`i,j` denote generic users; let :math:`t` be the subframe index, and :math:`k` be the resource block index; let :math:`M_{i,k}(t)` be MCS usable by user :math:`i` on resource block :math:`k` according to what reported by the AMC model (see `Adaptive Modulation and Coding`_); finally, let :math:`S(M, B)` be the TB -size in bits as defined in [TS36.213]_ for the case where a number :math:`B` of +size in bits as defined in [TS36213]_ for the case where a number :math:`B` of resource blocks is used. The achievable rate :math:`R_{i}(k,t)` in bit/s for user :math:`i` on resource block :math:`k` at subframe :math:`t` is defined as diff --git a/src/lte/doc/source/lte-testing.rst b/src/lte/doc/source/lte-testing.rst index 74f09a05e..e2adcafb8 100644 --- a/src/lte/doc/source/lte-testing.rst +++ b/src/lte/doc/source/lte-testing.rst @@ -369,7 +369,7 @@ at the given SNR, while reference throughput value for other UEs by zero. Let :math:`\tau` be the TTI duration, :math:`B` the transmission bandwidth configuration in number of RBs, :math:`M` the modulation and coding scheme in use at the given SNR and :math:`S(M, B)` be the -transport block size as defined in [TS36.213]_. The reference +transport block size as defined in [TS36213]_. The reference throughput :math:`T` in bit/s achieved by each UE is calculated as .. math::