Commit dd1c2f33 authored by Mohcine Chraibi's avatar Mohcine Chraibi

s

Weird interaction with transitions removed
parent 636db8f6
...@@ -449,15 +449,15 @@ Point VelocityModel::ForceRepRoom(Pedestrian* ped, SubRoom* subroom) const ...@@ -449,15 +449,15 @@ Point VelocityModel::ForceRepRoom(Pedestrian* ped, SubRoom* subroom) const
{ {
f += ForceRepWall(ped,*(static_cast<Line*>(goal)), centroid, inside); f += ForceRepWall(ped,*(static_cast<Line*>(goal)), centroid, inside);
} }
int uid1= goal->GetUniqueID(); // int uid1= goal->GetUniqueID();
int uid2=ped->GetExitIndex(); // int uid2=ped->GetExitIndex();
// ignore my transition consider closed doors // // ignore my transition consider closed doors
//closed doors are considered as wall // //closed doors are considered as wall
if((uid1 != uid2) || (goal->IsOpen()==false )) // if((uid1 != uid2) || (goal->IsOpen()==false ))
{ // {
f += ForceRepWall(ped,*(static_cast<Line*>(goal)), centroid, inside); // f += ForceRepWall(ped,*(static_cast<Line*>(goal)), centroid, inside);
} // }
} }
return f; return f;
...@@ -482,7 +482,7 @@ Point VelocityModel::ForceRepWall(Pedestrian* ped, const Line& w, const Point& c ...@@ -482,7 +482,7 @@ Point VelocityModel::ForceRepWall(Pedestrian* ped, const Line& w, const Point& c
e_iw = dist / Distance; e_iw = dist / Distance;
} }
else { else {
Log->Write("WARNING:\t Velocity: forceRepWall() ped %d is too near to the wall (dist=%f)", ped->GetID(), Distance); Log->Write("WARNING:\t Velocity: forceRepWall() ped %d [%f, %f] is too near to the wall [%f, %f]-[%f, %f] (dist=%f)", ped->GetID(), ped->GetPos()._y, ped->GetPos()._y, w.GetPoint1()._x, w.GetPoint1()._y, w.GetPoint2()._x, w.GetPoint2()._y,Distance);
Point new_dist = centroid - ped->GetPos(); Point new_dist = centroid - ped->GetPos();
new_dist = new_dist/new_dist.Norm(); new_dist = new_dist/new_dist.Norm();
//printf("new distance = (%f, %f) inside=%d\n", new_dist._x, new_dist._y, inside); //printf("new distance = (%f, %f) inside=%d\n", new_dist._x, new_dist._y, inside);
......
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