Skip to content
Snippets Groups Projects
Commit e9b55297 authored by Arne Graf's avatar Arne Graf
Browse files

prep for merging dev into this

parent a906762b
No related branches found
No related tags found
1 merge request!10Develop
Show whitespace changes
Inline Side-by-side
routing/ff_router/ffRouter.cpp
+ 79
− 117
View file @ e9b55297
...@@ -817,84 +817,84 @@ void FFRouter::FloydWarshall() ...@@ -817,84 +817,84 @@ void FFRouter::FloydWarshall()
} }
} }
void FFRouter::AvoidDoorHopping() { //void FFRouter::AvoidDoorHopping() {
std::chrono::time_point<std::chrono::system_clock> start, end; // std::chrono::time_point<std::chrono::system_clock> start, end;
start = std::chrono::system_clock::now(); // start = std::chrono::system_clock::now();
//
// it's already very fast (< 0.1s) -- no need to parallelize // // it's already very fast (< 0.1s) -- no need to parallelize
//#pragma omp parallel for ////#pragma omp parallel for
for (auto pathsIt : _pathsMatrix) { // for (auto pathsIt : _pathsMatrix) {
auto key = pathsIt.first; // auto key = pathsIt.first;
if (key.first == key.second) continue; // if (key.first == key.second) continue;
if (_distMatrix[key] == DBL_MAX) { // if (_distMatrix[key] == DBL_MAX) {
continue; // continue;
} // }
auto subroom = _subroomMatrix.at(key); // auto subroom = _subroomMatrix.at(key);
if (!subroom) continue; // if (!subroom) continue;
//
auto nextDoorUID = pathsIt.second; // auto nextDoorUID = pathsIt.second;
auto nextDoor = _CroTrByUID.at(nextDoorUID); // auto nextDoor = _CroTrByUID.at(nextDoorUID);
auto finalDoor = key.second; // auto finalDoor = key.second;
//
if (_targetWithinSubroom) { // if (_targetWithinSubroom) {
int doorLeavingSubroom = -1; // initialization only needed in case of error // int doorLeavingSubroom = -1; // initialization only needed in case of error
//
if (_CroTrByUID.at(nextDoorUID)->GetSubRoom1() == subroom || _CroTrByUID.at(nextDoorUID)->GetSubRoom2() == subroom) { // if (_CroTrByUID.at(nextDoorUID)->GetSubRoom1() == subroom || _CroTrByUID.at(nextDoorUID)->GetSubRoom2() == subroom) {
doorLeavingSubroom = key.first; // doorLeavingSubroom = key.first;
Crossing* doorAfterNext; // Crossing* doorAfterNext;
do { // do {
doorLeavingSubroom = _pathsMatrix.at(std::make_pair(doorLeavingSubroom, finalDoor)); // doorLeavingSubroom = _pathsMatrix.at(std::make_pair(doorLeavingSubroom, finalDoor));
if (doorLeavingSubroom == finalDoor) break; // if (doorLeavingSubroom == finalDoor) break;
auto doorAfterNextUID = _pathsMatrix.at(std::make_pair(doorLeavingSubroom, finalDoor)); // auto doorAfterNextUID = _pathsMatrix.at(std::make_pair(doorLeavingSubroom, finalDoor));
doorAfterNext = _CroTrByUID.at(doorAfterNextUID); // doorAfterNext = _CroTrByUID.at(doorAfterNextUID);
} while (doorAfterNext->GetSubRoom1() == subroom || doorAfterNext->GetSubRoom2() == subroom); // } while (doorAfterNext->GetSubRoom1() == subroom || doorAfterNext->GetSubRoom2() == subroom);
} else { // } else {
Log->Write("ERROR \tFFRouter::AvoidDoorHopping: sub is %p (UID %d), nextDoorUID/ID is %d/%d", subroom, subroom?subroom->GetUID():-1, nextDoorUID, nextDoor->GetID()); // Log->Write("ERROR \tFFRouter::AvoidDoorHopping: sub is %p (UID %d), nextDoorUID/ID is %d/%d", subroom, subroom?subroom->GetUID():-1, nextDoorUID, nextDoor->GetID());
} // }
//#pragma omp critical(_pathsMatrix) ////#pragma omp critical(_pathsMatrix)
_pathsMatrix.at(key) = doorLeavingSubroom; // _pathsMatrix.at(key) = doorLeavingSubroom;
if (_pathsMatrix.at(key) == -1) { // if (_pathsMatrix.at(key) == -1) {
Log->Write("ERROR \tFFRouter::AvoidDoorHopping(): _pathsMatrix got assigned a value of -1 for key %d, %d", key.first, key.second); // Log->Write("ERROR \tFFRouter::AvoidDoorHopping(): _pathsMatrix got assigned a value of -1 for key %d, %d", key.first, key.second);
} // }
} else { // } else {
int doorLeavingRoom = -1; // initialization only needed in case of error // int doorLeavingRoom = -1; // initialization only needed in case of error
auto room = _building->GetRoom(subroom->GetRoomID()); // auto room = _building->GetRoom(subroom->GetRoomID());
//
auto tr = dynamic_cast<Transition*>(_CroTrByUID.at(nextDoorUID)); // auto tr = dynamic_cast<Transition*>(_CroTrByUID.at(nextDoorUID));
if (room && (_CroTrByUID.at(nextDoorUID)->GetRoom1() == room || (tr && tr->GetRoom2() == room))) { // if (room && (_CroTrByUID.at(nextDoorUID)->GetRoom1() == room || (tr && tr->GetRoom2() == room))) {
Transition* doorAfterNext; // Transition* doorAfterNext;
int doorAfterNextUID = key.first; // int doorAfterNextUID = key.first;
do { // do {
doorLeavingRoom = doorAfterNextUID; // doorLeavingRoom = doorAfterNextUID;
//
do { // do {
doorAfterNextUID = _pathsMatrix.at(std::make_pair(doorAfterNextUID, finalDoor)); // doorAfterNextUID = _pathsMatrix.at(std::make_pair(doorAfterNextUID, finalDoor));
} while (doorAfterNextUID != finalDoor && !(doorAfterNext = dynamic_cast<Transition*>(_CroTrByUID.at(doorAfterNextUID)))); // } while (doorAfterNextUID != finalDoor && !(doorAfterNext = dynamic_cast<Transition*>(_CroTrByUID.at(doorAfterNextUID))));
//
if (doorAfterNextUID == finalDoor) { // if (doorAfterNextUID == finalDoor) {
if (doorLeavingRoom == key.first) { // if (doorLeavingRoom == key.first) {
// handles the case in which in the final door is in the room we are going to enter // // handles the case in which in the final door is in the room we are going to enter
doorLeavingRoom = finalDoor; // doorLeavingRoom = finalDoor;
} // }
break; // break;
} // }
//
} while (doorAfterNext->GetRoom1() == room || doorAfterNext->GetRoom2() == room); // } while (doorAfterNext->GetRoom1() == room || doorAfterNext->GetRoom2() == room);
} else { // } else {
Log->Write("ERROR \tFFRouter::AvoidDoorHopping: room is %p (ID %d), nextDoorUID/ID is %d/%d", room, room ? room->GetID() : -1, nextDoorUID, nextDoor->GetID()); // Log->Write("ERROR \tFFRouter::AvoidDoorHopping: room is %p (ID %d), nextDoorUID/ID is %d/%d", room, room ? room->GetID() : -1, nextDoorUID, nextDoor->GetID());
} // }
//#pragma omp critical(_pathsMatrix) ////#pragma omp critical(_pathsMatrix)
_pathsMatrix.at(key) = doorLeavingRoom; // _pathsMatrix.at(key) = doorLeavingRoom;
if (_pathsMatrix.at(key) == -1) { // if (_pathsMatrix.at(key) == -1) {
Log->Write("ERROR \tFFRouter::AvoidDoorHopping(): _pathsMatrix got assigned a value of -1 for key %d, %d", key.first, key.second); // Log->Write("ERROR \tFFRouter::AvoidDoorHopping(): _pathsMatrix got assigned a value of -1 for key %d, %d", key.first, key.second);
} // }
} // }
} // }
//
end = std::chrono::system_clock::now(); // end = std::chrono::system_clock::now();
std::chrono::duration<double> elapsed_seconds = end-start; // std::chrono::duration<double> elapsed_seconds = end-start;
Log->Write("INFO: \tTime in AvoidDoorHopping: " + std::to_string(elapsed_seconds.count())); // Log->Write("INFO: \tTime in AvoidDoorHopping: " + std::to_string(elapsed_seconds.count()));
} //}
void FFRouter::SetMode(std::string s) void FFRouter::SetMode(std::string s)
{ {
...@@ -911,41 +911,3 @@ void FFRouter::SetMode(std::string s) ...@@ -911,41 +911,3 @@ void FFRouter::SetMode(std::string s)
_mode = global_shortest; _mode = global_shortest;
return; return;
} }
\ No newline at end of file
void FFRouter::notifyDoor(Pedestrian *const p) {
if (p->GetV().Norm() > 0.5) {
return;
}
//find correct door
auto lastSubRoom = _building->GetSubRoomByUID(p->GetSubRoomUID());
auto doorsOfSubRoom = lastSubRoom->GetAllGoalIDs();
double minDist = _CroTrByUID.at(doorsOfSubRoom[0])->DistTo(p->GetPos());
double tmp = minDist;
Crossing* minCross = _CroTrByUID.at(doorsOfSubRoom[0]);
for(auto UID : doorsOfSubRoom) {
tmp = _CroTrByUID.at(UID)->DistTo(p->GetPos());
if (tmp < minDist) {
minCross = _CroTrByUID.at(UID);
minDist = tmp;
}
}
//find correct direction, where direction means: subRoom1 uses TickTime1, subRoom2 uses TickTime2; order in the Crossing::HLine is defining
if (
(minCross->_lastTickTime2 == 0)
&& (minCross->GetSubRoom1()) && (minCross->GetSubRoom1()->IsInSubRoom(p->GetPos()))) { //p is in subRoom1, so he entered that from subRoom2
minCross->_lastTickTime2 = p->_ticksInThisRoom;
minCross->_refresh2 = 0;
}
if (
(minCross->_lastTickTime1 == 0)
&& (minCross->GetSubRoom2()) && (minCross->GetSubRoom2()->IsInSubRoom(p->GetPos()))) {
minCross->_lastTickTime1 = p->_ticksInThisRoom;
minCross->_refresh1 = 0;
}
p->_ticksInThisRoom = 0;
}
void FFRouter::save(Pedestrian* const p) {
_localShortestSafedPeds.emplace_back(p->GetID());
}
routing/ff_router/ffRouter.h
+ 9
− 30
View file @ e9b55297
...@@ -161,47 +161,26 @@ public: ...@@ -161,47 +161,26 @@ public:
*/ */
virtual int FindExit(Pedestrian* p); virtual int FindExit(Pedestrian* p);
/*!
* \brief
*
*/
void Reset();
/*! /*!
* \brief Perform the FloydWarshall algorithm * \brief Perform the FloydWarshall algorithm
*/ */
void FloydWarshall(); void FloydWarshall();
/*! // /*!
* \brief Sets the door that leaves the subroom in _pathsMatrix // * \brief Sets the door that leaves the subroom in _pathsMatrix
* // *
* Due to the way we calculate door distances (entries in _pathsMatrix), pedestrians in a corridor // * Due to the way we calculate door distances (entries in _pathsMatrix), pedestrians in a corridor
* tend to jump from door to door, i.e. they walk to the next door in the correct direction, but they // * tend to jump from door to door, i.e. they walk to the next door in the correct direction, but they
* do not traverse it. This algorithm searches for the door on the way that really leaves the subroom, // * do not traverse it. This algorithm searches for the door on the way that really leaves the subroom,
* and sets this door in _pathsMatrix, which in turn is needed by GetPresumableExitRoute(). // * and sets this door in _pathsMatrix, which in turn is needed by GetPresumableExitRoute().
*/ // */
void AvoidDoorHopping(); // void AvoidDoorHopping();
/*!
* \brief set all the distances using ff
*/
//void SetDistances();
/*! /*!
* \brief set mode (shortest, quickest, ...) * \brief set mode (shortest, quickest, ...)
*/ */
void SetMode(std::string s); void SetMode(std::string s);
/*!
* \brief notify door about time spent in that room. needed for quickest mode
*/
void notifyDoor(Pedestrian* const p);
/*!
* \brief mark pedestrian as not being in the first room anymore and return to normal routing
*/
void save(Pedestrian* const p);
/*! /*!
* \brief Get the route the pedestrian p wants to take (according to _pathsMatrix) * \brief Get the route the pedestrian p wants to take (according to _pathsMatrix)
* @param p The pedestrian in question * @param p The pedestrian in question
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment