F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

RandomRectangleTopology -> RandomTopology

Browse Source
This commit is contained in:
Mathieu Lacage
2007-07-18 10:53:53 +02:00
parent 2bd88ed300
commit a011792fb6
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@@ -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',

14
src/node/random-rectangle-topology.cc → src/node/random-topology.cc
View File

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

16
src/node/random-rectangle-topology.h → src/node/random-topology.h
View File

@@ -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 */