Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
JPScore
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
92
Issues
92
List
Boards
Labels
Service Desk
Milestones
Merge Requests
3
Merge Requests
3
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
JuPedSim
JPScore
Commits
9e55b84f
Commit
9e55b84f
authored
Apr 09, 2018
by
Arne Graf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
cleaned up dbg output (ffrouter)
parent
6b207cb9
Pipeline
#8429
canceled with stages
in 13 seconds
Changes
2
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
12 additions
and
12 deletions
+12
-12
routing/ff_router/UnivFFviaFM.cpp
routing/ff_router/UnivFFviaFM.cpp
+1
-1
routing/ff_router/ffRouter.cpp
routing/ff_router/ffRouter.cpp
+11
-11
No files found.
routing/ff_router/UnivFFviaFM.cpp
View file @
9e55b84f
...
...
@@ -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));
...
...
routing/ff_router/ffRouter.cpp
View file @
9e55b84f
...
...
@@ -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:
\t
FF 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!
"
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment