diff --git a/routing/ff_router/UnivFFviaFM.cpp b/routing/ff_router/UnivFFviaFM.cpp index ad3d5f9da36e09b5ee9ac102d1184d1d05fedcb6..00adf0220287f9ac191284a323957fbd402b0501 100644 --- a/routing/ff_router/UnivFFviaFM.cpp +++ b/routing/ff_router/UnivFFviaFM.cpp @@ -121,7 +121,7 @@ UnivFFviaFM::UnivFFviaFM(Room* roomArg, Configuration* const confArg, double hx, Log->Write("ERROR:\t In UnivFF InsidePoint Analysis"); bool a = subRoomPtr->IsInSubRoom(candidate01); bool b = subRoomPtr->IsInSubRoom(candidate02); - a = b && a; + a = b && a; //ignore this line. only to have a codeline after initialization of bools (to place a breakpoint) } } //_subroomUIDtoSubRoomPtr.emplace(std::make_pair(subRoomPtr->GetUID(), subRoomPtr)); diff --git a/routing/ff_router/ffRouter.cpp b/routing/ff_router/ffRouter.cpp index 6cd23169d937e40e594f2a8dddbc1e4c1a3578f5..2fe640d6f43b993a9f2bcddeef304a48d29a297e 100644 --- a/routing/ff_router/ffRouter.cpp +++ b/routing/ff_router/ffRouter.cpp @@ -265,15 +265,15 @@ bool FFRouter::Init(Building* building) } } - std::ofstream matrixfile; - matrixfile.open("Matrix.txt"); - - for (auto mapItem : _distMatrix) { - matrixfile << mapItem.first.first << " to " << mapItem.first.second << " : " << mapItem.second << "\t via \t" << _pathsMatrix[mapItem.first]; - matrixfile << "\t" << _CroTrByUID.at(mapItem.first.first)->GetID() << " to " << _CroTrByUID.at(mapItem.first.second)->GetID() << "\t via \t"; - matrixfile << _CroTrByUID.at(_pathsMatrix[mapItem.first])->GetID() << std::endl; - } - matrixfile.close(); +// std::ofstream matrixfile; +// matrixfile.open("Matrix.txt"); +// +// for (auto mapItem : _distMatrix) { +// matrixfile << mapItem.first.first << " to " << mapItem.first.second << " : " << mapItem.second << "\t via \t" << _pathsMatrix[mapItem.first]; +// matrixfile << "\t" << _CroTrByUID.at(mapItem.first.first)->GetID() << " to " << _CroTrByUID.at(mapItem.first.second)->GetID() << "\t via \t"; +// matrixfile << _CroTrByUID.at(_pathsMatrix[mapItem.first])->GetID() << std::endl; +// } +// matrixfile.close(); Log->Write("INFO: \tFF Router Init done."); return true; } @@ -520,10 +520,10 @@ void FFRouter::FloydWarshall() } } if (change) { - Log->Write("Floyd nochmal!!! %f", savedDistance); + //Log->Write("Floyd nochmal!!! %f", savedDistance); FloydWarshall(); } else { - Log->Write("Floyd fertig"); + Log->Write("INFO:\t FloydWarshall done!"); } }