Merge with ns-3-lena-pem (changeset: 7976:e059b2c2f2e4): add trace-fading-loss-model and polish old GSoC propagation files not used
--- a/src/buildings/doc/Makefile Tue Nov 08 15:18:19 2011 +0100
+++ b/src/buildings/doc/Makefile Tue Nov 08 15:48:44 2011 +0100
@@ -16,15 +16,8 @@
# 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)
--- a/src/buildings/model/buildings-propagation-loss-model.cc Tue Nov 08 15:18:19 2011 +0100
+++ b/src/buildings/model/buildings-propagation-loss-model.cc Tue Nov 08 15:48:44 2011 +0100
@@ -574,7 +574,7 @@
{
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);