Attachment #1908 for bug #2011

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

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

Lines 72-77	Link Here

  </li>

  </li>

  <li>PointerValue attribute types in class UanChannel (NoiseModel), UanPhyGen (PerModel and SinrModel), UanPhyDual (PerModelPhy1, PerModelPhy2, SinrModelPhy1, and SinrModelPhy2), and SimpleNetDevice (TxQueue), were changed from PointerValue type to StringValue type, making them configurable via the Config subsystem.

  <li>PointerValue attribute types in class UanChannel (NoiseModel), UanPhyGen (PerModel and SinrModel), UanPhyDual (PerModelPhy1, PerModelPhy2, SinrModelPhy1, and SinrModelPhy2), and SimpleNetDevice (TxQueue), were changed from PointerValue type to StringValue type, making them configurable via the Config subsystem.

  </li>

  </li>

  <li> The 'Speed' attribute of the ConstantDelayPropagationModel (previously using the value 300000000 (m/s)) has been replaced by the GlobalValue 'SpeedOfLight', defaulting to 299792458 (m/s).  The 'SetSpeed()' and 'GetSpeed()' methods of this class have also been removed.

</ul>

</ul>

<h2>Changes to build system:</h2>

<h2>Changes to build system:</h2>

Lines 80-85	Link Here

<h2>Changed behavior:</h2>

<h2>Changed behavior:</h2>

<ul>

<ul>

  <li> Propagation delays for models using the default ConstantDelayPropagationModel will have changed slightly, according to the replacement of the 'Speed' attribute discussed above.

  </li>

</ul>

</ul>

<hr>

<hr>




#include "ns3/double.h"
#include "ns3/string.h"
#include "ns3/pointer.h"
#include "ns3/global-value.h"

namespace ns3 {

NS_OBJECT_ENSURE_REGISTERED (PropagationDelayModel);

static GlobalValue g_speedOfLight ("SpeedOfLight",
                                   "The speed of light in a vacuum (m/s)",
                                   ns3::DoubleValue(299792458),
                                   ns3::MakeDoubleChecker<double> ());

TypeId 
PropagationDelayModel::GetTypeId (void)
{

  static TypeId tid = TypeId ("ns3::ConstantSpeedPropagationDelayModel")
    .SetParent<PropagationDelayModel> ()
    .AddConstructor<ConstantSpeedPropagationDelayModel> ()
    .AddAttribute ("Speed", "The speed (m/s)",
                   DoubleValue (300000000.0),
                   MakeDoubleAccessor (&ConstantSpeedPropagationDelayModel::m_speed),
                   MakeDoubleChecker<double> ())
  ;
  return tid;
}

ConstantSpeedPropagationDelayModel::GetDelay (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const
{
  double distance = a->GetDistanceFrom (b);
  DoubleValue speedValue;
  g_speedOfLight.GetValue (speedValue);
  return Seconds (distance/speedValue.Get ());
void
ConstantSpeedPropagationDelayModel::SetSpeed (double speed)
{
  m_speed = speed;
}
double
ConstantSpeedPropagationDelayModel::GetSpeed (void) const
{
  return m_speed;
}

int64_t




/**
 * \ingroup propagation
 *
 * \brief the propagation delay is random, defaulting to a U(0,1) random
 * variable.  The random variable can be changed via the attribute 'Variable'.
 */
class RandomPropagationDelayModel : public PropagationDelayModel
{

  static TypeId GetTypeId (void);

  /**
   * Simply constructs the object
   */
  RandomPropagationDelayModel ();
  virtual ~RandomPropagationDelayModel ();

/**
 * \ingroup propagation
 *
 * \brief the propagation speed is constant, defaulting to the global
 * value 'SpeedOfLight' (default speed of light in a vacuum)
 */
class ConstantSpeedPropagationDelayModel : public PropagationDelayModel
{

  static TypeId GetTypeId (void);

  /**
   * Simply constructs the object
   */
  ConstantSpeedPropagationDelayModel ();
  virtual Time GetDelay (Ptr<MobilityModel> a, Ptr<MobilityModel> b) const;
  /**
   * \param speed the new speed (m/s)
   */
  void SetSpeed (double speed);
  /**
   * \returns the current propagation speed (m/s).
   */
  double GetSpeed (void) const;
private:
  virtual int64_t DoAssignStreams (int64_t stream);
  double m_speed; //!< speed
};

} // namespace ns3

Return to bug 2011