From efd46793d4f4c3fbb1153b4620568316f34e9897 Mon Sep 17 00:00:00 2001
From: Marco Miozzo <marco.miozzo@cttc.es>
Date: Tue, 4 Jun 2013 12:11:39 +0200
Subject: [PATCH] Renaming of file buildings-mobility-model in
 mobility-building-info

---
 src/buildings/helper/building-position-allocator.cc           | 2 +-
 src/buildings/helper/buildings-helper.cc                      | 2 +-
 src/buildings/model/buildings-propagation-loss-model.cc       | 2 +-
 src/buildings/model/buildings-propagation-loss-model.h        | 3 ++-
 .../model/hybrid-buildings-propagation-loss-model.cc          | 2 +-
 src/buildings/model/itu-r-1238-propagation-loss-model.cc      | 2 +-
 ...{buildings-mobility-model.cc => mobility-building-info.cc} | 2 +-
 .../{buildings-mobility-model.h => mobility-building-info.h}  | 0
 src/buildings/model/oh-buildings-propagation-loss-model.cc    | 2 +-
 src/buildings/test/building-position-allocator-test.cc        | 2 +-
 src/buildings/test/buildings-helper-test.cc                   | 2 +-
 src/buildings/test/buildings-pathloss-test.cc                 | 2 +-
 src/buildings/test/buildings-pathloss-test.h                  | 1 -
 src/buildings/test/buildings-shadowing-test.cc                | 2 +-
 src/buildings/test/buildings-shadowing-test.h                 | 2 --
 src/buildings/wscript                                         | 4 ++--
 src/lte/helper/radio-environment-map-helper.cc                | 2 +-
 src/lte/test/lte-test-harq.cc                                 | 2 +-
 src/lte/test/lte-test-mimo.cc                                 | 2 +-
 src/lte/test/lte-test-pathloss-model.h                        | 1 -
 src/lte/test/lte-test-phy-error-model.cc                      | 2 +-
 21 files changed, 19 insertions(+), 22 deletions(-)
 rename src/buildings/model/{buildings-mobility-model.cc => mobility-building-info.cc} (98%)
 rename src/buildings/model/{buildings-mobility-model.h => mobility-building-info.h} (100%)

diff --git a/src/buildings/helper/building-position-allocator.cc b/src/buildings/helper/building-position-allocator.cc
index 260d49250..2358d4ed9 100644
--- a/src/buildings/helper/building-position-allocator.cc
+++ b/src/buildings/helper/building-position-allocator.cc
@@ -18,7 +18,7 @@
  * Author: Nicola Baldo <nbaldo@cttc.es>
  */
 #include "building-position-allocator.h"
-#include "ns3/buildings-mobility-model.h"
+#include <ns3/mobility-building-info.h>
 #include "ns3/mobility-model.h"
 #include "ns3/buildings-helper.h"
 #include "ns3/random-variable-stream.h"
diff --git a/src/buildings/helper/buildings-helper.cc b/src/buildings/helper/buildings-helper.cc
index f49c0900e..82ad7a96b 100644
--- a/src/buildings/helper/buildings-helper.cc
+++ b/src/buildings/helper/buildings-helper.cc
@@ -24,7 +24,7 @@
 #include <ns3/building.h>
 #include <ns3/building-list.h>
 #include <ns3/mobility-model.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include <ns3/abort.h>
 #include <ns3/log.h>
 
diff --git a/src/buildings/model/buildings-propagation-loss-model.cc b/src/buildings/model/buildings-propagation-loss-model.cc
index 4619d4da2..b5c78ec05 100644
--- a/src/buildings/model/buildings-propagation-loss-model.cc
+++ b/src/buildings/model/buildings-propagation-loss-model.cc
@@ -27,7 +27,7 @@
 #include "ns3/pointer.h"
 #include <cmath>
 #include "buildings-propagation-loss-model.h"
-#include "ns3/buildings-mobility-model.h"
+#include <ns3/mobility-building-info.h>
 #include "ns3/enum.h"
 
 
diff --git a/src/buildings/model/buildings-propagation-loss-model.h b/src/buildings/model/buildings-propagation-loss-model.h
index 02bb4c0ab..c33c4a316 100644
--- a/src/buildings/model/buildings-propagation-loss-model.h
+++ b/src/buildings/model/buildings-propagation-loss-model.h
@@ -27,7 +27,8 @@
 #include "ns3/propagation-loss-model.h"
 #include "ns3/random-variable-stream.h"
 #include <ns3/building.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
