Attachment #1592 for bug #1421

View | Details | Raw Unified | Return to bug 1421
Collapse All | Expand All

(-)a/CHANGES.html (+8 lines)

Lines 88-93	Link Here

<li>New Tag, PacketSocketTag, to carry the dest address of a packet and the packet type</li>

<li>New Tag, PacketSocketTag, to carry the dest address of a packet and the packet type</li>

<li>New Tag, DeviceNameTag, to carry the ns3 device name from where a packet is coming</li>

<li>New Tag, DeviceNameTag, to carry the ns3 device name from where a packet is coming</li>

<li>New Error Model, BurstError model, to determine which bursts of packets are errored corresponding to an underlying distribution, burst rate, and burst size</li>

<li>New Error Model, BurstError model, to determine which bursts of packets are errored corresponding to an underlying distribution, burst rate, and burst size</li>

<li>To make the API more uniform across the various

  PropagationLossModel classes, the Set/GetLambda methods of the

  FriisPropagationLossModel and TwoRayGroundPropagationLossModel

  classes have been changed to Set/GetFrequency, and now a Frequency

  attribute is exported which replaces the pre-existing Lambda

  attribute. Any previous user code setting a value for Lambda should

  be changed to set instead a value of Frequency = C / Lambda, with C

  = 299792458.0. </li>

</ul>

</ul>

100

<h2>Changes to existing API:</h2>

101

<h2>Changes to existing API:</h2>

(-)a/RELEASE_NOTES (+1 lines)

Lines 38-43	Link Here

- bug 1256 - Unnecessary SND.NXT advance, missing ACK for Out of Order segments

- bug 1256 - Unnecessary SND.NXT advance, missing ACK for Out of Order segments

- bug 1318 - Ipv6L3Protocol::LocalDeliver can get stuck in an infinte loop

- bug 1318 - Ipv6L3Protocol::LocalDeliver can get stuck in an infinte loop

- bug 1409 - Add an attribute "SystemId" to configure the ID for MPI

- bug 1409 - Add an attribute "SystemId" to configure the ID for MPI

- bug 1421 - Frequency dependent propagation loss models need uniform Frequency / Lambda attribute

- bug 1434 - DSR throughput not comparable to other protocols for manet example

- bug 1434 - DSR throughput not comparable to other protocols for manet example

- bug 1502 - Shutdown on tcp socket seems to misbehave

- bug 1502 - Shutdown on tcp socket seems to misbehave

- bug 1503 - BlockAckManager infine loop

- bug 1503 - BlockAckManager infine loop




  static TypeId tid = TypeId ("ns3::FriisPropagationLossModel")
    .SetParent<PropagationLossModel> ()
    .AddConstructor<FriisPropagationLossModel> ()
    .AddAttribute ("Frequency", 
                   "The carrier frequency (in Hz) at which propagation occurs  (default is 5.15 GHz).",
                   DoubleValue (5.150e9),
                   MakeDoubleAccessor (&FriisPropagationLossModel::SetFrequency,
                                       &FriisPropagationLossModel::GetFrequency),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("SystemLoss", "The system loss",
                   DoubleValue (1.0),

{
  return m_minDistance;
}

void
FriisPropagationLossModel::SetFrequency (double frequency)
{
  m_frequency = frequency;
  static const double C = 299792458.0; // speed of light in vacuum
  m_lambda = C / frequency;
}

double
FriisPropagationLossModel::GetFrequency (void) const
{
  return m_frequency;
}
double
FriisPropagationLossModel::GetLambda (void) const
{
  return m_lambda;
}

double

  static TypeId tid = TypeId ("ns3::TwoRayGroundPropagationLossModel")
    .SetParent<PropagationLossModel> ()
    .AddConstructor<TwoRayGroundPropagationLossModel> ()
    .AddAttribute ("Frequency", 
                   "The carrier frequency (in Hz) at which propagation occurs  (default is 5.15 GHz).",
                   DoubleValue (5.150e9),
                   MakeDoubleAccessor (&TwoRayGroundPropagationLossModel::SetFrequency,
                                       &TwoRayGroundPropagationLossModel::GetFrequency),
                   MakeDoubleChecker<double> ())
    .AddAttribute ("SystemLoss", "The system loss",
                   DoubleValue (1.0),

{
  m_heightAboveZ = heightAboveZ;
}

void
TwoRayGroundPropagationLossModel::SetFrequency (double frequency)
{
  m_frequency = frequency;
  static const double C = 299792458.0; // speed of light in vacuum
  m_lambda = C / frequency;
}

double
TwoRayGroundPropagationLossModel::GetFrequency (void) const
{
  return m_frequency;
}
double 
TwoRayGroundPropagationLossModel::GetLambda (void) const
{
  return m_lambda;
}

double 

   *
   */

  double dCross = (4 * PI * txAntHeight * rxAntHeight) / m_lambda;
  double tmp = 0;
  if (distance <= dCross)
    {




 * This model is invalid for small distance values.
 * The current implementation returns the txpower as the rxpower
 * for any distance smaller than MinDistance.
 * 
 * In the implementation,  \f$ \lambda \f$ is calculated as 
 * \f$ \frac{C}{f} \f$, where  \f$ C = 299792458\f$ m/s is the speed of light in
 * vacuum, and \f$ f \f$ is the frequency in Hz which can be configured by
 * the user via the Frequency attribute.
 */
class FriisPropagationLossModel : public PropagationLossModel
{

  FriisPropagationLossModel ();
  /**
   * \param frequency (Hz)
   * \param speed (m/s)
   *
   * Set the carrier frequency used in the Friis model 
   * calculation.
   */
  void SetFrequency (double frequency);
  /**
   * \param lambda (m) the wavelength
   *
   * Set the main wavelength used in the Friis model 
   * calculation.
   */
  void SetLambda (double lambda);
  /**
   * \param systemLoss (dimension-less)
   *

  double GetMinDistance (void) const;

  /**
   * \returns the current frequency (Hz)
   */
  double GetFrequency (void) const;
  /**
   * \returns the current system loss (dimension-less)
   */


  static const double PI;
  double m_lambda;
  double m_frequency;
  double m_systemLoss;
  double m_minDistance;
};

 * The crossover distance, below which Friis is used, is calculated as follows:
 *
 * \f$ dCross = \frac{(4 * pi * Ht * Hr)}{lambda} \f$
 *
 * In the implementation,  \f$ \lambda \f$ is calculated as 
 * \f$ \frac{C}{f} \f$, where  \f$ C = 299792458\f$ m/s is the speed of light in
 * vacuum, and \f$ f \f$ is the frequency in Hz which can be configured by
 * the user via the Frequency attribute.
 */
class TwoRayGroundPropagationLossModel : public PropagationLossModel
{
public:
  static TypeId GetTypeId (void);
  TwoRayGroundPropagationLossModel ();

  /**
   * \param frequency (Hz)
   * \param speed (m/s)
   *
   * Set the carrier frequency used in the TwoRayGround model 
   * calculation.
   */
  void SetFrequency (double frequency);

   * \param lambda (m) the wavelength
   *
   * Set the main wavelength used in the TwoRayGround model 
   * calculation.
   */
  void SetLambda (double lambda);
  /**
   * \param systemLoss (dimension-less)
   *

   * \returns the minimum distance.
   */
  double GetMinDistance (void) const;

  /**
   * \returns the current frequency (Hz)
   */
  double GetFrequency (void) const;

  /**
   * \returns the current system loss (dimension-less)
   */


  static const double PI;
  double m_lambda;
  double m_frequency;
  double m_systemLoss;
  double m_minDistance;
  double m_heightAboveZ;




  // The ns-3 testing manual gives more background on the values selected
  // for this test.  First, set a few defaults. 

  // the test vectors have been determined for a wavelength of 0.125 m 
  // which corresponds to a frequency of 2398339664.0 Hz in the vacuum
  Config::SetDefault ("ns3::FriisPropagationLossModel::Frequency", DoubleValue (2398339664.0));
  Config::SetDefault ("ns3::FriisPropagationLossModel::SystemLoss", DoubleValue (1.0));

  // Select a reference transmit power

void
TwoRayGroundPropagationLossModelTestCase::DoRun (void)
{
  // the test vectors have been determined for a wavelength of 0.125 m 
  // which corresponds to a frequency of 2398339664.0 Hz in the vacuum
  Config::SetDefault ("ns3::TwoRayGroundPropagationLossModel::Frequency", DoubleValue (2398339664.0));
  Config::SetDefault ("ns3::TwoRayGroundPropagationLossModel::SystemLoss", DoubleValue (1.0));

  // set antenna height to 1.5m above z coordinate

Return to bug 1421