From 9e55b84fc18dd26cf79c4e8bdef7f28f930a6f0b Mon Sep 17 00:00:00 2001
From: Arne Graf <ar.graf.cst@gmail.com>
Date: Mon, 9 Apr 2018 13:40:00 +0200
Subject: [PATCH] cleaned up dbg output (ffrouter)
---
routing/ff_router/UnivFFviaFM.cpp | 2 +-
routing/ff_router/ffRouter.cpp | 22 +++++++++++-----------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/routing/ff_router/UnivFFviaFM.cpp b/routing/ff_router/UnivFFviaFM.cpp
index ad3d5f9d..00adf022 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 6cd23169..2fe640d6 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!");
}
}
--
GitLab