Commit 8032358c authored by Oliver Schmidts's avatar Oliver Schmidts

adjusting constructors

parent bafa01f3
......@@ -91,7 +91,7 @@ Pedestrian::Pedestrian()
_agentsCreated++;//increase the number of object created
}
Pedestrian::Pedestrian(const StartDistributionSubroom& agentsParameters, const Building& building)
Pedestrian::Pedestrian(const StartDistribution& agentsParameters, const Building& building)
: _age(agentsParameters.GetAge()),
_gender(agentsParameters.GetGender()),
_height(agentsParameters.GetHeight()),
......@@ -101,11 +101,12 @@ Pedestrian::Pedestrian(const StartDistributionSubroom& agentsParameters, const B
_router(building.GetRoutingEngine()->GetRouter(agentsParameters.GetRouterId())),
_lastPosition(),
_roomID(agentsParameters.GetRoomId()),
_subRoomID(agentsParameters.GetSubroomID())
_roomCaption(""),
_subRoomID(agentsParameters.GetSubroomID()),
_patienceTime(agentsParameters.GetPatience()),
_premovement(agentsParameters.GetPremovementTime())
{
}
......
......@@ -323,7 +323,7 @@ void StartDistribution::InitPremovementTime(double mean, double stdv)
_premovementTime = std::normal_distribution<double>(mean,stdv);
}
double StartDistribution::GetPremovementTime()
double StartDistribution::GetPremovementTime() const
{
return _premovementTime(_generator);
}
......
......@@ -114,7 +114,7 @@ public:
AgentsParameters* GetGroupParameters();
void SetGroupParameters(AgentsParameters* groupParameters);
void InitPremovementTime(double mean, double stdv);
double GetPremovementTime();
double GetPremovementTime() const;
void InitRiskTolerance(double mean, double stdv);
double GetRiskTolerance();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment