From f3060d8a33a8a3c66514b947ec7e4ab6ebe2180c Mon Sep 17 00:00:00 2001
From: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
Date: Thu, 19 Jul 2007 12:23:12 +0200
Subject: [PATCH] RandomDirection2dParameters ->
 RandomDirection2dMobilityModelParameters

---
 .../random-direction-2d-mobility-model.cc     | 30 ++++++++++---------
 src/node/random-direction-2d-mobility-model.h | 14 ++++-----
 2 files changed, 23 insertions(+), 21 deletions(-)

diff --git a/src/node/random-direction-2d-mobility-model.cc b/src/node/random-direction-2d-mobility-model.cc
index 33a10e820..63c4a7d51 100644
--- a/src/node/random-direction-2d-mobility-model.cc
+++ b/src/node/random-direction-2d-mobility-model.cc
@@ -50,21 +50,22 @@ static RectangleDefaultValue
 	       -100, 100, -100, 100);
 
 
-RandomDirection2dParameters::RandomDirection2dParameters ()
+RandomDirection2dMobilityModelParameters::RandomDirection2dMobilityModelParameters ()
   : m_bounds (g_bounds.GetValue ()),
     m_speedVariable (g_speedVariable.GetCopy ()),
     m_pauseVariable (g_pauseVariable.GetCopy ())
     
 {}
-RandomDirection2dParameters::RandomDirection2dParameters (const Rectangle &bounds,
-						      const RandomVariable &speedVariable,
-						      const RandomVariable &pauseVariable)
+RandomDirection2dMobilityModelParameters::RandomDirection2dMobilityModelParameters 
+(const Rectangle &bounds,
+ const RandomVariable &speedVariable,
+ const RandomVariable &pauseVariable)
   : m_bounds (bounds),
     m_speedVariable (speedVariable.Copy ()),
     m_pauseVariable (pauseVariable.Copy ())
 {}
 
-RandomDirection2dParameters::~RandomDirection2dParameters ()
+RandomDirection2dMobilityModelParameters::~RandomDirection2dMobilityModelParameters ()
 {
   delete m_speedVariable;
   delete m_pauseVariable;
@@ -73,33 +74,33 @@ RandomDirection2dParameters::~RandomDirection2dParameters ()
 }
 
 void 
-RandomDirection2dParameters::SetSpeed (const RandomVariable &speedVariable)
+RandomDirection2dMobilityModelParameters::SetSpeed (const RandomVariable &speedVariable)
 {
   delete m_speedVariable;
   m_speedVariable = speedVariable.Copy ();
 }
 void 
-RandomDirection2dParameters::SetPause (const RandomVariable &pauseVariable)
+RandomDirection2dMobilityModelParameters::SetPause (const RandomVariable &pauseVariable)
 {
   delete m_pauseVariable;
   m_pauseVariable = pauseVariable.Copy ();
 }
 void 
-RandomDirection2dParameters::SetBounds (const Rectangle &bounds)
+RandomDirection2dMobilityModelParameters::SetBounds (const Rectangle &bounds)
 {
   m_bounds = bounds;
 }
 
-Ptr<RandomDirection2dParameters> 
-RandomDirection2dParameters::GetCurrent (void)
+Ptr<RandomDirection2dMobilityModelParameters> 
+RandomDirection2dMobilityModelParameters::GetCurrent (void)
 {
-  static Ptr<RandomDirection2dParameters> parameters = 0;
+  static Ptr<RandomDirection2dMobilityModelParameters> parameters = 0;
   if (parameters == 0 ||
       g_bounds.IsDirty () ||
       g_speedVariable.IsDirty () ||
       g_pauseVariable.IsDirty ())
     {
-      parameters = Create<RandomDirection2dParameters> ();
+      parameters = Create<RandomDirection2dMobilityModelParameters> ();
       g_bounds.ClearDirtyFlag ();
       g_speedVariable.ClearDirtyFlag ();
       g_pauseVariable.ClearDirtyFlag ();
@@ -109,12 +110,13 @@ RandomDirection2dParameters::GetCurrent (void)
 
 
 RandomDirection2dMobilityModel::RandomDirection2dMobilityModel ()
-  : m_parameters (RandomDirection2dParameters::GetCurrent ())
+  : m_parameters (RandomDirection2dMobilityModelParameters::GetCurrent ())
 {
   SetInterfaceId (RandomDirection2dMobilityModel::iid);
   m_event = Simulator::ScheduleNow (&RandomDirection2dMobilityModel::Start, this);
 }
-RandomDirection2dMobilityModel::RandomDirection2dMobilityModel (Ptr<RandomDirection2dParameters> parameters)
+RandomDirection2dMobilityModel::RandomDirection2dMobilityModel 
+(Ptr<RandomDirection2dMobilityModelParameters> parameters)
   : m_parameters (parameters)
 {
   SetInterfaceId (RandomDirection2dMobilityModel::iid);
diff --git a/src/node/random-direction-2d-mobility-model.h b/src/node/random-direction-2d-mobility-model.h
index fa5b64739..dda1b1173 100644
--- a/src/node/random-direction-2d-mobility-model.h
+++ b/src/node/random-direction-2d-mobility-model.h
@@ -37,22 +37,22 @@ class RandomVariable;
 /**
  * \brief the parameters to control a RandomDirection mobility model.
  */
-class RandomDirection2dParameters : public Object
+class RandomDirection2dMobilityModelParameters : public Object
 {
  public:
   /**
    * Create a default parameter object from Bind default values.
    */
-  RandomDirection2dParameters ();
+  RandomDirection2dMobilityModelParameters ();
   /**
    * \param bounds the 2d bounds of the mobility model
    * \param speedVariable the random variable used to pick a random speed
    * \param pauseVariable the random variable used to pick a random pause delay
    */
-  RandomDirection2dParameters (const Rectangle &bounds,
+  RandomDirection2dMobilityModelParameters (const Rectangle &bounds,
                                const RandomVariable &speedVariable,
                                const RandomVariable &pauseVariable);
-  virtual ~RandomDirection2dParameters ();
+  virtual ~RandomDirection2dMobilityModelParameters ();
 
   /**
    * \param speedVariable the random variable used to pick a random speed.
@@ -69,7 +69,7 @@ class RandomDirection2dParameters : public Object
  private:
   friend class RandomDirection2dMobilityModel;
 
-  static Ptr<RandomDirection2dParameters> GetCurrent (void);
+  static Ptr<RandomDirection2dMobilityModelParameters> GetCurrent (void);
 
   Rectangle m_bounds;
   RandomVariable *m_speedVariable;
@@ -98,7 +98,7 @@ class RandomDirection2dMobilityModel : public MobilityModel
    * \param parameters the parameters which control the behavior of the model.
    * Create a RandomDirection model using the parameters specified.
    */
-  RandomDirection2dMobilityModel (Ptr<RandomDirection2dParameters> parameters);
+  RandomDirection2dMobilityModel (Ptr<RandomDirection2dMobilityModelParameters> parameters);
  private:
   void Start (void);
   void ResetDirectionAndSpeed (void);
@@ -110,7 +110,7 @@ class RandomDirection2dMobilityModel : public MobilityModel
   virtual Speed DoGetSpeed (void) const;
 
   static const double PI;
-  Ptr<RandomDirection2dParameters> m_parameters;
+  Ptr<RandomDirection2dMobilityModelParameters> m_parameters;
   EventId m_event;
   StaticSpeedHelper m_helper;
 };