Attachment #1892 for bug #938

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




   */
  Vector CalculateIntersection (const Vector &current, const Vector &speed) const;

  /** The x coordinate of the left bound of the box */
  double xMin;
  /** The x coordinate of the right bound of the box */
  double xMax;
  /** The y coordinate of the bottom bound of the box */
  double yMin;
  /** The y coordinate of the top bound of the box */
  double yMax;
  /** The z coordinate of the down bound of the box */
  double zMin;
  /** The z coordinate of the up bound of the box */
  double zMax;
};





{
public:
  static TypeId GetTypeId (void);
  /** An enum representing the different working modes of this module. */
  enum Mode  {
    MODE_DISTANCE,
    MODE_TIME
  };

private:
  /**
   * \brief Performs the rebound of the node if it reaches a boundary
   * \param timeLeft The remaining time of the walk
   */
  void Rebound (Time timeLeft);
  void DoWalk (Time timeLeft);
  void DoInitializePrivate (void);

(-)a/src/mobility/model/waypoint-mobility-model.h (+32 lines)

Lines 128-144	Link Here

128

  friend class ::WaypointMobilityModelNotifyTest; // To allow Update() calls and access to m_current

128

  friend class ::WaypointMobilityModelNotifyTest; // To allow Update() calls and access to m_current

129

130

  void Update (void) const;

130

  void Update (void) const;

131

/**

132

   * \brief The dispose method.

133

134

   * Subclasses must override this method.

135

*/

131

  virtual void DoDispose (void);

136

  virtual void DoDispose (void);

137

/**

138

   * \brief Get current position.

139

   * \return A vector with the current position of the node.

140

*/

132

  virtual Vector DoGetPosition (void) const;

141

  virtual Vector DoGetPosition (void) const;

142

/**

143

   * \brief Sets a new position for the node

144

   * \param position A vector to be added as the new position

145

*/

133

  virtual void DoSetPosition (const Vector &position);

146

  virtual void DoSetPosition (const Vector &position);

147

/**

148

   * \brief Returns the current velocity of a node

149

   * \return The velocity vector of a node.

150

*/

134

  virtual Vector DoGetVelocity (void) const;

151

  virtual Vector DoGetVelocity (void) const;

135

152

153

/**

154

   * \brief This variable is set to true if there are no waypoints in the std::deque

155

*/

136

  bool m_first;

156

  bool m_first;

137

  bool m_lazyNotify;

157

  bool m_lazyNotify;

138

  bool m_initialPositionIsWaypoint;

158

  bool m_initialPositionIsWaypoint;

159

/**

160

   * \brief The double ended queue containing the ns3::Waypoint objects

161

*/

139

  mutable std::deque<Waypoint> m_waypoints;

162

  mutable std::deque<Waypoint> m_waypoints;

163

/**

164

   * \brief The ns3::Waypoint currently being used

165

*/

140

  mutable Waypoint m_current;

166

  mutable Waypoint m_current;

167

/**

168

   * \brief The next ns3::Waypoint in the deque

169

*/

141

  mutable Waypoint m_next;

170

  mutable Waypoint m_next;

171

/**

172

   * \brief The current velocity vector

173

*/

142

  mutable Vector m_velocity;

174

  mutable Vector m_velocity;

143

};

175

};

144

176

(-)a/src/mobility/model/waypoint.h (-2 / +6 lines)

Lines 46-54	Link Here

   * Create a waypoint at time 0 and position (0,0,0).

   * Create a waypoint at time 0 and position (0,0,0).

*/

*/

  Waypoint ();

  Waypoint ();

  /* The waypoint time */

/**

   * \brief The waypoint time

*/

  Time time;

  Time time;

  /* The position of the waypoint */

/**

   * \brief The position of the waypoint

*/

  Vector position;

  Vector position;

};

};

Return to bug 938