--- a/src/mobility/examples/main-random-topology.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/examples/main-random-topology.cc Fri May 13 14:56:37 2011 -0400
@@ -31,12 +31,12 @@
mobility.Install (c);
Config::Connect ("/NodeList/*/$ns3::MobilityModel/CourseChange",
- MakeCallback (&CourseChange));
-
+ MakeCallback (&CourseChange));
+
Simulator::Stop (Seconds (100.0));
Simulator::Run ();
-
+
Simulator::Destroy ();
return 0;
}
--- a/src/mobility/examples/main-random-walk.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/examples/main-random-walk.cc Fri May 13 14:56:37 2011 -0400
@@ -45,7 +45,7 @@
Simulator::Stop (Seconds (100.0));
Simulator::Run ();
-
+
Simulator::Destroy ();
return 0;
}
--- a/src/mobility/helper/mobility-helper.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/helper/mobility-helper.cc Fri May 13 14:56:37 2011 -0400
@@ -35,19 +35,20 @@
MobilityHelper::MobilityHelper ()
{
m_position = CreateObjectWithAttributes<RandomRectanglePositionAllocator>
- ("X", RandomVariableValue (ConstantVariable (0.0)),
- "Y", RandomVariableValue (ConstantVariable (0.0)));
+ ("X", RandomVariableValue (ConstantVariable (0.0)),
+ "Y", RandomVariableValue (ConstantVariable (0.0)));
m_mobility.SetTypeId ("ns3::ConstantPositionMobilityModel");
}
MobilityHelper::~MobilityHelper ()
-{}
-void
+{
+}
+void
MobilityHelper::SetPositionAllocator (Ptr<PositionAllocator> allocator)
{
m_position = allocator;
}
-void
+void
MobilityHelper::SetPositionAllocator (std::string type,
std::string n1, const AttributeValue &v1,
std::string n2, const AttributeValue &v2,
@@ -148,7 +149,7 @@
Ptr<MobilityModel> parent = m_mobilityStack.back ();
Ptr<MobilityModel> hierarchical =
CreateObjectWithAttributes<HierarchicalMobilityModel> ("Child", PointerValue (model),
- "Parent", PointerValue (parent));
+ "Parent", PointerValue (parent));
object->AggregateObject (hierarchical);
NS_LOG_DEBUG ("node="<<object<<", mob="<<hierarchical);
}
--- a/src/mobility/helper/ns2-mobility-helper.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/helper/ns2-mobility-helper.cc Fri May 13 14:56:37 2011 -0400
@@ -188,7 +188,7 @@
iNodeId = GetNodeIdInt (pr);
if (iNodeId == -1)
{
- NS_LOG_ERROR ("Node number couldn't be obtained (corrupted file?): " << line << "\n");
+ NS_LOG_ERROR ("Node number couldn't be obtained (corrupted file?): " << line << "\n");
continue;
}
--- a/src/mobility/helper/ns2-mobility-helper.h Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/helper/ns2-mobility-helper.h Fri May 13 14:56:37 2011 -0400
@@ -54,7 +54,7 @@
* - BonnMotion http://net.cs.uni-bonn.de/wg/cs/applications/bonnmotion/
* - SUMO http://sourceforge.net/apps/mediawiki/sumo/index.php?title=Main_Page
* - TraNS http://trans.epfl.ch/
- *
+ *
* See usage example in examples/mobility/ns2-mobility-trace.cc
*/
class Ns2MobilityHelper
@@ -90,7 +90,7 @@
private:
class ObjectStore
{
- public:
+public:
virtual ~ObjectStore () {}
virtual Ptr<Object> Get (uint32_t i) const = 0;
};
@@ -109,11 +109,11 @@
{
class MyObjectStore : public ObjectStore
{
- public:
+public:
MyObjectStore (T begin, T end)
: m_begin (begin),
- m_end (end)
- {}
+ m_end (end)
+ {}
virtual Ptr<Object> Get (uint32_t i) const {
T iterator = m_begin;
iterator += i;
@@ -123,7 +123,7 @@
}
return *iterator;
}
- private:
+private:
T m_begin;
T m_end;
};
--- a/src/mobility/model/box.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/box.cc Fri May 13 14:56:37 2011 -0400
@@ -37,7 +37,8 @@
yMax (_yMax),
zMin (_zMin),
zMax (_zMax)
-{}
+{
+}
Box::Box ()
: xMin (0.0),
@@ -46,18 +47,19 @@
yMax (0.0),
zMin (0.0),
zMax (0.0)
-{}
+{
+}
-bool
+bool
Box::IsInside (const Vector &position) const
{
- return
+ return
position.x <= this->xMax && position.x >= this->xMin &&
position.y <= this->yMax && position.y >= this->yMin &&
position.z <= this->zMax && position.z >= this->zMin;
}
-Box::Side
+Box::Side
Box::GetClosestSide (const Vector &position) const
{
double xMinDist = std::abs (position.x - this->xMin);
@@ -151,7 +153,7 @@
}
std::istream &
operator >> (std::istream &is, Box &box)
- {
+{
char c1, c2, c3, c4, c5;
is >> box.xMin >> c1 >> box.xMax >> c2 >> box.yMin >> c3 >> box.yMax >> c4 >> box.zMin >> c5 >> box.zMax;
if (c1 != '|' ||
--- a/src/mobility/model/constant-acceleration-mobility-model.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/constant-acceleration-mobility-model.cc Fri May 13 14:56:37 2011 -0400
@@ -31,10 +31,12 @@
}
ConstantAccelerationMobilityModel::ConstantAccelerationMobilityModel ()
-{}
+{
+}
ConstantAccelerationMobilityModel::~ConstantAccelerationMobilityModel ()
-{}
+{
+}
inline Vector
ConstantAccelerationMobilityModel::DoGetVelocity (void) const
--- a/src/mobility/model/constant-position-mobility-model.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/constant-position-mobility-model.cc Fri May 13 14:56:37 2011 -0400
@@ -29,21 +29,23 @@
static TypeId tid = TypeId ("ns3::ConstantPositionMobilityModel")
.SetParent<MobilityModel> ()
.AddConstructor<ConstantPositionMobilityModel> ()
- ;
+ ;
return tid;
}
-
+
ConstantPositionMobilityModel::ConstantPositionMobilityModel ()
-{}
+{
+}
ConstantPositionMobilityModel::~ConstantPositionMobilityModel ()
-{}
+{
+}
Vector
ConstantPositionMobilityModel::DoGetPosition (void) const
{
return m_position;
}
-void
+void
ConstantPositionMobilityModel::DoSetPosition (const Vector &position)
{
m_position = position;
--- a/src/mobility/model/constant-velocity-helper.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/constant-velocity-helper.cc Fri May 13 14:56:37 2011 -0400
@@ -26,18 +26,21 @@
ConstantVelocityHelper::ConstantVelocityHelper ()
: m_paused (true)
-{}
+{
+}
ConstantVelocityHelper::ConstantVelocityHelper (const Vector &position)
: m_position (position),
m_paused (true)
-{}
+{
+}
ConstantVelocityHelper::ConstantVelocityHelper (const Vector &position,
- const Vector &vel)
+ const Vector &vel)
: m_position (position),
m_velocity (vel),
m_paused (true)
-{}
-void
+{
+}
+void
ConstantVelocityHelper::SetPosition (const Vector &position)
{
m_position = position;
@@ -54,7 +57,7 @@
Vector
ConstantVelocityHelper::GetVelocity (void) const
{
- return m_paused? Vector (0.0, 0.0, 0.0) : m_velocity;
+ return m_paused ? Vector (0.0, 0.0, 0.0) : m_velocity;
}
void
ConstantVelocityHelper::SetVelocity (const Vector &vel)
--- a/src/mobility/model/constant-velocity-helper.h Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/constant-velocity-helper.h Fri May 13 14:56:37 2011 -0400
@@ -35,11 +35,11 @@
*/
class ConstantVelocityHelper
{
- public:
+public:
ConstantVelocityHelper ();
ConstantVelocityHelper (const Vector &position);
ConstantVelocityHelper (const Vector &position,
- const Vector &vel);
+ const Vector &vel);
void SetPosition (const Vector &position);
Vector GetCurrentPosition (void) const;
@@ -51,7 +51,7 @@
void UpdateWithBounds (const Rectangle &rectangle) const;
void UpdateWithBounds (const Box &bounds) const;
void Update (void) const;
- private:
+private:
mutable Time m_lastUpdate;
mutable Vector m_position;
Vector m_velocity;
--- a/src/mobility/model/constant-velocity-mobility-model.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/constant-velocity-mobility-model.cc Fri May 13 14:56:37 2011 -0400
@@ -33,12 +33,14 @@
}
ConstantVelocityMobilityModel::ConstantVelocityMobilityModel ()
-{}
+{
+}
ConstantVelocityMobilityModel::~ConstantVelocityMobilityModel ()
-{}
+{
+}
-void
+void
ConstantVelocityMobilityModel::SetVelocity (const Vector &speed)
{
m_helper.Update ();
--- a/src/mobility/model/gauss-markov-mobility-model.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/gauss-markov-mobility-model.cc Fri May 13 14:56:37 2011 -0400
@@ -53,17 +53,17 @@
MakeDoubleChecker<double> ())
.AddAttribute ("MeanVelocity",
"A random variable used to assign the average velocity.",
- RandomVariableValue (UniformVariable (0.0, 1.0)),
+ RandomVariableValue (UniformVariable (0.0, 1.0)),
MakeRandomVariableAccessor (&GaussMarkovMobilityModel::m_rndMeanVelocity),
MakeRandomVariableChecker ())
.AddAttribute ("MeanDirection",
"A random variable used to assign the average direction.",
- RandomVariableValue (UniformVariable (0.0, 6.283185307)),
+ RandomVariableValue (UniformVariable (0.0, 6.283185307)),
MakeRandomVariableAccessor (&GaussMarkovMobilityModel::m_rndMeanDirection),
MakeRandomVariableChecker ())
.AddAttribute ("MeanPitch",
"A random variable used to assign the average pitch.",
- RandomVariableValue (ConstantVariable (0.0)),
+ RandomVariableValue (ConstantVariable (0.0)),
MakeRandomVariableAccessor (&GaussMarkovMobilityModel::m_rndMeanPitch),
MakeRandomVariableChecker ())
.AddAttribute ("NormalVelocity",
@@ -81,7 +81,7 @@
RandomVariableValue (NormalVariable (0.0, 1.0, 10.0)),
MakeRandomVariableAccessor (&GaussMarkovMobilityModel::m_normalPitch),
MakeRandomVariableChecker ());
-
+
return tid;
}
@@ -122,7 +122,7 @@
double rp = m_normalPitch.GetValue ();
//Calculate the NEW velocity, direction, and pitch values using the Gauss-Markov formula:
- //newVal = alpha*oldVal + (1-alpha)*meanVal + sqrt(1-alpha^2)*rv
+ //newVal = alpha*oldVal + (1-alpha)*meanVal + sqrt(1-alpha^2)*rv
//where rv is a random number from a normal (gaussian) distribution
double one_minus_alpha = 1 - m_alpha;
double sqrt_alpha = std::sqrt (1 - m_alpha*m_alpha);
@@ -167,20 +167,20 @@
{
if (nextPosition.x > m_bounds.xMax || nextPosition.x < m_bounds.xMin)
{
- speed.x = - speed.x;
+ speed.x = -speed.x;
m_meanDirection = 3.14159265 - m_meanDirection;
}
if (nextPosition.y > m_bounds.yMax || nextPosition.y < m_bounds.yMin)
{
- speed.y = - speed.y;
- m_meanDirection = - m_meanDirection;
+ speed.y = -speed.y;
+ m_meanDirection = -m_meanDirection;
}
if (nextPosition.z > m_bounds.zMax || nextPosition.z < m_bounds.zMin)
{
- speed.z = - speed.z;
- m_meanPitch = - m_meanPitch;
+ speed.z = -speed.z;
+ m_meanPitch = -m_meanPitch;
}
m_Direction = m_meanDirection;
--- a/src/mobility/model/gauss-markov-mobility-model.h Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/gauss-markov-mobility-model.h Fri May 13 14:56:37 2011 -0400
@@ -54,7 +54,7 @@
* Here is an example of how to implement the model and set the initial node positions:
* \code
MobilityHelper mobility;
-
+
mobility.SetMobilityModel ("ns3::GaussMarkovMobilityModel",
"Bounds", BoxValue (Box (0, 150000, 0, 150000, 0, 10000)),
"TimeStep", TimeValue (Seconds (0.5)),
@@ -65,7 +65,7 @@
"NormalVelocity", RandomVariableValue (NormalVariable (0.0, 0.0, 0.0)),
"NormalDirection", RandomVariableValue (NormalVariable (0.0, 0.2, 0.4)),
"NormalPitch", RandomVariableValue (NormalVariable (0.0, 0.02, 0.04)));
-
+
mobility.SetPositionAllocator ("ns3::RandomBoxPositionAllocator",
"X", RandomVariableValue (UniformVariable (0, 150000)),
"Y", RandomVariableValue (UniformVariable (0, 150000)),
--- a/src/mobility/model/hierarchical-mobility-model.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/hierarchical-mobility-model.cc Fri May 13 14:56:37 2011 -0400
@@ -40,16 +40,17 @@
MakePointerAccessor (&HierarchicalMobilityModel::SetParent,
&HierarchicalMobilityModel::GetParent),
MakePointerChecker<MobilityModel> ())
- ;
+ ;
return tid;
}
HierarchicalMobilityModel::HierarchicalMobilityModel ()
: m_child (0),
m_parent (0)
-{}
+{
+}
-void
+void
HierarchicalMobilityModel::SetChild (Ptr<MobilityModel> model)
{
Ptr<MobilityModel> oldChild = m_child;
@@ -117,8 +118,8 @@
Vector parentPosition = m_parent->GetPosition ();
Vector childPosition = m_child->GetPosition ();
return Vector (parentPosition.x + childPosition.x,
- parentPosition.y + childPosition.y,
- parentPosition.z + childPosition.z);
+ parentPosition.y + childPosition.y,
+ parentPosition.z + childPosition.z);
}
void
HierarchicalMobilityModel::DoSetPosition (const Vector &position)
--- a/src/mobility/model/hierarchical-mobility-model.h Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/hierarchical-mobility-model.h Fri May 13 14:56:37 2011 -0400
@@ -92,7 +92,7 @@
* \param model new mobility model parent
*/
void SetParent (Ptr<MobilityModel> model);
-
+
private:
virtual Vector DoGetPosition (void) const;
virtual void DoSetPosition (const Vector &position);
--- a/src/mobility/model/mobility-model.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/mobility-model.cc Fri May 13 14:56:37 2011 -0400
@@ -36,7 +36,7 @@
TypeId::ATTR_SET | TypeId::ATTR_GET,
VectorValue (Vector (0.0, 0.0, 0.0)),
MakeVectorAccessor (&MobilityModel::SetPosition,
- &MobilityModel::GetPosition),
+ &MobilityModel::GetPosition),
MakeVectorChecker ())
.AddAttribute ("Velocity", "The current velocity of the mobility model.",
TypeId::ATTR_GET,
@@ -46,15 +46,17 @@
.AddTraceSource ("CourseChange",
"The value of the position and/or velocity vector changed",
MakeTraceSourceAccessor (&MobilityModel::m_courseChangeTrace))
- ;
+ ;
return tid;
}
MobilityModel::MobilityModel ()
-{}
+{
+}
MobilityModel::~MobilityModel ()
-{}
+{
+}
Vector
MobilityModel::GetPosition (void) const
--- a/src/mobility/model/position-allocator.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/position-allocator.cc Fri May 13 14:56:37 2011 -0400
@@ -44,33 +44,35 @@
}
PositionAllocator::~PositionAllocator ()
-{}
+{
+}
NS_OBJECT_ENSURE_REGISTERED (ListPositionAllocator);
-TypeId
+TypeId
ListPositionAllocator::GetTypeId (void)
{
static TypeId tid = TypeId ("ns3::ListPositionAllocator")
.SetParent<PositionAllocator> ()
.AddConstructor<ListPositionAllocator> ()
- ;
+ ;
return tid;
}
ListPositionAllocator::ListPositionAllocator ()
-{}
-void
+{
+}
+void
ListPositionAllocator::Add (Vector v)
{
m_positions.push_back (v);
m_current = m_positions.begin ();
}
-Vector
+Vector
ListPositionAllocator::GetNext (void) const
{
Vector v = *m_current;
m_current++;
- if (m_current == m_positions.end())
+ if (m_current == m_positions.end())
{
m_current = m_positions.begin ();
}
@@ -111,89 +113,90 @@
MakeEnumAccessor (&GridPositionAllocator::m_layoutType),
MakeEnumChecker (ROW_FIRST, "RowFirst",
COLUMN_FIRST, "ColumnFirst"))
- ;
+ ;
return tid;
}
GridPositionAllocator::GridPositionAllocator ()
: m_current (0)
-{}
+{
+}
-void
+void
GridPositionAllocator::SetMinX (double xMin)
{
m_xMin = xMin;
}
-void
+void
GridPositionAllocator::SetMinY (double yMin)
{
m_yMin = yMin;
}
-void
+void
GridPositionAllocator::SetDeltaX (double deltaX)
{
m_deltaX = deltaX;
}
-void
+void
GridPositionAllocator::SetDeltaY (double deltaY)
{
m_deltaY = deltaY;
}
-void
+void
GridPositionAllocator::SetN (uint32_t n)
{
m_n = n;
}
-void
+void
GridPositionAllocator::SetLayoutType (enum LayoutType layoutType)
{
m_layoutType = layoutType;
}
-double
+double
GridPositionAllocator::GetMinX (void) const
{
return m_xMin;
}
-double
+double
GridPositionAllocator::GetMinY (void) const
{
return m_yMin;
}
-double
+double
GridPositionAllocator::GetDeltaX (void) const
{
return m_deltaX;
}
-double
+double
GridPositionAllocator::GetDeltaY (void) const
{
return m_deltaY;
}
-uint32_t
+uint32_t
GridPositionAllocator::GetN (void) const
{
return m_n;
}
-enum GridPositionAllocator::LayoutType
+enum GridPositionAllocator::LayoutType
GridPositionAllocator::GetLayoutType (void) const
{
return m_layoutType;
}
-Vector
+Vector
GridPositionAllocator::GetNext (void) const
{
double x = 0.0, y = 0.0;
switch (m_layoutType) {
- case ROW_FIRST:
- x = m_xMin + m_deltaX * (m_current % m_n);
- y = m_yMin + m_deltaY * (m_current / m_n);
- break;
- case COLUMN_FIRST:
- x = m_xMin + m_deltaX * (m_current / m_n);
- y = m_yMin + m_deltaY * (m_current % m_n);
- break;
- }
+ case ROW_FIRST:
+ x = m_xMin + m_deltaX * (m_current % m_n);
+ y = m_yMin + m_deltaY * (m_current / m_n);
+ break;
+ case COLUMN_FIRST:
+ x = m_xMin + m_deltaX * (m_current / m_n);
+ y = m_yMin + m_deltaY * (m_current % m_n);
+ break;
+ }
m_current++;
return Vector (x, y, 0.0);
}
@@ -222,16 +225,18 @@
}
RandomRectanglePositionAllocator::RandomRectanglePositionAllocator ()
-{}
+{
+}
RandomRectanglePositionAllocator::~RandomRectanglePositionAllocator ()
-{}
+{
+}
-void
+void
RandomRectanglePositionAllocator::SetX (RandomVariable x)
{
m_x = x;
}
-void
+void
RandomRectanglePositionAllocator::SetY (RandomVariable y)
{
m_y = y;
@@ -274,21 +279,23 @@
}
RandomBoxPositionAllocator::RandomBoxPositionAllocator ()
-{}
+{
+}
RandomBoxPositionAllocator::~RandomBoxPositionAllocator ()
-{}
+{
+}
-void
+void
RandomBoxPositionAllocator::SetX (RandomVariable x)
{
m_x = x;
}
-void
+void
RandomBoxPositionAllocator::SetY (RandomVariable y)
{
m_y = y;
}
-void
+void
RandomBoxPositionAllocator::SetZ (RandomVariable z)
{
m_z = z;
@@ -334,31 +341,33 @@
DoubleValue (0.0),
MakeDoubleAccessor (&RandomDiscPositionAllocator::m_y),
MakeDoubleChecker<double> ())
- ;
+ ;
return tid;
-}
+}
RandomDiscPositionAllocator::RandomDiscPositionAllocator ()
-{}
+{
+}
RandomDiscPositionAllocator::~RandomDiscPositionAllocator ()
-{}
+{
+}
-void
+void
RandomDiscPositionAllocator::SetTheta (RandomVariable theta)
{
m_theta = theta;
}
-void
+void
RandomDiscPositionAllocator::SetRho (RandomVariable rho)
{
m_rho = rho;
}
-void
+void
RandomDiscPositionAllocator::SetX (double x)
{
m_x = x;
}
-void
+void
RandomDiscPositionAllocator::SetY (double y)
{
m_y = y;
@@ -400,26 +409,28 @@
DoubleValue (0.0),
MakeDoubleAccessor (&UniformDiscPositionAllocator::m_y),
MakeDoubleChecker<double> ())
- ;
+ ;
return tid;
-}
+}
UniformDiscPositionAllocator::UniformDiscPositionAllocator ()
-{}
+{
+}
UniformDiscPositionAllocator::~UniformDiscPositionAllocator ()
-{}
+{
+}
-void
+void
UniformDiscPositionAllocator::SetRho (double rho)
{
m_rho = rho;
}
-void
+void
UniformDiscPositionAllocator::SetX (double x)
{
m_x = x;
}
-void
+void
UniformDiscPositionAllocator::SetY (double y)
{
m_y = y;
@@ -435,7 +446,7 @@
y = r.GetValue ();
}
while (sqrt(x*x + y*y) > m_rho);
-
+
x += m_x;
y += m_y;
NS_LOG_DEBUG ("Disc position x=" << x << ", y=" << y);
--- a/src/mobility/model/position-allocator.h Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/position-allocator.h Fri May 13 14:56:37 2011 -0400
@@ -148,7 +148,7 @@
* \return the currently-selected layout type.
*/
enum LayoutType GetLayoutType (void) const;
-
+
virtual Vector GetNext (void) const;
private:
--- a/src/mobility/model/random-direction-2d-mobility-model.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/random-direction-2d-mobility-model.cc Fri May 13 14:56:37 2011 -0400
@@ -51,7 +51,7 @@
RandomVariableValue (ConstantVariable (2.0)),
MakeRandomVariableAccessor (&RandomDirection2dMobilityModel::m_pause),
MakeRandomVariableChecker ())
- ;
+ ;
return tid;
}
@@ -102,14 +102,14 @@
Time delay = Seconds (CalculateDistance (position, next) / speed);
m_event.Cancel ();
m_event = Simulator::Schedule (delay,
- &RandomDirection2dMobilityModel::BeginPause, this);
+ &RandomDirection2dMobilityModel::BeginPause, this);
NotifyCourseChange ();
}
void
RandomDirection2dMobilityModel::ResetDirectionAndSpeed (void)
{
double direction = m_direction.GetValue (0, PI);
-
+
m_helper.UpdateWithBounds (m_bounds);
Vector position = m_helper.GetCurrentPosition ();
switch (m_bounds.GetClosestSide (position))
@@ -118,7 +118,7 @@
direction += PI / 2;
break;
case Rectangle::LEFT:
- direction += - PI / 2;
+ direction += -PI / 2;
break;
case Rectangle::TOP:
direction += PI;
--- a/src/mobility/model/random-direction-2d-mobility-model.h Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/random-direction-2d-mobility-model.h Fri May 13 14:56:37 2011 -0400
@@ -43,10 +43,10 @@
*/
class RandomDirection2dMobilityModel : public MobilityModel
{
- public:
+public:
static TypeId GetTypeId (void);
- private:
+private:
void ResetDirectionAndSpeed (void);
void BeginPause (void);
void SetDirectionAndSpeed (double direction);
--- a/src/mobility/model/random-walk-2d-mobility-model.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/random-walk-2d-mobility-model.cc Fri May 13 14:56:37 2011 -0400
@@ -121,8 +121,8 @@
nextPosition = m_bounds.CalculateIntersection (position, speed);
Time delay = Seconds ((nextPosition.x - position.x) / speed.x);
m_event = Simulator::Schedule (delay, &RandomWalk2dMobilityModel::Rebound, this,
- delayLeft - delay);
- }
+ delayLeft - delay);
+ }
NotifyCourseChange ();
}
@@ -136,11 +136,11 @@
{
case Rectangle::RIGHT:
case Rectangle::LEFT:
- speed.x = - speed.x;
+ speed.x = -speed.x;
break;
case Rectangle::TOP:
case Rectangle::BOTTOM:
- speed.y = - speed.y;
+ speed.y = -speed.y;
break;
}
m_helper.SetVelocity (speed);
--- a/src/mobility/model/random-walk-2d-mobility-model.h Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/random-walk-2d-mobility-model.h Fri May 13 14:56:37 2011 -0400
@@ -45,7 +45,7 @@
*/
class RandomWalk2dMobilityModel : public MobilityModel
{
- public:
+public:
static TypeId GetTypeId (void);
enum Mode {
@@ -53,7 +53,7 @@
MODE_TIME
};
- private:
+private:
void Rebound (Time timeLeft);
void DoWalk (Time timeLeft);
void DoStartPrivate (void);
--- a/src/mobility/model/random-waypoint-mobility-model.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/random-waypoint-mobility-model.cc Fri May 13 14:56:37 2011 -0400
@@ -50,7 +50,7 @@
PointerValue (),
MakePointerAccessor (&RandomWaypointMobilityModel::m_position),
MakePointerChecker<PositionAllocator> ());
-
+
return tid;
}
@@ -71,7 +71,7 @@
Time travelDelay = Seconds (CalculateDistance (destination, m_current) / speed);
m_event.Cancel ();
m_event = Simulator::Schedule (travelDelay,
- &RandomWaypointMobilityModel::DoStartPrivate, this);
+ &RandomWaypointMobilityModel::DoStartPrivate, this);
NotifyCourseChange ();
}
--- a/src/mobility/model/rectangle.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/rectangle.cc Fri May 13 14:56:37 2011 -0400
@@ -28,29 +28,31 @@
namespace ns3 {
Rectangle::Rectangle (double _xMin, double _xMax,
- double _yMin, double _yMax)
+ double _yMin, double _yMax)
: xMin (_xMin),
xMax (_xMax),
yMin (_yMin),
yMax (_yMax)
-{}
+{
+}
Rectangle::Rectangle ()
: xMin (0.0),
xMax (0.0),
yMin (0.0),
yMax (0.0)
-{}
+{
+}
-bool
+bool
Rectangle::IsInside (const Vector &position) const
{
- return
+ return
position.x <= this->xMax && position.x >= this->xMin &&
position.y <= this->yMax && position.y >= this->yMin;
}
-Rectangle::Side
+Rectangle::Side
Rectangle::GetClosestSide (const Vector &position) const
{
double xMinDist = std::abs (position.x - this->xMin);
@@ -130,7 +132,7 @@
}
std::istream &
operator >> (std::istream &is, Rectangle &rectangle)
- {
+{
char c1, c2, c3;
is >> rectangle.xMin >> c1 >> rectangle.xMax >> c2 >> rectangle.yMin >> c3 >> rectangle.yMax;
if (c1 != '|' ||
--- a/src/mobility/model/steady-state-random-waypoint-mobility-model.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/steady-state-random-waypoint-mobility-model.cc Fri May 13 14:56:37 2011 -0400
@@ -74,11 +74,11 @@
DoubleValue (1),
MakeDoubleAccessor (&SteadyStateRandomWaypointMobilityModel::m_maxY),
MakeDoubleChecker<double> ());
-
+
return tid;
}
-SteadyStateRandomWaypointMobilityModel::SteadyStateRandomWaypointMobilityModel ():
+SteadyStateRandomWaypointMobilityModel::SteadyStateRandomWaypointMobilityModel () :
alreadyStarted (false)
{
}
@@ -104,10 +104,10 @@
m_position->SetY (UniformVariable (m_minY, m_maxY));
NS_ASSERT (m_minPause <= m_maxPause);
m_pause = UniformVariable (m_minPause, m_maxPause);
-
+
m_helper.Update ();
m_helper.Pause ();
-
+
// calculate the steady-state probability that a node is initially paused
double expectedPauseTime = (m_minPause + m_maxPause)/2;
double a = m_maxX - m_minX;
@@ -118,7 +118,7 @@
double log2 = a*a / b*std::log (std::sqrt ((b*b)/(a*a) + 1) + b/a);
double expectedTravelTime = 1.0/6.0*(log1 + log2);
expectedTravelTime += 1.0/15.0*((a*a*a)/(b*b) + (b*b*b)/(a*a)) -
- 1.0/15.0*std::sqrt(a*a + b*b)*((a*a)/(b*b) + (b*b)/(a*a) - 3);
+ 1.0/15.0*std::sqrt(a*a + b*b)*((a*a)/(b*b) + (b*b)/(a*a) - 3);
if (v0 == v1)
{
expectedTravelTime /= v0;
@@ -129,14 +129,14 @@
}
double probabilityPaused = expectedPauseTime/(expectedPauseTime + expectedTravelTime);
NS_ASSERT (probabilityPaused >= 0 && probabilityPaused <= 1);
-
+
UniformVariable u_r;
double u = u_r.GetValue(0, 1);
if (u < probabilityPaused) // node initially paused
{
m_helper.SetPosition (m_position->GetNext ());
u = u_r.GetValue(0, 1);
- Time pause;
+ Time pause;
if (m_minPause != m_maxPause)
{
if (u < (2*m_minPause/(m_minPause + m_maxPause)))
@@ -177,7 +177,7 @@
m_helper.SetPosition (Vector (m_minX + u2*x1 + (1 - u2)*x2, m_minY + u2*y1 + (1 - u2)*y2, 0));
NS_ASSERT (!m_event.IsRunning());
m_event = Simulator::ScheduleNow (&SteadyStateRandomWaypointMobilityModel::SteadyStateBeginWalk, this,
- Vector (m_minX + x2, m_minY + y2, 0));
+ Vector (m_minX + x2, m_minY + y2, 0));
}
NotifyCourseChange ();
}
@@ -225,7 +225,7 @@
m_helper.Unpause ();
Time travelDelay = Seconds (CalculateDistance (destination, m_current) / speed);
m_event = Simulator::Schedule (travelDelay,
- &SteadyStateRandomWaypointMobilityModel::Start, this);
+ &SteadyStateRandomWaypointMobilityModel::Start, this);
NotifyCourseChange ();
}
--- a/src/mobility/model/waypoint-mobility-model.h Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/waypoint-mobility-model.h Fri May 13 14:56:37 2011 -0400
@@ -55,7 +55,7 @@
*
* The model has two attributes with methods that allow clients to get
* the next waypoint value (NextWaypoint) and the number of waypoints left
- * (WaypointsLeft) beyond (but not including) the next waypoint.
+ * (WaypointsLeft) beyond (but not including) the next waypoint.
*
* In addition, there are two attributes that govern model behavior. The
* first, LazyNotify, governs how the model calls the CourseChange trace.
--- a/src/mobility/model/waypoint.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/model/waypoint.cc Fri May 13 14:56:37 2011 -0400
@@ -25,12 +25,14 @@
Waypoint::Waypoint (const Time &waypointTime, const Vector &waypointPosition)
: time (waypointTime),
- position (waypointPosition)
-{}
+ position (waypointPosition)
+{
+}
Waypoint::Waypoint ()
: time (Seconds (0.0)),
position (0,0,0)
-{}
+{
+}
std::ostream &operator << (std::ostream &os, const Waypoint &waypoint)
{
--- a/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc Fri May 13 14:56:17 2011 -0400
+++ b/src/mobility/test/steady-state-random-waypoint-mobility-model-test.cc Fri May 13 14:56:37 2011 -0400
@@ -73,8 +73,8 @@
Simulator::Schedule (Seconds (0.0), &Object::Start, model);
}
- Simulator::Schedule (Seconds (0.001), & SteadyStateRandomWaypointTest::DistribCompare, this);
- Simulator::Schedule (Seconds (totalTime), & SteadyStateRandomWaypointTest::DistribCompare, this);
+ Simulator::Schedule (Seconds (0.001), &SteadyStateRandomWaypointTest::DistribCompare, this);
+ Simulator::Schedule (Seconds (totalTime), &SteadyStateRandomWaypointTest::DistribCompare, this);
Simulator::Stop (Seconds (totalTime));
Simulator::Run ();
Simulator::Destroy ();