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
6879bdd1
Commit
6879bdd1
authored
Jul 06, 2015
by
Ulrich Kemloh
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
fixed error when zero pedestrians were specified in the ini file
parent
425f839d
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
pedestrian/PedDistributor.cpp
pedestrian/PedDistributor.cpp
+9
-7
No files found.
pedestrian/PedDistributor.cpp
View file @
6879bdd1
...
...
@@ -189,7 +189,8 @@ bool PedDistributor::InitDistributor(const string& fileName, const std::map<int,
bool
PedDistributor
::
Distribute
(
Building
*
building
)
const
{
Log
->
Write
(
"INFO:
\t
Init Distribute"
);
int
nPeds
=
0
;
int
nPeds_is
=
0
;
int
nPeds_expected
=
0
;
// store the position in a map since we are not computing for all rooms/subrooms.
std
::
map
<
int
,
std
::
map
<
int
,
vector
<
Point
>
>
>
allFreePos
;
...
...
@@ -210,6 +211,7 @@ bool PedDistributor::Distribute(Building* building) const
if
(
allFreePosRoom
.
count
(
subroomID
)
>
0
)
continue
;
nPeds_expected
+=
dist
->
GetAgentsNumber
();
allFreePosRoom
[
subroomID
]
=
PedDistributor
::
PossiblePositions
(
*
sr
);
}
...
...
@@ -228,7 +230,7 @@ bool PedDistributor::Distribute(Building* building) const
// the positions were already computed
if
(
allFreePosRoom
.
count
(
subroomID
)
>
0
)
continue
;
nPeds_expected
+=
dist
->
GetAgentsNumber
();
allFreePosRoom
[
subroomID
]
=
PedDistributor
::
PossiblePositions
(
*
it_sr
.
second
);
}
}
...
...
@@ -267,7 +269,7 @@ bool PedDistributor::Distribute(Building* building) const
Log
->
Write
(
"INFO:
\t
Distributing %d Agents in Room/Subrom [%d/%d]! Maximum allowed: %d"
,
N
,
roomID
,
subroomID
,
max_pos
);
DistributeInSubRoom
(
sr
,
N
,
allpos
,
&
pid
,
dist
.
get
(),
building
);
Log
->
Write
(
"
\t
...Done"
);
nPeds
+=
N
;
nPeds
_is
+=
N
;
}
// then continue the distribution according to the rooms
...
...
@@ -343,7 +345,7 @@ bool PedDistributor::Distribute(Building* building) const
DistributeInSubRoom
(
sr
,
akt_anz
[
is
],
allFreePosInRoom
[
is
],
&
pid
,
dist
.
get
(),
building
);
}
}
nPeds
+=
N
;
nPeds
_is
+=
N
;
}
//now populate the sources
...
...
@@ -358,7 +360,7 @@ bool PedDistributor::Distribute(Building* building) const
for
(
int
i
=
0
;
i
<
source
->
GetMaxAgents
();
i
++
)
{
//source->AddToPool(dist->GenerateAgent(building, &pid,emptyPositions));
nPeds
++
;
nPeds
_is
++
;
}
}
}
...
...
@@ -371,12 +373,12 @@ bool PedDistributor::Distribute(Building* building) const
for
(
int
i
=
0
;
i
<
source
->
GetMaxAgents
();
i
++
)
{
//source->AddToPool(dist->GenerateAgent(building, &pid,emptyPositions));
nPeds
++
;
nPeds
_is
++
;
}
}
}
}
return
nPeds
;
return
(
nPeds_is
==
nPeds_expected
)
;
}
...
...
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