--- a/src/devices/wifi/jakes-propagation-loss-model.cc Fri Jan 09 09:13:02 2009 +0100
+++ b/src/devices/wifi/jakes-propagation-loss-model.cc Fri Jan 09 09:39:42 2009 +0100
@@ -207,9 +207,10 @@
m_nOscillators = nOscillators;
}
-double
-JakesPropagationLossModel::DoGetLoss (Ptr<MobilityModel> a,
- Ptr<MobilityModel> b) const
+double
+JakesPropagationLossModel::DoCalcRxPower (double txPowerDbm,
+ Ptr<MobilityModel> a,
+ Ptr<MobilityModel> b) const
{
PathsList::iterator i = m_paths.end ();
while (i != m_paths.begin ())
@@ -227,12 +228,12 @@
{
ps->receivers.erase (r);
ps->receivers.push_back (pc);
- return pc->GetLoss ();
+ return txPowerDbm + pc->GetLoss ();
}
}
PathCoefficients *pc = new PathCoefficients (this, b, m_nRays, m_nOscillators);
ps->receivers.push_back (pc);
- return pc->GetLoss ();
+ return txPowerDbm + pc->GetLoss ();
}
}
PathsSet *ps = new PathsSet;
@@ -240,7 +241,7 @@
PathCoefficients *pc = new PathCoefficients (this, b, m_nRays, m_nOscillators);
ps->receivers.push_back (pc);
m_paths.push_back (ps);
- return pc->GetLoss ();
+ return txPowerDbm + pc->GetLoss ();
}
} // namespace ns3