Attachment #1899 for bug #1995

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

(-)a/src/mobility/model/gauss-markov-mobility-model.cc (-1 / +1 lines)

Lines 168-174	Link Here

168

      if (nextPosition.x > m_bounds.xMax || nextPosition.x < m_bounds.xMin)

168

      if (nextPosition.x > m_bounds.xMax || nextPosition.x < m_bounds.xMin)

169

170

          speed.x = -speed.x;

170

          speed.x = -speed.x;

171

          m_meanDirection = 3.14159265 - m_meanDirection;

171

          m_meanDirection = M_PI - m_meanDirection;

172

173

174

      if (nextPosition.y > m_bounds.yMax || nextPosition.y < m_bounds.yMin)

174

      if (nextPosition.y > m_bounds.yMax || nextPosition.y < m_bounds.yMin)





namespace ns3 {

const double RandomDirection2dMobilityModel::PI = 3.14159265358979323846;

NS_OBJECT_ENSURE_REGISTERED (RandomDirection2dMobilityModel);



void
RandomDirection2dMobilityModel::DoInitializePrivate (void)
{
  double direction = m_direction->GetValue (0, 2 * M_PI);
  SetDirectionAndSpeed (direction);
}


void
RandomDirection2dMobilityModel::ResetDirectionAndSpeed (void)
{
  double direction = m_direction->GetValue (0, M_PI);

  m_helper.UpdateWithBounds (m_bounds);
  Vector position = m_helper.GetCurrentPosition ();
  switch (m_bounds.GetClosestSide (position))
    {
    case Rectangle::RIGHT:
      direction += M_PI / 2;
      break;
    case Rectangle::LEFT:
      direction += -M_PI / 2;
      break;
    case Rectangle::TOP:
      direction += M_PI;
      break;
    case Rectangle::BOTTOM:
      direction += 0.0;

(-)a/src/mobility/model/random-direction-2d-mobility-model.h (-1 lines)

Lines 60-66	Link Here

  virtual Vector DoGetVelocity (void) const;

  virtual Vector DoGetVelocity (void) const;

  virtual int64_t DoAssignStreams (int64_t);

  virtual int64_t DoAssignStreams (int64_t);

  static const double PI;

  Ptr<UniformRandomVariable> m_direction;

  Ptr<UniformRandomVariable> m_direction;

  Rectangle m_bounds;

  Rectangle m_bounds;

  Ptr<RandomVariableStream> m_speed;

  Ptr<RandomVariableStream> m_speed;

(-)a/src/propagation/model/jakes-process.cc (-2 / +2 lines)

Lines 85-91	Link Here

void

void

JakesProcess::SetDopplerFrequencyHz (double dopplerFrequencyHz)

JakesProcess::SetDopplerFrequencyHz (double dopplerFrequencyHz)

  m_omegaDopplerMax = 2 * dopplerFrequencyHz * JakesPropagationLossModel::PI;

  m_omegaDopplerMax = 2 * dopplerFrequencyHz * M_PI;

void

void

Lines 101-107	Link Here

101

      unsigned int n = i + 1;

101

      unsigned int n = i + 1;

102

      /// 1. Rotation speed

102

      /// 1. Rotation speed

103

      /// 1a. Initiate \f[ \alpha_n = \frac{2\pi n - \pi + \theta}{4M},  n=1,2, \ldots,M\f], n is oscillatorNumber, M is m_nOscillators

103

      /// 1a. Initiate \f[ \alpha_n = \frac{2\pi n - \pi + \theta}{4M},  n=1,2, \ldots,M\f], n is oscillatorNumber, M is m_nOscillators

104

      double alpha = (2.0 * JakesPropagationLossModel::PI * n - JakesPropagationLossModel::PI + theta) / (4.0 * m_nOscillators);

104

      double alpha = (2.0 * M_PI * n - M_PI + theta) / (4.0 * m_nOscillators);

105

      /// 1b. Initiate rotation speed:

105

      /// 1b. Initiate rotation speed:

106

      double omega = m_omegaDopplerMax * std::cos (alpha);

106

      double omega = m_omegaDopplerMax * std::cos (alpha);

107

      /// 2. Initiate complex amplitude:

107

      /// 2. Initiate complex amplitude:




{
NS_OBJECT_ENSURE_REGISTERED (JakesPropagationLossModel);


const double JakesPropagationLossModel::PI = 3.14159265358979323846;

JakesPropagationLossModel::JakesPropagationLossModel()
{
  m_uniformVariable = CreateObject<UniformRandomVariable> ();
  m_uniformVariable->SetAttribute ("Min", DoubleValue (-1.0 * M_PI));
  m_uniformVariable->SetAttribute ("Max", DoubleValue (M_PI));
}

JakesPropagationLossModel::~JakesPropagationLossModel()

(-)a/src/propagation/model/jakes-propagation-loss-model.h (-2 lines)

Lines 40-47	Link Here

  JakesPropagationLossModel ();

  JakesPropagationLossModel ();

  virtual ~JakesPropagationLossModel ();

  virtual ~JakesPropagationLossModel ();

  static const double PI;

private:

private:

  friend class JakesProcess;

  friend class JakesProcess;

  double DoCalcRxPower (double txPowerDbm,

  double DoCalcRxPower (double txPowerDbm,





NS_OBJECT_ENSURE_REGISTERED (FriisPropagationLossModel);

const double FriisPropagationLossModel::PI = 3.14159265358979323846;

TypeId 
FriisPropagationLossModel::GetTypeId (void)
{

      return txPowerDbm - m_minLoss;
    }
  double numerator = m_lambda * m_lambda;
  double denominator = 16 * M_PI * M_PI * distance * distance * m_systemLoss;
  double lossDb = -10 * log10 (numerator / denominator);
  NS_LOG_DEBUG ("distance=" << distance<< "m, loss=" << lossDb <<"dB");
  return txPowerDbm - std::max (lossDb, m_minLoss);


NS_OBJECT_ENSURE_REGISTERED (TwoRayGroundPropagationLossModel);

const double TwoRayGroundPropagationLossModel::PI = 3.14159265358979323846;

TypeId 
TwoRayGroundPropagationLossModel::GetTypeId (void)
{

   *
   */

  double dCross = (4 * M_PI * txAntHeight * rxAntHeight) / m_lambda;
  double tmp = 0;
  if (distance <= dCross)
    {
      // We use Friis
      double numerator = m_lambda * m_lambda;
      tmp = M_PI * distance;
      double denominator = 16 * tmp * tmp * m_systemLoss;
      double pr = 10 * std::log10 (numerator / denominator);
      NS_LOG_DEBUG ("Receiver within crossover (" << dCross << "m) for Two_ray path; using Friis");

(-)a/src/propagation/model/propagation-loss-model.h (-2 lines)

Lines 265-271	Link Here

265

  double DbmToW (double dbm) const;

265

  double DbmToW (double dbm) const;

266

  double DbmFromW (double w) const;

266

  double DbmFromW (double w) const;

267

268

  static const double PI;

269

  double m_lambda;

268

  double m_lambda;

270

  double m_frequency;

269

  double m_frequency;

271

  double m_systemLoss;

270

  double m_systemLoss;

Lines 358-364	Link Here

358

  double DbmToW (double dbm) const;

357

  double DbmToW (double dbm) const;

359

  double DbmFromW (double w) const;

358

  double DbmFromW (double w) const;

360

359

361

  static const double PI;

362

  double m_lambda;

360

  double m_lambda;

363

  double m_frequency;

361

  double m_frequency;

364

  double m_systemLoss;

362

  double m_systemLoss;

(-)a/src/wifi/model/dsss-error-rate-model.cc (-1 / +1 lines)

Lines 35-41	Link Here

DsssErrorRateModel::DqpskFunction (double x)

DsssErrorRateModel::DqpskFunction (double x)

  NS_LOG_FUNCTION_NOARGS ();

  NS_LOG_FUNCTION_NOARGS ();

  return ((std::sqrt (2.0) + 1.0) / std::sqrt (8.0 * 3.1415926 * std::sqrt (2.0)))

  return ((std::sqrt (2.0) + 1.0) / std::sqrt (8.0 * M_PI * std::sqrt (2.0)))

    * (1.0 / std::sqrt (x)) * std::exp ( -(2.0 - std::sqrt (2.0)) * x);

    * (1.0 / std::sqrt (x)) * std::exp ( -(2.0 - std::sqrt (2.0)) * x);

Return to bug 1995