Mercurial Mercurial > ns-3.24 / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
authorNicola Baldo <nbaldo@cttc.es>
Tue, 20 Dec 2011 10:57:13 +0100
changeset 8487 c2548f9b212c
parent 8486 5b9524480a4b (current diff)
parent 8483 a21f6fd0976a (diff)
child 8488 a766f5d15795
merge
--- a/doc/models/Makefile	Mon Dec 19 17:45:50 2011 +0100
+++ b/doc/models/Makefile	Tue Dec 20 10:57:13 2011 +0100
@@ -82,15 +82,39 @@
 	$(SRC)/lte/doc/source/figures/ff-example.dia \
 	$(SRC)/lte/doc/source/figures/lte-enb-architecture.dia \
 	$(SRC)/lte/doc/source/figures/lte-ue-architecture.dia \
+	$(SRC)/lte/doc/source/figures/epc-profiling-scenario.dia \
+	$(SRC)/lte/doc/source/figures/eutran-profiling-scenario.dia \
 	$(SRC)/lte/doc/source/figures/lte-interference-test-scenario.dia \
+	$(SRC)/lte/doc/source/figures/epc-topology.dia \
+	$(SRC)/lte/doc/source/figures/epc-data-flow-dl.dia \
+	$(SRC)/lte/doc/source/figures/epc-data-flow-ul.dia \
+	$(SRC)/lte/doc/source/figures/lte-arch-data-rrc-pdcp-rlc.dia \
+	$(SRC)/lte/doc/source/figures/lte-epc-e2e-data-protocol-stack.dia \
 	$(SRC)/lte/doc/source/figures/lte-mcs-index.eps \
 	$(SRC)/lte/doc/source/figures/lenaThrTestCase1.eps \
 	$(SRC)/lte/doc/source/figures/lenaThrTestCase2.eps \
+	$(SRC)/lte/doc/source/figures/runningTime10s.eps \
+	$(SRC)/lte/doc/source/figures/epcRunningTime.eps \
+	$(SRC)/lte/doc/source/figures/propagationModel.eps \
 	$(SRC)/lte/doc/source/figures/simulationTime.eps \
-	$(SRC)/lte/doc/source/figures/memoryUsage.eps \
-	$(SRC)/lte/doc/source/figures/fading_pedestrian.pdf \
+	$(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/fading_vehicular.png \
+	$(SRC)/lte/doc/source/figures/fading_urban_3kmph.png \
+	$(SRC)/lte/doc/source/figures/fading_pedestrian.png \
 	$(SRC)/lte/doc/source/figures/fading_vehicular.pdf \
 	$(SRC)/lte/doc/source/figures/fading_urban_3kmph.pdf \
+	$(SRC)/lte/doc/source/figures/fading_pedestrian.pdf \
+	$(SRC)/lte/doc/source/figures/lte-phy-interference.png \
+	$(SRC)/lte/doc/source/figures/lte-phy-interference.pdf \
+	$(SRC)/lte/doc/source/figures/helpers.png \
+	$(SRC)/lte/doc/source/figures/helpers.pdf \
 	$(SRC)/uan/doc/auvmobility-classes.dia \
 	$(SRC)/stats/doc/Stat-framework-arch.png \
 	$(SRC)/stats/doc/Wifi-default.png \
@@ -117,12 +141,29 @@
 	$(FIGURES)/ff-example.eps \
 	$(FIGURES)/lte-enb-architecture.eps \
 	$(FIGURES)/lte-ue-architecture.eps \
+	$(FIGURES)/epc-profiling-scenario.eps \
+	$(FIGURES)/eutran-profiling-scenario.eps \
 	$(FIGURES)/lte-interference-test-scenario.eps \
+	$(FIGURES)/epc-topology.eps \
+	$(FIGURES)/epc-data-flow-dl.eps \
+	$(FIGURES)/epc-data-flow-ul.eps \
+	$(FIGURES)/lte-arch-data-rrc-pdcp-rlc.eps \
+	$(FIGURES)/lte-epc-e2e-data-protocol-stack.eps \
 	$(FIGURES)/lte-mcs-index.eps \
 	$(FIGURES)/lenaThrTestCase1.eps \
 	$(FIGURES)/lenaThrTestCase2.eps \
+	$(FIGURES)/runningTime10s.eps \
+	$(FIGURES)/epcRunningTime.eps \
+	$(FIGURES)/propagationModel.eps \
 	$(FIGURES)/simulationTime.eps \
-	$(FIGURES)/memoryUsage.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)/auvmobility-classes.eps \
 
 # rescale pdf figures as necessary
@@ -137,7 +178,17 @@
 $(FIGURES)/routing.pdf_width = 6in
 $(FIGURES)/routing-specialization.pdf_width = 5in
 $(FIGURES)/snir.pdf_width = 3in
