From 4510345f0c1990a93c1e77314cdf86bde55decd3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Gregor=20J=C3=A4ger?= <gregor.jaeger@uni-wuppertal.de>
Date: Mon, 24 Jun 2019 09:28:15 +0200
Subject: [PATCH] issue 325, changing of demos and inifiles with <header> based
on commit cc10c9cc
---
demos/scenario_10_big_room/inifile_big.xml | 43 ++++++++++---------
demos/scenario_11_sources/inifile.xml | 28 ++++++------
.../wa_triangle_ini.xml | 33 +++++++-------
demos/scenario_13_schedule/schedule_ini.xml | 31 +++++++------
demos/scenario_1_corridor/corridor_ini.xml | 33 +++++++-------
.../scenario_2_bottleneck/bottleneck_ini.xml | 26 +++++------
demos/scenario_3_corner/corner_ini.xml | 28 ++++++------
demos/scenario_4_stairs/stairs_ini.xml | 40 +++++++++--------
demos/scenario_5_events/events_ini.xml | 34 ++++++++-------
demos/scenario_5_ship/bateau_ini.xml | 35 +++++++--------
.../cogninitive_map_ini.xml | 33 +++++++-------
demos/scenario_7_floorfield/ffRouter_ini.xml | 31 ++++++-------
12 files changed, 206 insertions(+), 189 deletions(-)
diff --git a/demos/scenario_10_big_room/inifile_big.xml b/demos/scenario_10_big_room/inifile_big.xml
index 5621b76b..846ab791 100644
--- a/demos/scenario_10_big_room/inifile_big.xml
+++ b/demos/scenario_10_big_room/inifile_big.xml
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8" ?>
<JuPedSim project="JPS-Project" version="0.8"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>12542</seed>
- <max_sim_time>1800</max_sim_time>
- <num_threads>1</num_threads>
- <show_statistics>true</show_statistics>
- <logfile>log.txt</logfile>
- <!-- geometry file -->
- <geometry>geometry.xml</geometry>
- <!-- trajectories file and format -->
- <trajectories format="xml-plain" fps="8">
- <file location="CS1_traj.xml" />
- <!--<socket hostname="127.0.0.1" port="8989"/> -->
- </trajectories>
- <!-- where to store the logs -->
- <!--<logfile>log.txt</logfile> -->
-
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>12542</seed>
+ <max_sim_time>1800</max_sim_time>
+ <num_threads>1</num_threads>
+ <show_statistics>true</show_statistics>
+ <logfile>log.txt</logfile>
+ <!-- geometry file -->
+ <geometry>geometry.xml</geometry>
+ <!-- trajectories file and format -->
+ <trajectories format="xml-plain" fps="8">
+ <file location="CS1_traj.xml" />
+ <!--<socket hostname="127.0.0.1" port="8989"/> -->
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>log.txt</logfile>
+ </header>
<!-- traffic information: e.g closed doors -->
<traffic_constraints>
@@ -69,7 +70,7 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<atau mu="0.5" sigma="0.001" />
</agent_parameters>
</model>
-
+
<model operational_model_id="2" description="gompertz">
<model_parameters>
<solver>euler</solver>
@@ -96,7 +97,7 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<atau mu="0.5" sigma="0.001" />
</agent_parameters>
</model>
-
+
<model operational_model_id="3" description="Tordeux2015">
<model_parameters>
<solver>euler</solver>
@@ -127,9 +128,9 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<!-- <parameters> -->
<!-- <navigation_lines file="routing.xml" /> -->
<!-- </parameters> -->
-
+
</router>
-
+
</route_choice_models>
</JuPedSim>
diff --git a/demos/scenario_11_sources/inifile.xml b/demos/scenario_11_sources/inifile.xml
index 82eed7ab..e0e3866e 100644
--- a/demos/scenario_11_sources/inifile.xml
+++ b/demos/scenario_11_sources/inifile.xml
@@ -2,20 +2,20 @@
<JuPedSim project="JPS-Project" version="0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>12542</seed>
- <!-- geometry file -->
- <geometry>geometry.xml</geometry>
- <max_sim_time>5000</max_sim_time>
-
- <!-- trajectories file and format -->
- <trajectories format="xml-plain" fps="16" color_mode="group">
- <file location="trajectories.xml" />
- <!-- <socket_ hostname="127.0.0.1" port="8989" /> -->
- </trajectories>
-
- <!-- where to store the logs -->
- <logfile>log.txt</logfile>
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>12542</seed>
+ <!-- geometry file -->
+ <geometry>geometry.xml</geometry>
+ <max_sim_time>5000</max_sim_time>
+ <!-- trajectories file and format -->
+ <trajectories format="xml-plain" fps="16" color_mode="group">
+ <file location="trajectories.xml" />
+ <!-- <socket_ hostname="127.0.0.1" port="8989" /> -->
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>log.txt</logfile>
+ </header>
<!-- traffic information: e.g closed doors or smoked rooms -->
<traffic_constraints>
diff --git a/demos/scenario_12_waiting_area/wa_triangle_ini.xml b/demos/scenario_12_waiting_area/wa_triangle_ini.xml
index 4192c019..7ccbdd31 100644
--- a/demos/scenario_12_waiting_area/wa_triangle_ini.xml
+++ b/demos/scenario_12_waiting_area/wa_triangle_ini.xml
@@ -4,22 +4,23 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://134.94.2.137/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>12542</seed>
- <!-- geometry file -->
- <max_sim_time>300</max_sim_time>
- <geometry>wa_triangle_geo.xml</geometry>
- <!--<geometry>wa_triangle_geo_wa_outside3.xml</geometry>-->
- <!--<events_file>events_list.xml</events_file>-->
- <!--<event_realtime>events.txt</event_realtime>-->
- <num_threads>1</num_threads>
-
- <!-- traectories file and format -->
- <trajectories format="xml-plain" fps="8">
- <file location="wa_triangle_traj.xml" />
- </trajectories>
- <!-- where to store the logs -->
- <!--<logfile>log.txt</logfile>-->
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>12542</seed>
+ <!-- geometry file -->
+ <max_sim_time>300</max_sim_time>
+ <geometry>wa_triangle_geo.xml</geometry>
+ <!--<geometry>wa_triangle_geo_wa_outside3.xml</geometry>-->
+ <!--<events_file>events_list.xml</events_file>-->
+ <!--<event_realtime>events.txt</event_realtime>-->
+ <num_threads>1</num_threads>
+ <!-- traectories file and format -->
+ <trajectories format="xml-plain" fps="8">
+ <file location="wa_triangle_traj.xml" />
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>log.txt</logfile>
+ </header>
<!-- traffic information: e.g closed doors or smoked rooms -->
<!--<traffic_constraints>-->
diff --git a/demos/scenario_13_schedule/schedule_ini.xml b/demos/scenario_13_schedule/schedule_ini.xml
index ced4e758..b26cbaba 100644
--- a/demos/scenario_13_schedule/schedule_ini.xml
+++ b/demos/scenario_13_schedule/schedule_ini.xml
@@ -4,20 +4,23 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://134.94.2.137/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>12542</seed>
- <!-- geometry file -->
- <max_sim_time>110</max_sim_time>
- <geometry>schedule_geo.xml</geometry>
- <num_threads>1</num_threads>
- <!-- traectories file and format -->
- <trajectories format="xml-plain" fps="8">
- <file location="schedule_traj.xml" />
- </trajectories>
- <!-- where to store the logs -->
- <!--<logfile>log.txt</logfile>-->
- <events_file>events.xml</events_file>
- <schedule_file>schedule.xml</schedule_file>
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>12542</seed>
+ <!-- geometry file -->
+ <max_sim_time>110</max_sim_time>
+ <geometry>schedule_geo.xml</geometry>
+ <num_threads>1</num_threads>
+ <!-- traectories file and format -->
+ <trajectories format="xml-plain" fps="8">
+ <file location="schedule_traj.xml" />
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>log.txt</logfile>
+ <!-- events and schedule files -->
+ <events_file>events.xml</events_file>
+ <schedule_file>schedule.xml</schedule_file>
+ </header>
<!-- traffic information: e.g closed doors or smoked rooms -->
<traffic_constraints>
diff --git a/demos/scenario_1_corridor/corridor_ini.xml b/demos/scenario_1_corridor/corridor_ini.xml
index 944c76e1..fb7f8e1e 100644
--- a/demos/scenario_1_corridor/corridor_ini.xml
+++ b/demos/scenario_1_corridor/corridor_ini.xml
@@ -1,23 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<JuPedSim project="JPS-Project" version="0.7"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<JuPedSim project="JPS-Project" version="0.7"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>1254</seed>
- <progressbar/>
- <max_sim_time>200</max_sim_time>
- <!-- geometry file -->
- <geometry>corridor_geo.xml</geometry>
- <!-- trajectories file and format -->
- <trajectories format="xml-plain" fps="8">
- <file location="corridor_traj.xml" />
- <!--<socket hostname="127.0.0.1" port="8989"/> -->
- </trajectories>
- <!-- where to store the logs -->
- <!--<logfile>log.txt</logfile> -->
-
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>1254</seed>
+ <progressbar/>
+ <max_sim_time>200</max_sim_time>
+ <!-- geometry file -->
+ <geometry>corridor_geo.xml</geometry>
+ <!-- trajectories file and format -->
+ <trajectories format="xml-plain" fps="8">
+ <file location="corridor_traj.xml" />
+ <!--<socket hostname="127.0.0.1" port="8989"/> -->
+ </trajectories>
+ <!-- where to store the logs -->
+ <!--<logfile>log.txt</logfile> -->
+ </header>
<!-- traffic information: e.g closed doors -->
<traffic_constraints>
diff --git a/demos/scenario_2_bottleneck/bottleneck_ini.xml b/demos/scenario_2_bottleneck/bottleneck_ini.xml
index c89fedb5..15e803d3 100644
--- a/demos/scenario_2_bottleneck/bottleneck_ini.xml
+++ b/demos/scenario_2_bottleneck/bottleneck_ini.xml
@@ -4,18 +4,20 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://134.94.2.137/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>12542</seed>
- <!-- geometry file -->
- <max_sim_time>100</max_sim_time>
- <geometry>bottleneck_geo.xml</geometry>
- <!-- traectories file and format -->
- <trajectories format="xml-plain" fps="8">
- <file location="bottleneck_traj.xml" />
- </trajectories>
- <!-- where to store the logs -->
- <logfile>log.txt</logfile>
-
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>12542</seed>
+ <!-- geometry file -->
+ <max_sim_time>100</max_sim_time>
+ <geometry>bottleneck_geo.xml</geometry>
+ <!-- traectories file and format -->
+ <trajectories format="xml-plain" fps="8">
+ <file location="bottleneck_traj.xml" />
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>log.txt</logfile>
+ </header>
+
<!-- traffic information: e.g closed doors or smoked rooms -->
<traffic_constraints>
<!-- doors states are: close or open -->
diff --git a/demos/scenario_3_corner/corner_ini.xml b/demos/scenario_3_corner/corner_ini.xml
index ce11154c..fa5ddb04 100644
--- a/demos/scenario_3_corner/corner_ini.xml
+++ b/demos/scenario_3_corner/corner_ini.xml
@@ -1,20 +1,22 @@
<?xml version="1.0" encoding="UTF-8" ?>
<JuPedSim project="JPS-Project" version="0.7"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>12542</seed>
- <max_sim_time>500</max_sim_time>
- <!-- geometry file -->
- <geometry>corner_geo.xml</geometry>
- <!-- traectories file and format -->
- <trajectories format="xml-plain" fps="8">
- <file location="corner_trajectories.xml" />
- </trajectories>
- <!-- where to store the logs
- <logfile>log</logfile> -->
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>12542</seed>
+ <max_sim_time>500</max_sim_time>
+ <!-- geometry file -->
+ <geometry>corner_geo.xml</geometry>
+ <!-- traectories file and format -->
+ <trajectories format="xml-plain" fps="8">
+ <file location="corner_trajectories.xml" />
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>log</logfile>
+ </header>
<!-- traffic information: e.g closed doors or smoked rooms -->
<traffic_constraints>
@@ -111,4 +113,4 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
</router>
</route_choice_models>
-</JuPedSim>
\ No newline at end of file
+</JuPedSim>
diff --git a/demos/scenario_4_stairs/stairs_ini.xml b/demos/scenario_4_stairs/stairs_ini.xml
index 2ebcbb2c..d8dc77f5 100644
--- a/demos/scenario_4_stairs/stairs_ini.xml
+++ b/demos/scenario_4_stairs/stairs_ini.xml
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<JuPedSim project="Subway-Project" version="0.7"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<JuPedSim project="Subway-Project" version="0.7"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>12542</seed>
- <!-- max simulation time in seconds-->
- <max_sim_time>300</max_sim_time>
- <!-- geometry file -->
- <geometry>stairs_geo.xml</geometry>
- <num_threads>1</num_threads>
- <!-- traectories file and format -->
- <trajectories format="xml-plain" fps="8">
- <file location="stairs_traj.xml" />
- </trajectories>
- <!-- where to store the logs -->
- <logfile>log_stairs</logfile>
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>12542</seed>
+ <!-- max simulation time in seconds-->
+ <max_sim_time>300</max_sim_time>
+ <!-- geometry file -->
+ <geometry>stairs_geo.xml</geometry>
+ <num_threads>1</num_threads>
+ <!-- traectories file and format -->
+ <trajectories format="xml-plain" fps="8">
+ <file location="stairs_traj.xml" />
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>log_stairs</logfile>
+ </header>
<!-- traffic information: e.g closed doors or smoked rooms -->
<traffic_constraints>
@@ -24,8 +26,8 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<doors>
</doors>
</traffic_constraints>
-
-
+
+
<routing>
<goals>
<goal id="0" final="true" caption="goal 0">
@@ -40,7 +42,7 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
</goals>
</routing>
-
+
<!--persons information and distribution -->
<agents operational_model_id="2">
<agents_distribution>
@@ -116,6 +118,6 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<parameters>
</parameters>
</router>
-
+
</route_choice_models>
</JuPedSim>
diff --git a/demos/scenario_5_events/events_ini.xml b/demos/scenario_5_events/events_ini.xml
index cbdb6eb3..c8ed19db 100644
--- a/demos/scenario_5_events/events_ini.xml
+++ b/demos/scenario_5_events/events_ini.xml
@@ -1,22 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<JuPedSim project="JPS-Project" version="0.7"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<JuPedSim project="JPS-Project" version="0.7"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>12542</seed>
- <!-- geometry file -->
- <geometry>events_geo.xml</geometry>
- <max_sim_time>900</max_sim_time>
- <events_file>events_list.xml</events_file>
- <!-- trajectories file and format -->
- <trajectories format="xml-plain" fps="8">
- <file location="event_traj.xml" />
-<!-- <socket hostname="127.0.0.1" port="8989"/> -->
- </trajectories>
- <!-- where to store the logs -->
- <logfile>log.txt</logfile>
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>12542</seed>
+ <!-- geometry file -->
+ <geometry>events_geo.xml</geometry>
+ <max_sim_time>900</max_sim_time>
+ <events_file>events_list.xml</events_file>
+ <!-- trajectories file and format -->
+ <trajectories format="xml-plain" fps="8">
+ <file location="event_traj.xml" />
+ <!-- <socket hostname="127.0.0.1" port="8989"/> -->
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>log.txt</logfile>
+ </header>
<!-- traffic information: e.g closed doors or smoked rooms -->
<traffic_constraints>
@@ -135,7 +137,7 @@ xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_ini_core.xsd">
</router>
<router router_id="2" description="ff_global_shortest"/>
-
+
</route_choice_models>
</JuPedSim>
diff --git a/demos/scenario_5_ship/bateau_ini.xml b/demos/scenario_5_ship/bateau_ini.xml
index 36351fa3..ca850bd5 100644
--- a/demos/scenario_5_ship/bateau_ini.xml
+++ b/demos/scenario_5_ship/bateau_ini.xml
@@ -1,23 +1,24 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<JuPedSim project="JPS-Project" version="0.6"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<JuPedSim project="JPS-Project" version="0.6"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>12542</seed>
- <!-- maximal simulation time -->
- <max_sim_time>900</max_sim_time>
- <!-- geometry file -->
- <geometry>bateau_geo.xml</geometry>
- <!-- trajectories file and format -->
- <trajectories format="xml-plain" fps="8">
- <file location="bateau_traj.xml" />
- <!-- <socket hostname="127.0.0.1" port="8989"/> -->
- </trajectories>
- <!-- where to store the logs -->
- <!--<logfile>log.txt</logfile> -->
-
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>12542</seed>
+ <!-- maximal simulation time -->
+ <max_sim_time>900</max_sim_time>
+ <!-- geometry file -->
+ <geometry>bateau_geo.xml</geometry>
+ <!-- trajectories file and format -->
+ <trajectories format="xml-plain" fps="8">
+ <file location="bateau_traj.xml" />
+ <!-- <socket hostname="127.0.0.1" port="8989"/> -->
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>log.txt</logfile>
+ </header>
<!-- traffic information: e.g closed doors or smoked rooms -->
<traffic_constraints>
@@ -31,7 +32,7 @@ xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_ini_core.xsd">
</traffic_constraints>
<routing>
-
+
</routing>
<!--persons information and distribution -->
diff --git a/demos/scenario_6_cognitive_map/cogninitive_map_ini.xml b/demos/scenario_6_cognitive_map/cogninitive_map_ini.xml
index 2bc95ab3..34af9cff 100644
--- a/demos/scenario_6_cognitive_map/cogninitive_map_ini.xml
+++ b/demos/scenario_6_cognitive_map/cogninitive_map_ini.xml
@@ -1,25 +1,26 @@
<?xml version="1.0" encoding="UTF-8" ?>
-<JuPedSim project="JPS-Project" version="0.7"
-xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+<JuPedSim project="JPS-Project" version="0.7"
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.7/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>12542</seed>
- <max_sim_time>900</max_sim_time>
- <!-- geometry file -->
- <geometry>cognitive_map_geo.xml</geometry>
- <!-- trajectories file and format -->
- <trajectories format="xml-plain" fps="8">
- <file location="cognitive_map_traj.xml" />
- <!--<socket hostname="127.0.0.1" port="8989"/> -->
- </trajectories>
- <!-- where to store the logs -->
- <!--<logfile>outputfiles/log.txt</logfile> -->
-
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>12542</seed>
+ <max_sim_time>900</max_sim_time>
+ <!-- geometry file -->
+ <geometry>cognitive_map_geo.xml</geometry>
+ <!-- trajectories file and format -->
+ <trajectories format="xml-plain" fps="8">
+ <file location="cognitive_map_traj.xml" />
+ <!--<socket hostname="127.0.0.1" port="8989"/> -->
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>outputfiles/log.txt</logfile>
+ </header>
<!-- traffic information: e.g closed doors or smoked rooms -->
- <traffic_constraints>
+ <traffic_constraints>
<!-- room states are: good or smoked -->
<!-- <rooms> -->
<!-- <room room_id="0" state="good" /> -->
diff --git a/demos/scenario_7_floorfield/ffRouter_ini.xml b/demos/scenario_7_floorfield/ffRouter_ini.xml
index 218ea7f6..517fce64 100644
--- a/demos/scenario_7_floorfield/ffRouter_ini.xml
+++ b/demos/scenario_7_floorfield/ffRouter_ini.xml
@@ -2,19 +2,20 @@
<JuPedSim project="JPS-Project" version="0.8" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
- <!-- seed used for initialising random generator -->
- <seed>6943</seed>
- <max_sim_time>200</max_sim_time>
- <!-- geometry file -->
- <geometry>Kobes_geo.xml</geometry>
- <!-- trajectories file and format -->
- <trajectories format="xml-plain" fps="16">
- <file location="Kobes_traj.xml" />
- <!-- <socket hostname="127.0.0.1" port="8989"/> -->
- </trajectories>
- <!-- where to store the logs -->
- <logfile>log.txt</logfile>
-
+ <header>
+ <!-- seed used for initialising random generator -->
+ <seed>6943</seed>
+ <max_sim_time>200</max_sim_time>
+ <!-- geometry file -->
+ <geometry>Kobes_geo.xml</geometry>
+ <!-- trajectories file and format -->
+ <trajectories format="xml-plain" fps="16">
+ <file location="Kobes_traj.xml" />
+ <!-- <socket hostname="127.0.0.1" port="8989"/> -->
+ </trajectories>
+ <!-- where to store the logs -->
+ <logfile>log.txt</logfile>
+ </header>
<!-- traffic information: e.g closed doors -->
<traffic_constraints>
@@ -162,11 +163,11 @@
<route_choice_models>
<router router_id="7" description="ff_global_shortest">
<parameters>
- <!-- extra routing information
+ <!-- extra routing information
<navigation_lines file="Kobes_routing.xml"/> -->
</parameters>
</router>
-
+
<!-- <router router_id="5" description="cognitive_map">
<sensors>
<sensor sensor_id="1" description="Room2Corridor" status="activated"/>
--
GitLab