From 9db9277baa5813cb289bd09867be3a328fbded40 Mon Sep 17 00:00:00 2001 From: mmiozzo Date: Tue, 8 Nov 2011 15:48:44 +0100 Subject: [PATCH] Merge with ns-3-lena-pem (changeset: 7976:e059b2c2f2e4): add trace-fading-loss-model and polish old GSoC propagation files not used --- src/buildings/doc/Makefile | 11 ++--------- .../model/buildings-propagation-loss-model.cc | 2 +- 2 files changed, 3 insertions(+), 10 deletions(-) diff --git a/src/buildings/doc/Makefile b/src/buildings/doc/Makefile index bb3232e55..8adf6e6b8 100644 --- a/src/buildings/doc/Makefile +++ b/src/buildings/doc/Makefile @@ -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) diff --git a/src/buildings/model/buildings-propagation-loss-model.cc b/src/buildings/model/buildings-propagation-loss-model.cc index 92cde78e3..43e7c8f42 100644 --- a/src/buildings/model/buildings-propagation-loss-model.cc +++ b/src/buildings/model/buildings-propagation-loss-model.cc @@ -574,7 +574,7 @@ BuildingsPropagationLossModel::ItuR1238 (Ptr a, PtrGetPosition () << " <-> " << b->GetPosition ()); double loss = 20*log10(m_frequency/1e6/*MHz*/) + N*log10(a->GetDistanceFrom (b)) + Lf - 28.0; return (loss);