-$(FIGURES)/lte-transmission.pdf_width = 3in
+$(FIGURES)/lte-interference-test-scenario.pdf_width = 3in
+$(FIGURES)/epc-topology.pdf_width = 4in
+$(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-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-ul.pdf_width = 10cm
+$(FIGURES)/lte-phy-interference.pdf_width = 12cm
 $(FIGURES)/auvmobility-classes.pdf_width = 10cm
 
 IMAGES_PNG = ${IMAGES_EPS:.eps=.png}
--- a/src/lte/doc/Makefile	Mon Dec 19 17:45:50 2011 +0100
+++ b/src/lte/doc/Makefile	Tue Dec 20 10:57:13 2011 +0100
@@ -16,7 +16,13 @@
 	$(FIGURES)/lte-ue-architecture.eps \
 	$(FIGURES)/epc-profiling-scenario.eps \
 	$(FIGURES)/eutran-profiling-scenario.eps \
-	$(FIGURES)/lte-interference-test-scenario.eps
+	$(FIGURES)/lte-interference-test-scenario.eps \
+	$(FIGURES)/epc-topology.eps \
+	$(FIGURES)/epc-data-flow-dl.eps \
+	$(FIGURES)/epc-data-flow-ul.eps \
+	$(FIGURES)/lte-arch-data-rrc-pdcp-rlc.eps \
+	$(FIGURES)/lte-epc-e2e-data-protocol-stack.eps
+
 
 # specify figures for build process (all eps figures)
 GRAPHS_EPS = \
@@ -34,12 +40,7 @@
 	$(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)/epc-topology.eps \
-	$(FIGURES)/epc-data-flow-dl.eps \
-	$(FIGURES)/epc-data-flow-ul.eps \
-	$(FIGURES)/lte-arch-data-rrc-pdcp-rlc.eps \
-	$(FIGURES)/lte-epc-e2e-data-protocol-stack.eps 
+	$(FIGURES)/lte-rlc-data-retx-ul.eps 
 
 
 # rescale pdf figures as necessary
@@ -54,7 +55,6 @@
 $(FIGURES)/routing.pdf_width = 6in
 $(FIGURES)/routing-specialization.pdf_width = 5in
 $(FIGURES)/snir.pdf_width = 3in
-$(FIGURES)/auvmobility-classes.pdf_width = 10cm
 $(FIGURES)/lte-interference-test-scenario.pdf_width = 3in
 $(FIGURES)/epc-topology.pdf_width = 4in
 $(FIGURES)/lte-arch-data-rrc-pdcp-rlc.pdf_width = 3in
@@ -66,6 +66,7 @@
 $(FIGURES)/lte-rlc-data-txon-ul.pdf_width = 10cm
 $(FIGURES)/lte-rlc-data-retx-ul.pdf_width = 10cm
 $(FIGURES)/lte-phy-interference.pdf_width = 12cm
+$(FIGURES)/auvmobility-classes.pdf_width = 10cm
 
 IMAGES_PNG = ${IMAGES_EPS:.eps=.png} 
 
--- a/src/lte/doc/source/conf.py	Mon Dec 19 17:45:50 2011 +0100
+++ b/src/lte/doc/source/conf.py	Tue Dec 20 10:57:13 2011 +0100
@@ -25,8 +25,7 @@
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = ['sphinx.ext.pngmath', 
-              'sphinxcontrib.seqdiag']
+extensions = ['sphinx.ext.pngmath']
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
--- a/src/lte/doc/source/lte-profiling.rst	Mon Dec 19 17:45:50 2011 +0100
+++ b/src/lte/doc/source/lte-profiling.rst	Tue Dec 20 10:57:13 2011 +0100
@@ -166,7 +166,7 @@
 
    Running time
 
-As a rough complexity estimation, we compare two scenarios using the simplified E-UTRAN version (PHY+MAC) against the complete E-UTRAN + EPC, with same number of UEs per eNodeB, same number of eNodeBs and roughly same volume of transmitted data. 
+To estimate the additional complexity of the upper LTE Radio Protocol Stack model and the EPC model, we compare two scenarios using the simplified E-UTRAN version (using only PHY, MAC and the simplified RLC/SM, with no EPC and no ns-3 applications) against the complete E-UTRAN + EPC (with UM RLC, PDCP, end-to-end IP networking and regular ns-3 applications). Both configuration have been tested with the same number of UEs per eNodeB, the same number of eNodeBs, and approximately the same volume of transmitted data (an exact match was not possible due to the different ways in which packets are generated in the two configurations). 
 
 .. _fig-epcEutranRunTime:
 
@@ -176,7 +176,8 @@
 
    EPC E-UTRAN running time
 
-Figures for the complete system are more or less doubling the previous one, but considering the overhead of all the logic and entities incorporated this order of increment is to be expected.
+From the figure, it is evident that the additional complexity of using the upper LTE stack plus the EPC model translates approximately into a doubling of the execution time of the simulations. We believe that, considered all the new features that have been added, this figure is acceptable.
+
 
 Simulation time
 ---------------
ns-3.24