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
2fe621fe
Commit
2fe621fe
authored
Jul 04, 2015
by
Mohcine Chraibi
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
change parameters and distribution area in test 13
parent
d2634cb6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
Utest/rimea_tests/test_13/master_ini.xml
Utest/rimea_tests/test_13/master_ini.xml
+2
-2
pedestrian/Pedestrian.cpp
pedestrian/Pedestrian.cpp
+1
-1
No files found.
Utest/rimea_tests/test_13/master_ini.xml
View file @
2fe621fe
...
...
@@ -43,7 +43,7 @@
<!--persons information and distribution -->
<agents
operational_model_id=
"1"
>
<agents_distribution>
<group
group_id=
"0"
agent_parameter_id=
"1"
room_id=
"0"
subroom_id=
"0"
goal_id=
"-1"
number=
"150"
router_id=
"1"
/>
<group
group_id=
"0"
agent_parameter_id=
"1"
room_id=
"0"
subroom_id=
"0"
goal_id=
"-1"
number=
"150"
router_id=
"1"
x_max=
"-2"
x_min=
"-5"
/>
</agents_distribution>
</agents>
...
...
@@ -57,7 +57,7 @@
<exit_crossing_strategy>
4
</exit_crossing_strategy>
<linkedcells
enabled=
"true"
cell_size=
"2.2"
/>
<force_ped
nu=
"0.3"
dist_max=
"3"
disteff_max=
"2"
interpolation_width=
"0.1"
/>
<force_wall
nu=
"
0.35"
dist_max=
"3
"
disteff_max=
"2"
interpolation_width=
"0.1"
/>
<force_wall
nu=
"
1.35"
dist_max=
"5
"
disteff_max=
"2"
interpolation_width=
"0.1"
/>
</model_parameters>
<agent_parameters
agent_parameter_id=
"1"
>
<v0
mu=
"1.3"
sigma=
"0.2"
/>
...
...
pedestrian/Pedestrian.cpp
View file @
2fe621fe
...
...
@@ -377,7 +377,7 @@ double Pedestrian::GetV0Norm() const
double
ped_elevation
=
sub
->
GetElevation
(
_ellipse
.
GetCenter
());
double
nav_elevation
=
sub
->
GetElevation
(
_navLine
->
GetCentre
());
double
delta
=
nav_elevation
-
ped_elevation
;
const
Point
&
pos
=
GetPos
();
//
const Point& pos = GetPos();
// fprintf(stderr, "%f %f %f %f\n", pos.GetX(), pos.GetY(), sub->GetElevation(_ellipse.GetCenter()), 2.0/(1+exp(-9.0*ped_elevation*ped_elevation)));
// we are walking on an even plane
...
...
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