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
ce545bf2
Commit
ce545bf2
authored
Oct 01, 2015
by
Andrijana Brkic
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
new geometries and ini files, last version of VoronoiBoost
parent
e73a2cdf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
271 additions
and
7 deletions
+271
-7
inputfiles/hybrid/hybrid_hall_geo.xml
inputfiles/hybrid/hybrid_hall_geo.xml
+5
-5
inputfiles/hybrid/hybrid_hall_geo_concav.xml
inputfiles/hybrid/hybrid_hall_geo_concav.xml
+131
-0
inputfiles/hybrid/hybrid_hall_geo_convex.xml
inputfiles/hybrid/hybrid_hall_geo_convex.xml
+133
-0
voronoi-boost/VoronoiPositionGenerator.cpp
voronoi-boost/VoronoiPositionGenerator.cpp
+2
-2
No files found.
inputfiles/hybrid/hybrid_hall_geo.xml
View file @
ce545bf2
...
...
@@ -42,11 +42,11 @@
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"9.2"
py=
"2.8"
/>
<vertex
px=
"1
1
.2"
py=
"2.8"
/>
<vertex
px=
"1
7
.2"
py=
"2.8"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"9.2"
py=
"6.4"
/>
<vertex
px=
"1
1
.2"
py=
"6.4"
/>
<vertex
px=
"1
7
.2"
py=
"6.4"
/>
</polygon>
</subroom>
</room>
...
...
@@ -98,8 +98,8 @@
<vertex
px=
"5.20"
py=
"-2.0"
/>
</transition>
<transition
id=
"5"
caption=
"exit"
type=
"emergency"
room1_id=
"2"
subroom1_id=
"0"
room2_id=
"-1"
subroom2_id=
"-1"
>
<vertex
px=
"1
1
.2"
py=
"2.8"
/>
<vertex
px=
"1
1
.2"
py=
"6.4"
/>
<vertex
px=
"1
7
.2"
py=
"2.8"
/>
<vertex
px=
"1
7
.2"
py=
"6.4"
/>
</transition>
<transition
id=
"6"
caption=
"exit"
type=
"emergency"
room1_id=
"3"
subroom1_id=
"0"
room2_id=
"-1"
subroom2_id=
"-1"
>
<vertex
px=
"3.2"
py=
"11.2"
/>
...
...
@@ -110,4 +110,4 @@
<vertex
px=
"-2.0"
py=
"6.4"
/>
</transition>
</transitions>
</geometry>
\ No newline at end of file
</geometry>
inputfiles/hybrid/hybrid_hall_geo_concav.xml
0 → 100755
View file @
ce545bf2
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<geometry
version=
"0.5"
caption=
"hybrid test"
unit=
"m"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation=
"http://xsd.jupedsim.org/0.6/jps_geometry.xsd"
>
<rooms>
<room
id=
"0"
caption=
"hall0"
>
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"0.0"
py=
"2.8"
/>
<vertex
px=
"0.0"
py=
"0.0"
/>
<vertex
px=
"3.6"
py=
"0.0"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"5.2"
py=
"0.0"
/>
<vertex
px=
"9.2"
py=
"0.0"
/>
<vertex
px=
"9.2"
py=
"2.8"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"9.2"
py=
"6.4"
/>
<vertex
px=
"9.2"
py=
"9.2"
/>
<vertex
px=
"5.6"
py=
"9.2"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"3.2"
py=
"9.2"
/>
<vertex
px=
"0.0"
py=
"9.2"
/>
<vertex
px=
"0.0"
py=
"6.4"
/>
</polygon>
</subroom>
</room>
<room
id=
"1"
caption=
"hall1"
>
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"3.6"
py=
"-2.0"
/>
<vertex
px=
"3.6"
py=
"0.0"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"5.2"
py=
"-2.0"
/>
<vertex
px=
"5.2"
py=
"0.0"
/>
</polygon>
</subroom>
</room>
<room
id=
"2"
caption=
"hall2"
>
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"9.2"
py=
"2.8"
/>
<vertex
px=
"11.2"
py=
"3.4"
/>
<vertex
px=
"13.2"
py=
"2.8"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"9.2"
py=
"6.4"
/>
<vertex
px=
"11.2"
py=
"5.8"
/>
<vertex
px=
"13.2"
py=
"6.4"
/>
</polygon>
</subroom>
<!-- <subroom id="1" closed="0" class="floor">
<polygon caption="wall">
<vertex px="11.2" py="2.8" />
<vertex px="13.2" py="2.8" />
</polygon>
<polygon caption="wall">
<vertex px="11.2" py="6.4" />
<vertex px="13.2" py="6.4" />
</polygon>
</subroom>
<crossings>
<crossing id="0" subroom1_id="0" subroom2_id="1">
<vertex py="2.8" px="11.2"/>
<vertex py="6.4" px="11.2"/>
</crossing>
</crossings> -->
</room>
<room
id=
"3"
caption=
"hall3"
>
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"3.2"
py=
"9.2"
/>
<vertex
px=
"3.2"
py=
"11.2"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"5.6"
py=
"9.2"
/>
<vertex
px=
"5.6"
py=
"11.2"
/>
</polygon>
</subroom>
</room>
<room
id=
"4"
caption=
"hall4"
>
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"0.0"
py=
"2.8"
/>
<vertex
px=
"-2.0"
py=
"2.8"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"0.0"
py=
"6.4"
/>
<vertex
px=
"-2.0"
py=
"6.4"
/>
</polygon>
</subroom>
</room>
</rooms>
<transitions>
<transition
id=
"0"
caption=
"exit"
type=
"emergency"
room1_id=
"0"
subroom1_id=
"0"
room2_id=
"1"
subroom2_id=
"0"
>
<vertex
px=
"3.6"
py=
"0.0"
/>
<vertex
px=
"5.2"
py=
"0.0"
/>
</transition>
<transition
id=
"1"
caption=
"exit"
type=
"emergency"
room1_id=
"0"
subroom1_id=
"0"
room2_id=
"2"
subroom2_id=
"0"
>
<vertex
px=
"9.2"
py=
"2.8"
/>
<vertex
px=
"9.2"
py=
"6.4"
/>
</transition>
<transition
id=
"2"
caption=
"exit"
type=
"emergency"
room1_id=
"0"
subroom1_id=
"0"
room2_id=
"3"
subroom2_id=
"0"
>
<vertex
px=
"3.2"
py=
"9.2"
/>
<vertex
px=
"5.6"
py=
"9.2"
/>
</transition>
<transition
id=
"3"
caption=
"exit"
type=
"emergency"
room1_id=
"0"
subroom1_id=
"0"
room2_id=
"4"
subroom2_id=
"0"
>
<vertex
px=
"0.0"
py=
"2.8"
/>
<vertex
px=
"0.0"
py=
"6.4"
/>
</transition>
<transition
id=
"4"
caption=
"exit"
type=
"emergency"
room1_id=
"1"
subroom1_id=
"0"
room2_id=
"-1"
subroom2_id=
"-1"
>
<vertex
px=
"3.6"
py=
"-2.0"
/>
<vertex
px=
"5.20"
py=
"-2.0"
/>
</transition>
<transition
id=
"5"
caption=
"exit"
type=
"emergency"
room1_id=
"2"
subroom1_id=
"0"
room2_id=
"-1"
subroom2_id=
"-1"
>
<vertex
px=
"13.2"
py=
"2.8"
/>
<vertex
px=
"13.2"
py=
"6.4"
/>
</transition>
<transition
id=
"6"
caption=
"exit"
type=
"emergency"
room1_id=
"3"
subroom1_id=
"0"
room2_id=
"-1"
subroom2_id=
"-1"
>
<vertex
px=
"3.2"
py=
"11.2"
/>
<vertex
px=
"5.6"
py=
"11.2"
/>
</transition>
<transition
id=
"7"
caption=
"exit"
type=
"emergency"
room1_id=
"4"
subroom1_id=
"0"
room2_id=
"-1"
subroom2_id=
"-1"
>
<vertex
px=
"-2.0"
py=
"2.8"
/>
<vertex
px=
"-2.0"
py=
"6.4"
/>
</transition>
</transitions>
</geometry>
\ No newline at end of file
inputfiles/hybrid/hybrid_hall_geo_convex.xml
0 → 100755
View file @
ce545bf2
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<geometry
version=
"0.5"
caption=
"hybrid test"
unit=
"m"
xmlns:xsi=
"http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation=
"http://xsd.jupedsim.org/0.6/jps_geometry.xsd"
>
<rooms>
<room
id=
"0"
caption=
"hall0"
>
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"0.0"
py=
"2.8"
/>
<vertex
px=
"0.0"
py=
"0.0"
/>
<vertex
px=
"3.6"
py=
"0.0"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"5.2"
py=
"0.0"
/>
<vertex
px=
"9.2"
py=
"0.0"
/>
<vertex
px=
"9.2"
py=
"3.2"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"9.2"
py=
"6.0"
/>
<vertex
px=
"9.2"
py=
"9.2"
/>
<vertex
px=
"5.6"
py=
"9.2"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"3.2"
py=
"9.2"
/>
<vertex
px=
"0.0"
py=
"9.2"
/>
<vertex
px=
"0.0"
py=
"6.4"
/>
</polygon>
</subroom>
</room>
<room
id=
"1"
caption=
"hall1"
>
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"3.6"
py=
"-2.0"
/>
<vertex
px=
"3.6"
py=
"0.0"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"5.2"
py=
"-2.0"
/>
<vertex
px=
"5.2"
py=
"0.0"
/>
</polygon>
</subroom>
</room>
<room
id=
"2"
caption=
"hall2"
>
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"9.2"
py=
"6.0"
/>
<vertex
px=
"10.2"
py=
"6.8"
/>
<vertex
px=
"11.9"
py=
"6.8"
/>
<vertex
px=
"13.0"
py=
"5.8"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"9.2"
py=
"3.2"
/>
<vertex
px=
"10.2"
py=
"2.4"
/>
<vertex
px=
"11.9"
py=
"2.4"
/>
<vertex
px=
"13.0"
py=
"3.4"
/>
</polygon>
</subroom>
<!-- <subroom id="1" closed="0" class="floor">
<polygon caption="wall">
<vertex px="11.2" py="2.8" />
<vertex px="13.2" py="2.8" />
</polygon>
<polygon caption="wall">
<vertex px="11.2" py="6.4" />
<vertex px="13.2" py="6.4" />
</polygon>
</subroom>
<crossings>
<crossing id="0" subroom1_id="0" subroom2_id="1">
<vertex py="2.8" px="11.2"/>
<vertex py="6.4" px="11.2"/>
</crossing>
</crossings> -->
</room>
<room
id=
"3"
caption=
"hall3"
>
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"3.2"
py=
"9.2"
/>
<vertex
px=
"3.2"
py=
"11.2"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"5.6"
py=
"9.2"
/>
<vertex
px=
"5.6"
py=
"11.2"
/>
</polygon>
</subroom>
</room>
<room
id=
"4"
caption=
"hall4"
>
<subroom
id=
"0"
closed=
"0"
class=
"floor"
>
<polygon
caption=
"wall"
>
<vertex
px=
"0.0"
py=
"2.8"
/>
<vertex
px=
"-2.0"
py=
"2.8"
/>
</polygon>
<polygon
caption=
"wall"
>
<vertex
px=
"0.0"
py=
"6.4"
/>
<vertex
px=
"-2.0"
py=
"6.4"
/>
</polygon>
</subroom>
</room>
</rooms>
<transitions>
<transition
id=
"0"
caption=
"exit"
type=
"emergency"
room1_id=
"0"
subroom1_id=
"0"
room2_id=
"1"
subroom2_id=
"0"
>
<vertex
px=
"3.6"
py=
"0.0"
/>
<vertex
px=
"5.2"
py=
"0.0"
/>
</transition>
<transition
id=
"1"
caption=
"exit"
type=
"emergency"
room1_id=
"0"
subroom1_id=
"0"
room2_id=
"2"
subroom2_id=
"0"
>
<vertex
px=
"9.2"
py=
"3.2"
/>
<vertex
px=
"9.2"
py=
"6.0"
/>
</transition>
<transition
id=
"2"
caption=
"exit"
type=
"emergency"
room1_id=
"0"
subroom1_id=
"0"
room2_id=
"3"
subroom2_id=
"0"
>
<vertex
px=
"3.2"
py=
"9.2"
/>
<vertex
px=
"5.6"
py=
"9.2"
/>
</transition>
<transition
id=
"3"
caption=
"exit"
type=
"emergency"
room1_id=
"0"
subroom1_id=
"0"
room2_id=
"4"
subroom2_id=
"0"
>
<vertex
px=
"0.0"
py=
"2.8"
/>
<vertex
px=
"0.0"
py=
"6.4"
/>
</transition>
<transition
id=
"4"
caption=
"exit"
type=
"emergency"
room1_id=
"1"
subroom1_id=
"0"
room2_id=
"-1"
subroom2_id=
"-1"
>
<vertex
px=
"3.6"
py=
"-2.0"
/>
<vertex
px=
"5.20"
py=
"-2.0"
/>
</transition>
<transition
id=
"5"
caption=
"exit"
type=
"emergency"
room1_id=
"2"
subroom1_id=
"0"
room2_id=
"-1"
subroom2_id=
"-1"
>
<vertex
px=
"13.0"
py=
"3.4"
/>
<vertex
px=
"13.0"
py=
"5.8"
/>
</transition>
<transition
id=
"6"
caption=
"exit"
type=
"emergency"
room1_id=
"3"
subroom1_id=
"0"
room2_id=
"-1"
subroom2_id=
"-1"
>
<vertex
px=
"3.2"
py=
"11.2"
/>
<vertex
px=
"5.6"
py=
"11.2"
/>
</transition>
<transition
id=
"7"
caption=
"exit"
type=
"emergency"
room1_id=
"4"
subroom1_id=
"0"
room2_id=
"-1"
subroom2_id=
"-1"
>
<vertex
px=
"-2.0"
py=
"2.8"
/>
<vertex
px=
"-2.0"
py=
"6.4"
/>
</transition>
</transitions>
</geometry>
\ No newline at end of file
voronoi-boost/VoronoiPositionGenerator.cpp
View file @
ce545bf2
...
...
@@ -119,7 +119,7 @@ bool ComputeBestPositionVoronoiBoost(AgentsSource* src, std::vector<Pedestrian*>
for
(
iter_ped
=
peds
.
begin
();
iter_ped
!=
peds
.
end
();
)
{
Pedestrian
*
ped
=
(
*
iter_ped
);
radius
=
ped
->
GetEllipse
().
GetBmax
();
//max radius of the curren pedestrian
radius
=
ped
->
GetEllipse
().
GetBmax
();
//max radius of the curren
t
pedestrian
if
(
existing_peds
.
size
()
==
0
)
{
...
...
@@ -202,7 +202,7 @@ bool ComputeBestPositionVoronoiBoost(AgentsSource* src, std::vector<Pedestrian*>
double
dis
=
0
;
VoronoiBestVertexMax
(
discrete_positions
,
vd
,
subroom
,
factor
,
chosen_it
,
dis
,
radius
);
if
(
dis
>
2
*
radius
*
factor
*
2
*
radius
*
factor
)
// be careful with the factor!! radius*factor, 2 on purpose instead of 4
if
(
dis
>
4
*
radius
*
factor
*
radius
*
factor
)
// be careful with the factor!! radius*factor, 2,3,4?
{
Point
pos
(
chosen_it
->
x
()
/
factor
,
chosen_it
->
y
()
/
factor
);
//check!
ped
->
SetPos
(
pos
,
true
);
...
...
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