Attachment #1348 for bug #1384

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




{
}

double
Vector3D::GetLength () const
{
  return sqrt (x*x + y*y + z*z);
}

Vector3D& 
Vector3D::operator += (const Vector3D &v)
{
  x += v.x;
  y += v.y;
  z += v.z;

  return *this;
}

Vector3D& 
Vector3D::operator += (double v)
{
  x += v;
  y += v;
  z += v;

  return *this;
}

Vector3D  
Vector3D::operator + (const Vector3D &v) const
{
  return Vector3D (x+v.x, y+v.y, z+v.z);
}

Vector3D  
Vector3D::operator + (double v) const
{
  return Vector3D (x+v, y+v, z+v);
}

Vector3D  
Vector3D::operator * (const Vector3D &v) const
{
  return Vector3D (x*v.x, y*v.y, z*v.z);
}

Vector3D  
Vector3D::operator * (double v) const
{
  return Vector3D (x*v, y*v, z*v);
}

Vector3D
Vector3D::operator - (const Vector3D &v) const
{
  return Vector3D (x-v.x, y-v.y, z-v.z);
}

Vector3D
Vector3D::operator / (double div) const
{
  return Vector3D (x/div, y/div, z/div);
}

Vector2D::Vector2D (double _x, double _y)
  : x (_x),
    y (_y)

}

double
Vector2D::GetLength () const
{
  return sqrt (x*x + y*y);
}

Vector2D& 
Vector2D::operator += (const Vector2D &v)
{
  x += v.x;
  y += v.y;

  return *this;
}

Vector2D& 
Vector2D::operator += (double v)
{
  x += v;
  y += v;

  return *this;
}

Vector2D  
Vector2D::operator + (const Vector2D &v) const
{
  return Vector2D (x+v.x, y+v.y);
}

Vector2D  
Vector2D::operator + (double v) const
{
  return Vector2D (x+v, y+v);
}

Vector2D  
Vector2D::operator * (const Vector2D &v) const
{
  return Vector2D (x*v.x, y*v.y);
}

Vector2D  
Vector2D::operator * (double v) const
{
  return Vector2D (x*v, y*v);
}

Vector2D
Vector2D::operator - (const Vector2D &v) const
{
  return Vector2D (x-v.x, y-v.y);
}

Vector2D
Vector2D::operator / (double div) const
{
  return Vector2D (x/div, y/div);
}

double
CalculateDistance (const Vector3D &a, const Vector3D &b)
{
  double dx = b.x - a.x;

  return distance;
}


double
ScalarMultiplication (const Vector3D &a, const Vector3D &b)
{
  Vector3D tmp = a * b;
  return tmp.x + tmp.y + tmp.z;
}

double
ScalarMultiplication (const Vector2D &a, const Vector2D &b)
{
  Vector2D tmp = a * b;
  return tmp.x + tmp.y;
}

std::ostream &operator << (std::ostream &os, const Vector3D &vector)
{
  os << vector.x << ":" << vector.y << ":" << vector.z;

(-)a/src/core/model/vector.h (-1 / +35 lines)

Lines 55-60 public:	Link Here

   * z coordinate of vector

   * z coordinate of vector

*/

*/

  double z;

  double z;

  double GetLength () const;

  Vector3D& operator += (const Vector3D &);

  Vector3D& operator += (double);

  Vector3D  operator + (const Vector3D &) const;

  Vector3D  operator + (double) const;

  Vector3D  operator * (const Vector3D &) const;

  Vector3D  operator * (double v) const;

  Vector3D  operator - (const Vector3D &) const;

  Vector3D  operator / (double) const;

};

};

/**

/**

Lines 82-87 public:	Link Here

   * y coordinate of vector

   * y coordinate of vector

*/

*/

  double y;

  double y;

  double GetLength () const;

  Vector2D& operator += (const Vector2D &);

100

  Vector2D& operator += (double);

101

  Vector2D  operator + (const Vector2D &) const;

102

  Vector2D  operator + (double) const;

103

  Vector2D  operator * (const Vector2D &) const;

104

  Vector2D  operator * (double v) const;

105

  Vector2D  operator - (const Vector2D &) const;

106

  Vector2D  operator / (double) const;

};

107

};

108

/**

109

/**

Lines 99-104 double CalculateDistance (const Vector3D &a, const Vector3D &b);	Link Here

double CalculateDistance (const Vector2D &a, const Vector2D &b);

121

double CalculateDistance (const Vector2D &a, const Vector2D &b);

100

122

101

/**

123

/**

124

 * \brief Calculate scalar multiplication between two vectors

125

 * \param a one point

126

 * \param b another point

127

*/

128

double ScalarMultiplication (const Vector3D &a, const Vector3D &b);

129

/**

130

 * \brief Calculate scalar multiplication between two vectors

131

 * \param a one point

132

 * \param b another point

133

*/

134

double ScalarMultiplication (const Vector2D &a, const Vector2D &b);

135

136

/**

102

 * \class ns3::Vector3DValue

137

 * \class ns3::Vector3DValue

103

 * \brief hold objects of type ns3::Vector3D

138

 * \brief hold objects of type ns3::Vector3D

104

*/

139

*/

105

Return to bug 1384