figures redrawn

doc/models/Makefile

@@ -142,12 +142,12 @@ SOURCEFIGS = \
 	$(SRC)/lte/doc/source/figures/epcSimulationTime.eps \
 	$(SRC)/lte/doc/source/figures/epcEutranRunningTime.eps \
 	$(SRC)/lte/doc/source/figures/profiling-memory.eps \
-	$(SRC)/lte/doc/source/figures/lte-rlc-implementation-model.eps \
-	$(SRC)/lte/doc/source/figures/lte-rlc-data-txon-dl.eps \
-	$(SRC)/lte/doc/source/figures/lte-rlc-data-retx-dl.eps \
-	$(SRC)/lte/doc/source/figures/lte-rlc-data-txon-ul.eps \
-	$(SRC)/lte/doc/source/figures/lte-rlc-data-retx-ul.eps \
-	$(SRC)/lte/doc/source/figures/lte-epc-x2-entity-saps.eps \
+	$(SRC)/lte/doc/source/figures/lte-rlc-implementation-model.dia \
+	$(SRC)/lte/doc/source/figures/lte-rlc-data-txon-dl.dia \
+	$(SRC)/lte/doc/source/figures/lte-rlc-data-retx-dl.dia \
+	$(SRC)/lte/doc/source/figures/lte-rlc-data-txon-ul.dia \
+	$(SRC)/lte/doc/source/figures/lte-rlc-data-retx-ul.dia \
+	$(SRC)/lte/doc/source/figures/lte-epc-x2-entity-saps.dia \
 	$(SRC)/lte/doc/source/figures/lte-strongest-cell-handover-algorithm.eps \
 	$(SRC)/lte/doc/source/figures/lte-phy-interference.pdf \
 	$(SRC)/lte/doc/source/figures/lte-phy-interference.png \
@@ -175,22 +175,14 @@ SOURCEFIGS = \
 	$(SRC)/lte/doc/source/figures/fading_vehicular.png \
 	$(SRC)/lte/doc/source/figures/fading_urban_3kmph.pdf \
 	$(SRC)/lte/doc/source/figures/fading_urban_3kmph.png \
-	$(SRC)/lte/doc/source/figures/fr-enhanced-fractional-frequency-reuse-scheme.png \
-	$(SRC)/lte/doc/source/figures/fr-enhanced-fractional-frequency-reuse-scheme.pdf \
-	$(SRC)/lte/doc/source/figures/fr-full-frequency-reuse-scheme.png \
-	$(SRC)/lte/doc/source/figures/fr-full-frequency-reuse-scheme.pdf \
-	$(SRC)/lte/doc/source/figures/fr-hard-frequency-reuse-scheme.png \
-	$(SRC)/lte/doc/source/figures/fr-hard-frequency-reuse-scheme.pdf \
-	$(SRC)/lte/doc/source/figures/fr-soft-fractional-frequency-reuse-scheme.png \
-	$(SRC)/lte/doc/source/figures/fr-soft-fractional-frequency-reuse-scheme.pdf \
-	$(SRC)/lte/doc/source/figures/fr-soft-frequency-reuse-scheme-v1.png \
-	$(SRC)/lte/doc/source/figures/fr-soft-frequency-reuse-scheme-v1.pdf \
-	$(SRC)/lte/doc/source/figures/fr-soft-frequency-reuse-scheme-v2.png \
-	$(SRC)/lte/doc/source/figures/fr-soft-frequency-reuse-scheme-v2.pdf \
-	$(SRC)/lte/doc/source/figures/fr-strict-frequency-reuse-scheme.png \
-	$(SRC)/lte/doc/source/figures/fr-strict-frequency-reuse-scheme.pdf \
-	$(SRC)/lte/doc/source/figures/ffr-distributed-scheme.png \
-	$(SRC)/lte/doc/source/figures/ffr-distributed-scheme.pdf \
+	$(SRC)/lte/doc/source/figures/fr-enhanced-fractional-frequency-reuse-scheme.dia \
+	$(SRC)/lte/doc/source/figures/fr-full-frequency-reuse-scheme.dia \
+	$(SRC)/lte/doc/source/figures/fr-hard-frequency-reuse-scheme.dia \
+	$(SRC)/lte/doc/source/figures/fr-soft-fractional-frequency-reuse-scheme.dia \
+	$(SRC)/lte/doc/source/figures/fr-soft-frequency-reuse-scheme-v1.dia \
+	$(SRC)/lte/doc/source/figures/fr-soft-frequency-reuse-scheme-v2.dia \
+	$(SRC)/lte/doc/source/figures/fr-strict-frequency-reuse-scheme.dia \
+	$(SRC)/lte/doc/source/figures/ffr-distributed-scheme.dia \
 	$(SRC)/lte/doc/source/figures/lte-fr-soft-1-rem.png \
 	$(SRC)/lte/doc/source/figures/lte-fr-soft-1-rem.pdf \
 	$(SRC)/lte/doc/source/figures/lte-ffr-soft-2-spectrum-trace.png \
@@ -225,10 +217,8 @@ SOURCEFIGS = \
 	$(SRC)/lte/doc/source/figures/MCS_16_test.pdf \
 	$(SRC)/lte/doc/source/figures/miesm_scheme.pdf \
 	$(SRC)/lte/doc/source/figures/miesm_scheme.png \
-	$(SRC)/lte/doc/source/figures/lte-dl-power-control.png \
-	$(SRC)/lte/doc/source/figures/lte-dl-power-control.pdf \
-	$(SRC)/lte/doc/source/figures/lte-ffr-scheduling.png \
-	$(SRC)/lte/doc/source/figures/lte-ffr-scheduling.pdf \
+	$(SRC)/lte/doc/source/figures/lte-dl-power-control.dia \
+	$(SRC)/lte/doc/source/figures/lte-ffr-scheduling.dia \
 	$(SRC)/lte/doc/source/figures/lte-handover-campaign-rem.pdf \
 	$(SRC)/lte/doc/source/figures/lte-handover-campaign-rem.png \
 	$(SRC)/lte/doc/source/figures/lte-legacy-handover-algorithm.pdf \
@@ -295,6 +285,16 @@ IMAGES_EPS = \
 	$(FIGURES)/eutran-profiling-scenario.eps \
 	$(FIGURES)/ff-example.eps \
 	$(FIGURES)/ff-mac-saps.eps \
+	$(FIGURES)/lte-dl-power-control.eps \
+	$(FIGURES)/lte-ffr-scheduling.eps \
+	$(FIGURES)/fr-enhanced-fractional-frequency-reuse-scheme.eps \
+	$(FIGURES)/fr-full-frequency-reuse-scheme.eps \
+	$(FIGURES)/fr-hard-frequency-reuse-scheme.eps \
+	$(FIGURES)/fr-soft-fractional-frequency-reuse-scheme.eps \
+	$(FIGURES)/fr-soft-frequency-reuse-scheme-v1.eps \
+	$(FIGURES)/fr-soft-frequency-reuse-scheme-v2.eps \
+	$(FIGURES)/fr-strict-frequency-reuse-scheme.eps \
+	$(FIGURES)/ffr-distributed-scheme.eps \
 	$(FIGURES)/lte-arch-enb-data.eps \
 	$(FIGURES)/lte-arch-enb-ctrl.eps \
 	$(FIGURES)/lte-arch-ue-data.eps \
@@ -363,6 +363,16 @@ $(FIGURES)/lte-arch-data-rrc-pdcp-rlc.pdf_width = 3in
 $(FIGURES)/lte-epc-e2e-data-protocol-stack.pdf_width = 15cm
 $(FIGURES)/ff-mac-saps.pdf_width = 5in
 $(FIGURES)/ff-example.pdf_width = 5in
+$(FIGURES)/lte-dl-power-control.pdf_width = 8cm
+$(FIGURES)/lte-ffr-scheduling.pdf_width = 8cm
+$(FIGURES)/fr-enhanced-fractional-frequency-reuse-scheme.pdf_width = 8cm
+$(FIGURES)/fr-full-frequency-reuse-scheme.pdf_width = 8cm
+$(FIGURES)/fr-hard-frequency-reuse-scheme.pdf_width = 8cm
+$(FIGURES)/fr-soft-fractional-frequency-reuse-scheme.pdf_width = 8cm
+$(FIGURES)/fr-soft-frequency-reuse-scheme-v1.pdf_width = 8cm
+$(FIGURES)/fr-soft-frequency-reuse-scheme-v2.pdf_width = 8cm
+$(FIGURES)/fr-strict-frequency-reuse-scheme.pdf_width = 8cm
+$(FIGURES)/ffr-distributed-scheme.pdf_width = 8cm
 $(FIGURES)/lte-arch-enb-data.pdf_width = 6cm 
 $(FIGURES)/lte-arch-enb-ctrl.pdf_width = 10cm
 $(FIGURES)/lte-arch-ue-data.pdf_width = 6cm
@@ -370,7 +380,9 @@ $(FIGURES)/lte-arch-ue-ctrl.pdf_width = 10cm
 $(FIGURES)/lte-rlc-implementation-model.pdf_width = 20in
 $(FIGURES)/lte-rlc-data-txon-dl.pdf_width = 10cm
 $(FIGURES)/lte-rlc-data-txon-ul.pdf_width = 10cm
+$(FIGURES)/lte-rlc-data-retx-dl.pdf_width = 10cm
 $(FIGURES)/lte-rlc-data-retx-ul.pdf_width = 10cm
+$(FIGURES)/lte-epc-x2-entity-saps.pdf_width = 12cm
 $(FIGURES)/lte-phy-interference.pdf_width = 12cm
 $(FIGURES)/lte-subframe-structure.pdf_width = 2in
 $(FIGURES)/mac-random-access-contention.pdf_width = 10cm

src/lte/doc/Makefile

@@ -39,8 +39,23 @@ IMAGES_DIA = \
 	$(FIGURES)/ue-meas-piecewise-a1-hys.dia \
 	$(FIGURES)/lte-cell-selection-timeline.dia \
 	$(FIGURES)/lte-cell-selection-scenario.dia \
-	$(FIGURES)/lte-handover-target-scenario.dia
-
+	$(FIGURES)/lte-handover-target-scenario.dia \
+	$(FIGURES)/lte-dl-power-control.dia \
+	$(FIGURES)/lte-ffr-scheduling.dia \
+	$(FIGURES)/fr-enhanced-fractional-frequency-reuse-scheme.dia \
+	$(FIGURES)/fr-full-frequency-reuse-scheme.dia \
+	$(FIGURES)/fr-hard-frequency-reuse-scheme.dia \
+	$(FIGURES)/fr-soft-fractional-frequency-reuse-scheme.dia \
+	$(FIGURES)/fr-soft-frequency-reuse-scheme-v1.dia \
+	$(FIGURES)/fr-soft-frequency-reuse-scheme-v2.dia \
+	$(FIGURES)/fr-strict-frequency-reuse-scheme.dia \
+	$(FIGURES)/ffr-distributed-scheme.dia \
+	$(FIGURES)/lte-rlc-implementation-model.dia \
+	$(FIGURES)/lte-rlc-data-txon-dl.dia \
+	$(FIGURES)/lte-rlc-data-retx-dl.dia \
+	$(FIGURES)/lte-rlc-data-txon-ul.dia \
+	$(FIGURES)/lte-rlc-data-retx-ul.dia \
+	$(FIGURES)/lte-epc-x2-entity-saps.dia
 
 # specify eps figures from which .png and .pdf figures need to be built
 
@@ -56,12 +71,6 @@ IMAGES_EPS = \
 	$(FIGURES)/epcSimulationTime.eps \
 	$(FIGURES)/epcEutranRunningTime.eps \
 	$(FIGURES)/profiling-memory.eps \
-	$(FIGURES)/lte-rlc-implementation-model.eps \
-	$(FIGURES)/lte-rlc-data-txon-dl.eps \
-	$(FIGURES)/lte-rlc-data-retx-dl.eps \
-	$(FIGURES)/lte-rlc-data-txon-ul.eps \
-	$(FIGURES)/lte-rlc-data-retx-ul.eps \
-	$(FIGURES)/lte-epc-x2-entity-saps.eps \
 	$(FIGURES)/lte-strongest-cell-handover-algorithm.eps
 
 # rescale pdf figures as necessary
@@ -108,22 +117,6 @@ IMAGES_NOBUILD = $(FIGURES)/fading_pedestrian.png \
 	$(FIGURES)/fading_pedestrian.pdf \
 	$(FIGURES)/fading_vehicular.pdf \
 	$(FIGURES)/fading_urban_3kmph.pdf \
-	$(FIGURES)/fr-enhanced-fractional-frequency-reuse-scheme.png \
-	$(FIGURES)/fr-enhanced-fractional-frequency-reuse-scheme.pdf \
-	$(FIGURES)/fr-full-frequency-reuse-scheme.png \
-	$(FIGURES)/fr-full-frequency-reuse-scheme.pdf \
-	$(FIGURES)/fr-hard-frequency-reuse-scheme.png \
-	$(FIGURES)/fr-hard-frequency-reuse-scheme.pdf \
-	$(FIGURES)/fr-soft-fractional-frequency-reuse-scheme.png \
-	$(FIGURES)/fr-soft-fractional-frequency-reuse-scheme.pdf \
-	$(FIGURES)/fr-soft-frequency-reuse-scheme-v1.png \
-	$(FIGURES)/fr-soft-frequency-reuse-scheme-v1.pdf \
-	$(FIGURES)/fr-soft-frequency-reuse-scheme-v2.png \
-	$(FIGURES)/fr-soft-frequency-reuse-scheme-v2.pdf \
-	$(FIGURES)/fr-strict-frequency-reuse-scheme.png \
-	$(FIGURES)/fr-strict-frequency-reuse-scheme.pdf \
-	$(FIGURES)/ffr-distributed-scheme.png \
-	$(FIGURES)/ffr-distributed-scheme.pdf \
 	$(FIGURES)/MCS_1_4.pdf \
 	$(FIGURES)/MCS_1_4.png \
 	$(FIGURES)/MCS_5_8.pdf \
