F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge with ns-3-lena-pem (changeset: 7976:e059b2c2f2e4): add trace-fading-loss-model and polish old GSoC propagation files not used

Browse Source
This commit is contained in:
mmiozzo
2011-11-08 15:48:44 +01:00
parent 089cdd23ec
commit 9db9277baa
2 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/buildings/doc/Makefile
View File

@@ -16,15 +16,8 @@ GRAPHS_EPS =
# rescale pdf figures as necessary
$(FIGURES)/testbed.pdf_width = 5in
IMAGES_PNG = ${IMAGES_EPS:.eps=.png} \
$(FIGURES)/fading_pedestrian.png \
$(FIGURES)/fading_vehicular.png \
$(FIGURES)/fading_urban_3kmph.png
IMAGES_PDF = ${IMAGES_EPS:.eps=.pdf} \
$(FIGURES)/fading_pedestrian.pdf \
$(FIGURES)/fading_vehicular.pdf \
$(FIGURES)/fading_urban_3kmph.pdf
IMAGES_PNG = ${IMAGES_EPS:.eps=.png}
IMAGES_PDF = ${IMAGES_EPS:.eps=.pdf}
IMAGES = $(IMAGES_EPS) $(IMAGES_PNG) $(IMAGES_PDF)

2
src/buildings/model/buildings-propagation-loss-model.cc
View File

@@ -574,7 +574,7 @@ BuildingsPropagationLossModel::ItuR1238 (Ptr<BuildingsMobilityModel> a, Ptr<Buil
{
NS_LOG_ERROR (this << " Unkwnon Wall Type");
}
NS_LOG_INFO (this << " Node " << a->GetPosition () << " <-> " << b->GetPosition ());
double loss = 20*log10(m_frequency/1e6/*MHz*/) + N*log10(a->GetDistanceFrom (b)) + Lf - 28.0;
return (loss);