Renaming of file buildings-mobility-model in mobility-building-info

2013-06-04 12:11:39 +02:00
parent 58b5a3b10b
commit efd46793d4
21 changed files with 19 additions and 22 deletions
--- 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"
--- 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>

--- 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"


--- 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 {
--- 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"
--- 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");

--- a/src/buildings/model/buildings-mobility-model.cc
+++ b/src/buildings/model/buildings-mobility-model.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>
--- a/src/buildings/model/buildings-mobility-model.h
+++ b/src/buildings/model/buildings-mobility-model.h
--- 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"

--- 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>
--- 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>
--- 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"


--- 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>


--- 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"
--- 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 {
--- 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',
--- 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>
--- 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>
--- 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>
--- 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>


--- 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>