@@ -146,8 +139,6 @@ IMAGES_NOBUILD = $(FIGURES)/fading_pedestrian.png \
 	$(FIGURES)/MCS_12_test.pdf \
 	$(FIGURES)/MCS_16_test.png \
 	$(FIGURES)/MCS_16_test.pdf \
-	$(FIGURES)/lte-dl-power-control.png \
-	$(FIGURES)/lte-dl-power-control.pdf \
 	$(FIGURES)/lte-fr-soft-1-rem.png \
 	$(FIGURES)/lte-fr-soft-1-rem.pdf \
 	$(FIGURES)/lte-ffr-soft-2-spectrum-trace.png \
@@ -158,8 +149,6 @@ IMAGES_NOBUILD = $(FIGURES)/fading_pedestrian.png \
 	$(FIGURES)/lte-fr-hard-2-rem.pdf \
 	$(FIGURES)/lte-fr-hard-3-rem.png \
 	$(FIGURES)/lte-fr-hard-3-rem.pdf \
-	$(FIGURES)/lte-ffr-scheduling.png \
-	$(FIGURES)/lte-ffr-scheduling.pdf \
 	$(FIGURES)/lte-phy-interference.png \
 	$(FIGURES)/lte-phy-interference.pdf \
 	$(FIGURES)/helpers.png \

src/lte/doc/source/lte-design.rst

@@ -3861,7 +3861,7 @@ power plan for Full Frequency Reuse scheme.
 .. _fig-lte-full-frequency-reuse-scheme:
  
 .. figure:: figures/fr-full-frequency-reuse-scheme.*
-   :scale: 40 %
+   :scale: 60 %
    :align: center
 
    Full Frequency Reuse scheme 
@@ -3890,7 +3890,7 @@ power plan for Hard Frequency Reuse scheme.
 .. _fig-lte-hard-frequency-reuse-scheme:
  
 .. figure:: figures/fr-hard-frequency-reuse-scheme.*
-   :scale: 40 %
+   :scale: 60 %
    :align: center
 
    Hard Frequency Reuse scheme 
@@ -3919,7 +3919,7 @@ power plan for Strict Frequency Reuse scheme with a cell-edge reuse factor of N
 .. _fig-lte-strict-frequency-reuse-scheme:
  
 .. figure:: figures/fr-strict-frequency-reuse-scheme.*
-   :scale: 40 %
+   :scale: 60 %
    :align: center
 
    Strict Frequency Reuse scheme 
@@ -3953,7 +3953,7 @@ There are two possible versions of SFR scheme:
    .. _fig-lte-soft-frequency-reuse-scheme-v1:
  
    .. figure:: figures/fr-soft-frequency-reuse-scheme-v1.*
-      :scale: 40 %
+      :scale: 60 %
       :align: center
 
       Soft Frequency Reuse scheme version 1 
@@ -3968,7 +3968,7 @@ There are two possible versions of SFR scheme:
    .. _fig-lte-soft-frequency-reuse-scheme-v2:
  
    .. figure:: figures/fr-soft-frequency-reuse-scheme-v2.*
-      :scale: 40 %
+      :scale: 60 %
       :align: center
 
       Soft Frequency Reuse scheme version 2
@@ -3999,7 +3999,7 @@ frequency and power plan for Soft Fractional Frequency Reuse.
 .. _fig-lte-soft-fractional-frequency-reuse-scheme:
  
 .. figure:: figures/fr-soft-fractional-frequency-reuse-scheme.*
-   :scale: 40 %
+   :scale: 60 %
    :align: center
 
    Soft Fractional Fractional Frequency Reuse scheme
@@ -4046,7 +4046,7 @@ frequency and power plan for Enhanced Fractional Frequency Reuse.
 .. _fig-lte-enhanced-fractional-frequency-reuse-scheme:
  
 .. figure:: figures/fr-enhanced-fractional-frequency-reuse-scheme.*
-   :scale: 40 %
+   :scale: 60 %
    :align: center
 
    Enhanced Fractional Fractional Frequency Reuse scheme
@@ -4094,7 +4094,7 @@ sequence diagram of Distributed Fractional Frequency Reuse Scheme.
 .. _fig-lte-distributed-fractional-frequency-reuse-scheme:
  
 .. figure:: figures/ffr-distributed-scheme.*
-   :scale: 100 %
+   :scale: 80 %
    :align: center
 
    Sequence diagram of Distributed Frequency Reuse Scheme