From a011792fb63d34b1e42fb2fda3ac51c6beaa4d5c Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Wed, 18 Jul 2007 10:53:53 +0200
Subject: [PATCH] RandomRectangleTopology -> RandomTopology

---
 SConstruct                                       |  4 ++--
 ...-rectangle-topology.cc => random-topology.cc} | 14 +++++++-------
 ...om-rectangle-topology.h => random-topology.h} | 16 ++++++++--------
 3 files changed, 17 insertions(+), 17 deletions(-)
 rename src/node/{random-rectangle-topology.cc => random-topology.cc} (83%)
 rename src/node/{random-rectangle-topology.h => random-topology.h} (81%)

diff --git a/SConstruct b/SConstruct
index c25806e45..f19bd992d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -253,7 +253,7 @@ node.add_sources ([
     'static-mobility-model.cc',
     'static-speed-mobility-model.cc',
     'grid-topology.cc',
-    'random-rectangle-topology.cc',
+    'random-topology.cc',
     'random-walk-mobility-model.cc',
     'random-mobility-model.cc',
     'random-direction-mobility-model.cc',
@@ -284,7 +284,7 @@ node.add_inst_headers ([
     'static-mobility-model.h',
     'static-speed-mobility-model.h',
     'grid-topology.h',
-    'random-rectangle-topology.h',
+    'random-topology.h',
     'random-walk-mobility-model.h',
     'random-mobility-model.h',
     'random-direction-mobility-model.h',
diff --git a/src/node/random-rectangle-topology.cc b/src/node/random-topology.cc
similarity index 83%
rename from src/node/random-rectangle-topology.cc
rename to src/node/random-topology.cc
index 77efba294..da3567c49 100644
--- a/src/node/random-rectangle-topology.cc
+++ b/src/node/random-topology.cc
@@ -19,7 +19,7 @@
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
 #include "ns3/random-variable-default-value.h"
-#include "random-rectangle-topology.h"
+#include "random-topology.h"
 #include "random-2d-position.h"
 #include "mobility-model.h"
 
@@ -37,35 +37,35 @@ g_mobility ("Random2dTopologyMobilityModelType",
             MobilityModel::iid,
             "StaticMobilityModel");
 
-RandomRectangleTopology::RandomRectangleTopology ()
+RandomTopology::RandomTopology ()
   : m_mobilityModel (g_mobility.GetValue ())
 {
   m_positionModel = ComponentManager::Create<Random2dPosition> (g_position.GetValue (), 
                                                                 Random2dPosition::iid);
 }
-RandomRectangleTopology::RandomRectangleTopology (Ptr<Random2dPosition> positionModel, ClassId mobilityModel)
+RandomTopology::RandomTopology (Ptr<Random2dPosition> positionModel, ClassId mobilityModel)
   : m_positionModel (positionModel),
     m_mobilityModel (mobilityModel)
 {}
-RandomRectangleTopology::~RandomRectangleTopology ()
+RandomTopology::~RandomTopology ()
 {
   m_positionModel = 0;
 }
 
 void 
-RandomRectangleTopology::SetMobilityModel (ClassId classId)
+RandomTopology::SetMobilityModel (ClassId classId)
 {
   m_mobilityModel = classId;
 }
 
 void 
-RandomRectangleTopology::SetPositionModel (Ptr<Random2dPosition> positionModel)
+RandomTopology::SetPositionModel (Ptr<Random2dPosition> positionModel)
 {
   m_positionModel = positionModel;
 }
 
 void 
-RandomRectangleTopology::LayoutOne (Ptr<Object> object)
+RandomTopology::LayoutOne (Ptr<Object> object)
 {
   Position2d position2d = m_positionModel->Get ();
   Ptr<MobilityModel> mobility = ComponentManager::Create<MobilityModel> (m_mobilityModel, 
diff --git a/src/node/random-rectangle-topology.h b/src/node/random-topology.h
similarity index 81%
rename from src/node/random-rectangle-topology.h
rename to src/node/random-topology.h
index 4a5aa6621..826186e6c 100644
--- a/src/node/random-rectangle-topology.h
+++ b/src/node/random-topology.h
@@ -18,8 +18,8 @@
  *
  * Author: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
  */
-#ifndef RANDOM_RECTANGLE_TOPOLOGY_H
-#define RANDOM_RECTANGLE_TOPOLOGY_H
+#ifndef RANDOM_TOPOLOGY_H
+#define RANDOM_TOPOLOGY_H
 
 #include "ns3/ptr.h"
 #include "ns3/object.h"
@@ -29,14 +29,14 @@ namespace ns3 {
 
 class Random2dPosition;
 
-class RandomRectangleTopology
+class RandomTopology
 {
  public:
-  RandomRectangleTopology ();
-  RandomRectangleTopology (Ptr<Random2dPosition> positionModel,
+  RandomTopology ();
+  RandomTopology (Ptr<Random2dPosition> positionModel,
                            ClassId mobilityModel);
 
-  ~RandomRectangleTopology ();
+  ~RandomTopology ();
 
   void SetMobilityModel (ClassId classId);
   void SetPositionModel (Ptr<Random2dPosition> positionModel);
@@ -56,7 +56,7 @@ namespace ns3 {
 
 template <typename T>
 void 
-RandomRectangleTopology::Layout (const T &begin, const T &end)
+RandomTopology::Layout (const T &begin, const T &end)
 {
   for (T i = begin; i != end; i++)
     {
@@ -67,4 +67,4 @@ RandomRectangleTopology::Layout (const T &begin, const T &end)
 
 } // namespace ns3 
 
-#endif /* RANDOM_RECTANGLE_TOPOLOGY_H */
+#endif /* RANDOM_TOPOLOGY_H */