--- a/samples/main-adhoc-wifi.cc Thu Nov 15 10:18:17 2007 +0100
+++ b/samples/main-adhoc-wifi.cc Thu Nov 15 10:22:35 2007 +0100
@@ -46,13 +46,13 @@
static Ptr<Node>
CreateAdhocNode (Ptr<WifiChannel> channel,
- Position position, const char *address)
+ Vector position, const char *address)
{
Ptr<Node> node = Create<InternetNode> ();
Ptr<AdhocWifiNetDevice> device = Create<AdhocWifiNetDevice> (node);
device->ConnectTo (channel);
Ptr<MobilityModel> mobility = Create<StaticMobilityModel> ();
- mobility->Set (position);
+ mobility->SetPosition (position);
node->AddInterface (mobility);
Ptr<Ipv4> ipv4 = node->QueryInterface<Ipv4> (Ipv4::iid);
@@ -64,23 +64,23 @@
}
static void
-SetPosition (Ptr<Node> node, Position position)
+SetPosition (Ptr<Node> node, Vector position)
{
Ptr<MobilityModel> mobility = node->QueryInterface<MobilityModel> (MobilityModel::iid);
- mobility->Set (position);
+ mobility->SetPosition (position);
}
-static Position
+static Vector
GetPosition (Ptr<Node> node)
{
Ptr<MobilityModel> mobility = node->QueryInterface<MobilityModel> (MobilityModel::iid);
- return mobility->Get ();
+ return mobility->GetPosition ();
}
static void
AdvancePosition (Ptr<Node> node)
{
- Position pos = GetPosition (node);
+ Vector pos = GetPosition (node);
double mbs = ((g_bytesTotal * 8.0) / 1000000);
g_bytesTotal = 0;
g_output->Add (pos.x, mbs);
@@ -119,10 +119,10 @@
Ptr<WifiChannel> channel = Create<WifiChannel> ();
Ptr<Node> a = CreateAdhocNode (channel,
- Position (5.0,0.0,0.0),
+ Vector (5.0,0.0,0.0),
"192.168.0.1");
Ptr<Node> b = CreateAdhocNode (channel,
- Position (0.0, 0.0, 0.0),
+ Vector (0.0, 0.0, 0.0),
"192.168.0.2");
Ptr<Application> app = Create<OnOffApplication> (a, InetSocketAddress ("192.168.0.2", 10),
--- a/samples/main-ap-wifi.cc Thu Nov 15 10:18:17 2007 +0100
+++ b/samples/main-ap-wifi.cc Thu Nov 15 10:22:35 2007 +0100
@@ -69,7 +69,7 @@
static Ptr<Node>
CreateApNode (Ptr<WifiChannel> channel,
- Position position,
+ Vector position,
const char *ipAddress,
Ssid ssid,
Time at)
@@ -80,7 +80,7 @@
Simulator::Schedule (at, &NqapWifiNetDevice::StartBeaconing, device);
device->ConnectTo (channel);
Ptr<MobilityModel> mobility = Create<StaticMobilityModel> ();
- mobility->Set (position);
+ mobility->SetPosition (position);
node->AddInterface (mobility);
Ptr<Ipv4> ipv4 = node->QueryInterface<Ipv4> (Ipv4::iid);
@@ -93,7 +93,7 @@
static Ptr<Node>
CreateStaNode (Ptr<WifiChannel> channel,
- Position position,
+ Vector position,
const char *ipAddress,
Ssid ssid)
{
@@ -103,7 +103,7 @@
ssid);
device->ConnectTo (channel);
Ptr<MobilityModel> mobility = Create<StaticMobilityModel> ();
- mobility->Set (position);
+ mobility->SetPosition (position);
node->AddInterface (mobility);
Ptr<Ipv4> ipv4 = node->QueryInterface<Ipv4> (Ipv4::iid);
@@ -115,23 +115,23 @@
}
static void
-SetPosition (Ptr<Node> node, Position position)
+SetPosition (Ptr<Node> node, Vector position)
{
Ptr<MobilityModel> mobility = node->QueryInterface<MobilityModel> (MobilityModel::iid);
- mobility->Set (position);
+ mobility->SetPosition (position);
}
-static Position
+static Vector
GetPosition (Ptr<Node> node)
{
Ptr<MobilityModel> mobility = node->QueryInterface<MobilityModel> (MobilityModel::iid);
- return mobility->Get ();
+ return mobility->GetPosition ();
}
static void
AdvancePosition (Ptr<Node> node)
{
- Position pos = GetPosition (node);
+ Vector pos = GetPosition (node);
pos.x += 5.0;
if (pos.x >= 210.0) {
return;
@@ -164,19 +164,19 @@
Ssid ssid = Ssid ("mathieu");
Ptr<Node> a = CreateApNode (channel,
- Position (5.0,0.0,0.0),
+ Vector (5.0,0.0,0.0),
"192.168.0.1",
ssid,
Seconds (0.1));
Simulator::Schedule (Seconds (1.0), &AdvancePosition, a);
Ptr<Node> b = CreateStaNode (channel,
- Position (0.0, 0.0, 0.0),
+ Vector (0.0, 0.0, 0.0),
"192.168.0.2",
ssid);
Ptr<Node> c = CreateStaNode (channel,
- Position (0.0, 0.0, 0.0),
+ Vector (0.0, 0.0, 0.0),
"192.168.0.3",
ssid);
--- a/samples/main-propagation-loss.cc Thu Nov 15 10:18:17 2007 +0100
+++ b/samples/main-propagation-loss.cc Thu Nov 15 10:22:35 2007 +0100
@@ -30,10 +30,10 @@
Ptr<StaticMobilityModel> b = Create<StaticMobilityModel> ();
Ptr<PropagationLossModel> model = PropagationLossModel::CreateDefault ();
- a->Set (Position (0.0, 0.0, 0.0));
+ a->SetPosition (Vector (0.0, 0.0, 0.0));
for (double x = min; x < max; x+= step)
{
- b->Set (Position (x, 0.0, 0.0));
+ b->SetPosition (Vector (x, 0.0, 0.0));
std::cout << x << " ";
for (double txpower = minTxpower; txpower < maxTxpower; txpower += stepTxpower)
{
--- a/src/devices/wifi/propagation-loss-model.cc Thu Nov 15 10:18:17 2007 +0100
+++ b/src/devices/wifi/propagation-loss-model.cc Thu Nov 15 10:22:35 2007 +0100
@@ -288,8 +288,8 @@
*
* rx = rx0(tx) - 10 * n * log (d/d0)
*/
- static Ptr<StaticMobilityModel> zero = Create<StaticMobilityModel> (Position (0.0, 0.0, 0.0));
- static Ptr<StaticMobilityModel> reference = Create<StaticMobilityModel> (Position (m_referenceDistance, 0.0, 0.0));
+ static Ptr<StaticMobilityModel> zero = Create<StaticMobilityModel> (Vector (0.0, 0.0, 0.0));
+ static Ptr<StaticMobilityModel> reference = Create<StaticMobilityModel> (Vector (m_referenceDistance, 0.0, 0.0));
double rx0 = m_reference->GetRxPower (txPowerDbm, zero, reference);
double pathLossDb = 10 * m_exponent * log10 (distance / m_referenceDistance);
double rxPowerDbm = rx0 - pathLossDb;