F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adapt to StaticSpeedHelper change

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2007-10-01 17:11:06 +01:00
parent 636e47d219
commit afc46ac1d3
2 changed files with 14 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/mobility/random-direction-2d-mobility-model.cc
View File

@@ -138,6 +138,16 @@ RandomDirection2dMobilityModel::Start (void)
double direction = UniformVariable::GetSingleValue (0, 2 * PI);
SetDirectionAndSpeed (direction);
}
void
RandomDirection2dMobilityModel::BeginPause (void)
{
Time pause = Seconds (m_parameters->m_pauseVariable->GetValue ());
m_helper.Pause ();
m_event = Simulator::Schedule (pause, &RandomDirection2dMobilityModel::ResetDirectionAndSpeed, this);
NotifyCourseChange ();
}
void
RandomDirection2dMobilityModel::SetDirectionAndSpeed (double direction)
{
@@ -146,13 +156,12 @@ RandomDirection2dMobilityModel::SetDirectionAndSpeed (double direction)
const Speed vector (std::cos (direction) * speed,
std::sin (direction) * speed,
0.0);
Time pause = Seconds (m_parameters->m_pauseVariable->GetValue ());
Position position = m_helper.GetCurrentPosition (m_parameters->m_bounds);
m_helper.Reset (vector, pause);
m_helper.Reset (vector);
Position next = m_parameters->m_bounds.CalculateIntersection (position, vector);
Time delay = Seconds (CalculateDistance (position, next) / speed);
m_event = Simulator::Schedule (delay + pause,
&RandomDirection2dMobilityModel::ResetDirectionAndSpeed, this);
m_event = Simulator::Schedule (delay,
&RandomDirection2dMobilityModel::BeginPause, this);
NotifyCourseChange ();
}
void

1
src/mobility/random-direction-2d-mobility-model.h
View File

@@ -102,6 +102,7 @@ class RandomDirection2dMobilityModel : public MobilityModel
private:
void Start (void);
void ResetDirectionAndSpeed (void);
void BeginPause (void);
void SetDirectionAndSpeed (double direction);
void InitializeDirectionAndSpeed (void);
virtual void DoDispose (void);