diff --git a/math/VelocityModel.cpp b/math/VelocityModel.cpp index 610f748484b08788f48de6ed7eb16a961f10d37c..8f0e344b8c900cdc5da55bf9eb912c1c59d79147 100644 --- a/math/VelocityModel.cpp +++ b/math/VelocityModel.cpp @@ -449,15 +449,15 @@ Point VelocityModel::ForceRepRoom(Pedestrian* ped, SubRoom* subroom) const { f += ForceRepWall(ped,*(static_cast(goal)), centroid, inside); } - int uid1= goal->GetUniqueID(); - int uid2=ped->GetExitIndex(); - // ignore my transition consider closed doors - //closed doors are considered as wall - - if((uid1 != uid2) || (goal->IsOpen()==false )) - { - f += ForceRepWall(ped,*(static_cast(goal)), centroid, inside); - } + // int uid1= goal->GetUniqueID(); + // int uid2=ped->GetExitIndex(); + // // ignore my transition consider closed doors + // //closed doors are considered as wall + + // if((uid1 != uid2) || (goal->IsOpen()==false )) + // { + // f += ForceRepWall(ped,*(static_cast(goal)), centroid, inside); + // } } return f; @@ -482,7 +482,7 @@ Point VelocityModel::ForceRepWall(Pedestrian* ped, const Line& w, const Point& c e_iw = dist / Distance; } 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(); new_dist = new_dist/new_dist.Norm(); //printf("new distance = (%f, %f) inside=%d\n", new_dist._x, new_dist._y, inside);