+
 
 
 namespace ns3 {
diff --git a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
index a24537ab7..0d441c08b 100644
--- a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
+++ b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc
@@ -31,7 +31,7 @@
 #include "ns3/itu-r-1411-nlos-over-rooftop-propagation-loss-model.h"
 #include "ns3/itu-r-1238-propagation-loss-model.h"
 #include "ns3/kun-2600-mhz-propagation-loss-model.h"
-#include "ns3/buildings-mobility-model.h"
+#include <ns3/mobility-building-info.h>
 #include "ns3/enum.h"
 
 #include "hybrid-buildings-propagation-loss-model.h"
diff --git a/src/buildings/model/itu-r-1238-propagation-loss-model.cc b/src/buildings/model/itu-r-1238-propagation-loss-model.cc
index 9e6214d1d..fcc739c66 100644
--- a/src/buildings/model/itu-r-1238-propagation-loss-model.cc
+++ b/src/buildings/model/itu-r-1238-propagation-loss-model.cc
@@ -26,7 +26,7 @@
 #include <cmath>
 
 #include "itu-r-1238-propagation-loss-model.h"
-#include "buildings-mobility-model.h"
+#include <ns3/mobility-building-info.h>
 
 NS_LOG_COMPONENT_DEFINE ("ItuR1238PropagationLossModel");
 
diff --git a/src/buildings/model/buildings-mobility-model.cc b/src/buildings/model/mobility-building-info.cc
similarity index 98%
rename from src/buildings/model/buildings-mobility-model.cc
rename to src/buildings/model/mobility-building-info.cc
index 3bf73b911..001c83c5a 100644
--- a/src/buildings/model/buildings-mobility-model.cc
+++ b/src/buildings/model/mobility-building-info.cc
@@ -21,7 +21,7 @@
 
 #include <ns3/simulator.h>
 #include <ns3/position-allocator.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include <ns3/pointer.h>
 #include <ns3/log.h>
 #include <ns3/assert.h>
diff --git a/src/buildings/model/buildings-mobility-model.h b/src/buildings/model/mobility-building-info.h
similarity index 100%
rename from src/buildings/model/buildings-mobility-model.h
rename to src/buildings/model/mobility-building-info.h
diff --git a/src/buildings/model/oh-buildings-propagation-loss-model.cc b/src/buildings/model/oh-buildings-propagation-loss-model.cc
index 4475200f5..4759528be 100644
--- a/src/buildings/model/oh-buildings-propagation-loss-model.cc
+++ b/src/buildings/model/oh-buildings-propagation-loss-model.cc
@@ -26,7 +26,7 @@
 #include "ns3/pointer.h"
 #include <cmath>
 #include "oh-buildings-propagation-loss-model.h"
-#include "ns3/buildings-mobility-model.h"
+#include <ns3/mobility-building-info.h>
 #include "ns3/okumura-hata-propagation-loss-model.h"
 #include "ns3/enum.h"
 
diff --git a/src/buildings/test/building-position-allocator-test.cc b/src/buildings/test/building-position-allocator-test.cc
index b57347673..19a73f931 100644
--- a/src/buildings/test/building-position-allocator-test.cc
+++ b/src/buildings/test/building-position-allocator-test.cc
@@ -23,7 +23,7 @@
 #include "ns3/log.h"
 #include "ns3/test.h"
 #include <ns3/building-position-allocator.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include <ns3/constant-position-mobility-model.h>
 #include <ns3/mobility-model.h>
 #include <ns3/building.h>
diff --git a/src/buildings/test/buildings-helper-test.cc b/src/buildings/test/buildings-helper-test.cc
index f077a45e8..216f81a88 100644
--- a/src/buildings/test/buildings-helper-test.cc
+++ b/src/buildings/test/buildings-helper-test.cc
@@ -22,7 +22,7 @@
 
 #include "ns3/log.h"
 #include "ns3/test.h"
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include <ns3/constant-position-mobility-model.h>
 #include <ns3/building.h>
 #include <ns3/buildings-helper.h>
diff --git a/src/buildings/test/buildings-pathloss-test.cc b/src/buildings/test/buildings-pathloss-test.cc
index d0c4825dd..a76f2284b 100644
--- a/src/buildings/test/buildings-pathloss-test.cc
+++ b/src/buildings/test/buildings-pathloss-test.cc
@@ -29,7 +29,7 @@
 #include <ns3/building.h>
 #include <ns3/enum.h>
 #include <ns3/constant-position-mobility-model.h>
-
+#include <ns3/mobility-building-info.h>
 #include "buildings-pathloss-test.h"
 
 
diff --git a/src/buildings/test/buildings-pathloss-test.h b/src/buildings/test/buildings-pathloss-test.h
index b4e598f07..ba2e3f45a 100644
--- a/src/buildings/test/buildings-pathloss-test.h
+++ b/src/buildings/test/buildings-pathloss-test.h
@@ -22,7 +22,6 @@
 #define BUILDINGS_PATHLOSS_TEST_H
 
 #include <ns3/test.h>
-// #include <ns3/buildings-mobility-model.h>
 #include <ns3/hybrid-buildings-propagation-loss-model.h>
 
 
diff --git a/src/buildings/test/buildings-shadowing-test.cc b/src/buildings/test/buildings-shadowing-test.cc
index 6d36ddd7f..deebd69e8 100644
--- a/src/buildings/test/buildings-shadowing-test.cc
+++ b/src/buildings/test/buildings-shadowing-test.cc
@@ -28,7 +28,7 @@
 #include <ns3/enum.h>
 #include <ns3/buildings-helper.h>
 #include <ns3/mobility-model.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include <ns3/constant-position-mobility-model.h>
 
 #include "buildings-shadowing-test.h"
diff --git a/src/buildings/test/buildings-shadowing-test.h b/src/buildings/test/buildings-shadowing-test.h
index 24862a84c..6b13e2643 100644
--- a/src/buildings/test/buildings-shadowing-test.h
+++ b/src/buildings/test/buildings-shadowing-test.h
@@ -23,8 +23,6 @@
 
 #include "ns3/test.h"
 
-#include <ns3/buildings-mobility-model.h>
-#include <ns3/buildings-propagation-loss-model.h>
 
 
 namespace ns3 {
diff --git a/src/buildings/wscript b/src/buildings/wscript
index e92077028..2c1f2a674 100644
--- a/src/buildings/wscript
+++ b/src/buildings/wscript
@@ -6,7 +6,7 @@ def build(bld):
     module.source = [
         'model/building.cc',
         'model/building-list.cc',
-        'model/buildings-mobility-model.cc',
+        'model/mobility-building-info.cc',
         'model/itu-r-1238-propagation-loss-model.cc',
         'model/buildings-propagation-loss-model.cc',
         'model/hybrid-buildings-propagation-loss-model.cc',
@@ -30,7 +30,7 @@ def build(bld):
     headers.source = [
         'model/building.h',
         'model/building-list.h',
-        'model/buildings-mobility-model.h',
+        'model/mobility-building-info.h',
         'model/itu-r-1238-propagation-loss-model.h',
         'model/buildings-propagation-loss-model.h',
         'model/hybrid-buildings-propagation-loss-model.h',
diff --git a/src/lte/helper/radio-environment-map-helper.cc b/src/lte/helper/radio-environment-map-helper.cc
index 720794f0c..3a691c9bf 100644
--- a/src/lte/helper/radio-environment-map-helper.cc
+++ b/src/lte/helper/radio-environment-map-helper.cc
@@ -30,7 +30,7 @@
 #include <ns3/spectrum-channel.h>
 #include <ns3/config.h>
 #include <ns3/rem-spectrum-phy.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include <ns3/constant-position-mobility-model.h>
 #include <ns3/simulator.h>
 #include <ns3/node.h>
diff --git a/src/lte/test/lte-test-harq.cc b/src/lte/test/lte-test-harq.cc
index d0aa1edf6..dc5d832d5 100644
--- a/src/lte/test/lte-test-harq.cc
+++ b/src/lte/test/lte-test-harq.cc
@@ -29,7 +29,7 @@
 #include <iostream>
 #include <cmath>
 #include <ns3/radio-bearer-stats-calculator.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include <ns3/hybrid-buildings-propagation-loss-model.h>
 #include <ns3/eps-bearer.h>
 #include <ns3/node-container.h>
diff --git a/src/lte/test/lte-test-mimo.cc b/src/lte/test/lte-test-mimo.cc
index 6aeec9df5..c6a749577 100644
--- a/src/lte/test/lte-test-mimo.cc
+++ b/src/lte/test/lte-test-mimo.cc
@@ -32,7 +32,7 @@
 #include <ns3/ptr.h>
 #include <iostream>
 #include "ns3/radio-bearer-stats-calculator.h"
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include <ns3/buildings-propagation-loss-model.h>
 #include <ns3/eps-bearer.h>
 #include <ns3/node-container.h>
diff --git a/src/lte/test/lte-test-pathloss-model.h b/src/lte/test/lte-test-pathloss-model.h
index 103fcb80d..fa66b5ab9 100644
--- a/src/lte/test/lte-test-pathloss-model.h
+++ b/src/lte/test/lte-test-pathloss-model.h
@@ -25,7 +25,6 @@
 
 #include "ns3/test.h"
 
-#include <ns3/buildings-mobility-model.h>
 #include <ns3/buildings-propagation-loss-model.h>
 
 
diff --git a/src/lte/test/lte-test-phy-error-model.cc b/src/lte/test/lte-test-phy-error-model.cc
index 96fa01f45..bb3372089 100644
--- a/src/lte/test/lte-test-phy-error-model.cc
+++ b/src/lte/test/lte-test-phy-error-model.cc
@@ -28,7 +28,7 @@
 #include <ns3/ptr.h>
 #include <iostream>
 #include <ns3/radio-bearer-stats-calculator.h>
-#include <ns3/buildings-mobility-model.h>
+#include <ns3/mobility-building-info.h>
 #include <ns3/hybrid-buildings-propagation-loss-model.h>
 #include <ns3/eps-bearer.h>
 #include <ns3/node-container.h>