Skip to content
GitLab
Commit 8be9fe25 authored by Ulrich Kemloh's avatar Ulrich Kemloh
Browse files

demo files

parent 4d05f6f0
Hide whitespace changes
Inline Side-by-side
inputfiles/events/hall/big_room_events.xml
View file @ 8be9fe25
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<JPScore project="JPS-Project" version="0.6"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_events.xsd">
<JPScore project="JPS-Project" version="0.6" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_events.xsd">
<events update_frequency="2" update_radius="1" agents_color_by_knowledge="true">
<event time="10" type="door" state="close" id="2" caption="exit" />
<event time="30" type="door" state="close" id="3" caption="exit" />
<event time="30" type="door" state="close" id="3" caption="exit" />
</events>
</JPScore>
inputfiles/events/ini.xml
View file @ 8be9fe25
......@@ -10,7 +10,7 @@ xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_ini_core.xsd">
<max_sim_time>900</max_sim_time>
<events_file>events.xml</events_file>
<!-- trajectories file and format -->
<trajectories format="xml-plain" fps="8" color_mode="group">
<trajectories format="xml-plain" fps="8" color_mode="knowledge">
<file location="testSchulTrajectories.xml" />
<socket hostname="127.0.0.1" port="8989"/>
</trajectories>
......@@ -68,8 +68,8 @@ xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_ini_core.xsd">
<group group_id="6" agent_parameter_id="1" room_id="1" subroom_id="2" number="20" router_id="1" />
</agents_distribution>
<agents_sources><!-- frequency in persons/minute -->
<source id="1" group_id="0" frequency="60" agents_max="150" router_id="1" goal_id="" route_id="" caption="source 1"/>
<agents_sources><!-- frequency in persons/second -->
<source0 id="1" group_id="0" frequency="0" agents_max="150" router_id="1" goal_id="" route_id="" caption="source 1"/>
</agents_sources>
</agents>
......@@ -77,7 +77,7 @@ xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_ini_core.xsd">
<model operational_model_id="1" description="gcfm">
<model_parameters>
<solver>euler</solver>
<stepsize>0.01</stepsize>
<stepsize>0.001</stepsize>
<exit_crossing_strategy>3</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" />
......
inputfiles/hall/ini.xml
View file @ 8be9fe25
......@@ -7,7 +7,7 @@ xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_ini_core.xsd">
<!-- seed used for initialising random generator -->
<seed>12542</seed>
<max_sim_time>10000</max_sim_time>
<max_sim_time>500</max_sim_time>
<!-- geometry file -->
<geometry>geo.xml</geometry>
<!-- trajectories file and format -->
......@@ -34,7 +34,7 @@ xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.6/jps_ini_core.xsd">
<!--persons information and distribution -->
<agents operational_model_id="2">
<agents_distribution>
<group group_id="0" agent_parameter_id="1" room_id="0" subroom_id="0" number="100" goal_id="-1" router_id="1" pre_movement_mean="15" pre_movement_sigma="0.4"/>
<group group_id="0" agent_parameter_id="1" room_id="0" subroom_id="0" number="2" goal_id="-1" router_id="1" pre_movement_mean="15" pre_movement_sigma="0.4"/>
</agents_distribution>
</agents>
......
inputfiles/subway/geometry.xml
View file @ 8be9fe25
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<geometry version="0.5" caption="Projectname" unit="m"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://134.94.2.137/jps_geoemtry.xsd">
<rooms>
<room id="0" caption="subway">
<subroom id="0" closed="0" class="subroom" A_x="0" B_y="0" C="0">
<polygon caption="wall">
<vertex px="0.0" py="1.0" />
<vertex px="0.0" py="0.0" />
<vertex px="20.0" py="0.0" />
<vertex px="20.0" py="1.0" />
</polygon>
<polygon caption="wall">
<vertex px="20.0" py="3.0" />
<vertex px="20.0" py="4.0" />
<vertex px="0.0" py="4.0" />
<vertex px="0.0" py="3.0" />
</polygon>
</subroom>
<subroom id="1" closed="0" class="stair" A_x="-1.2" B_y="0" C="0">
<polygon caption="wall">
<vertex px="0.0" py="1.0" />
<vertex px="-5.0" py="1.0" />
</polygon>
<polygon caption="wall">
<vertex px="0.0" py="3.0" />
<vertex px="-5.0" py="3.0" />
</polygon>
<up px="-5.0" py="2" />
<down px="0.0" py="2" />
</subroom>
<subroom id="2" closed="0" class="stair" A_x="1.2" B_y="0" C="-24">
<polygon caption="wall">
<vertex px="20.0" py="1.0" />
<vertex px="25.0" py="1.0" />
</polygon>
<polygon caption="wall">
<vertex px="20.0" py="3.0" />
<vertex px="25.0" py="3.0" />
</polygon>
<up px="25.0" py="2" />
<down px="20.0" py="2" />
</subroom>
<crossings>
<crossing id="0" subroom1_id="0" subroom2_id="1">
<vertex px="0.0" py="1.0" />
<vertex px="0.0" py="3.0" />
</crossing>
<crossing id="1" subroom1_id="0" subroom2_id="2">
<vertex px="20.0" py="1.0" />
<vertex px="20.0 " py="3.0" />
</crossing>
</crossings>
</room>
<room id="1" caption="Hall">
<subroom id="0" closed="0" class="subroom" A_x="0" B_y="0" C="6">
<polygon caption="wall">
<vertex px="-5.0" py="7.0" />
<vertex px="25.0" py="7.0" />
</polygon>
<polygon caption="wall">
<vertex px="2.0" py="-3.0" />
<vertex px="18.0" py="-3.0" />
</polygon>
<polygon caption="wall">
<vertex px="-5.0" py="-3.0" />
<vertex px="0.0" py="-3.0" />
</polygon>
<polygon caption="wall">
<vertex px="20.0" py="-3.0" />
<vertex px="25.0" py="-3.0" />
</polygon>
<polygon caption="wall">
<vertex px="25.0" py="1.0" />
<vertex px="20.0" py="1.0" />
<vertex px="20.0" py="3.0" />
<vertex px="25.0" py="3.0" />
</polygon>
<polygon caption="wall">
<vertex px="-5.0" py="1.0" />
<vertex px="0.0" py="1.0" />
<vertex px="0.0" py="3.0" />
<vertex px="-5.0" py="3.0" />
</polygon>
</subroom>
<subroom id="1" closed="0" class="subroom" A_x="0" B_y="0" C="6">
<polygon caption="wall">
<vertex px="-5.0" py="-3.0" />
<vertex px="-7.0" py="-3.0" />
<vertex px="-7.0" py="7.0" />
<vertex px="-5.0" py="7.0" />
</polygon>
</subroom>
<subroom id="2" closed="0" class="subroom" A_x="0" B_y="0" C="6">
<polygon caption="wall">
<vertex px="25.0" py="-3.0" />
<vertex px="27.0" py="-3.0" />
<vertex px="27.0" py="7.0" />
<vertex px="25.0" py="7.0" />
</polygon>
</subroom>
<crossings>
<crossing id="2" subroom1_id="0" subroom2_id="2">
<vertex px="25.0" py="-3.0" />
<vertex px="25.0" py="1.0" />
</crossing>
<crossing id="3" subroom1_id="0" subroom2_id="2">
<vertex px="25.0" py="3.0" />
<vertex px="25.0 " py="7.0" />
</crossing>
<crossing id="4" subroom1_id="0" subroom2_id="1">
<vertex px="-5.0" py="-3.0" />
<vertex px="-5.0 " py="1.0" />
</crossing>
<crossing id="5" subroom1_id="0" subroom2_id="1">
<vertex px="-5.0" py="3.0" />
<vertex px="-5.0 " py="7.0" />
</crossing>
</crossings>
</room>
</rooms>
<geometry version="0.5" caption="Projectname" unit="m" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="http://xsd.jupedsim.org/0.7/jps_geometry.xsd">
<rooms>
<room id="0" caption="subway">
<subroom id="0" class="subroom" A_x="0" B_y="0" C="0">
<polygon caption="wall">
<vertex px="0.0" py="1.0" />
<vertex px="0.0" py="0.0" />
<vertex px="20.0" py="0.0" />
<vertex px="20.0" py="1.0" />
</polygon>
<polygon caption="wall">
<vertex px="20.0" py="3.0" />
<vertex px="20.0" py="4.0" />
<vertex px="0.0" py="4.0" />
<vertex px="0.0" py="3.0" />
</polygon>
<obstacle id="0">
<polygon>
<vertex px="1" py="3"></vertex>
<vertex px="2" py="3"></vertex>
<vertex px="2" py="2"></vertex>
<vertex px="1" py="2"></vertex>
<vertex px="1" py="3"></vertex>
</polygon>
</obstacle>
<transitions>
<transition id="6" caption="No_Name" type="emergency" room1_id="0" subroom1_id="1" room2_id="1" subroom2_id="1">
<vertex px="-5.0" py="1.0" />
<vertex px="-5.0" py="3.0" />
</transition>
<transition id="7" caption="No_Name" type="emergency" room1_id="0" subroom1_id="2" room2_id="1" subroom2_id="2">
<vertex px="25.0" py="1.0" />
<vertex px="25.0" py="3.0" />
</transition>
<transition id="8" caption="No_Name" type="emergency" room1_id="1" subroom1_id="0" room2_id="-1" subroom2_id="-1">
<vertex px="0.0" py="-3.0" />
<vertex px="2.0" py="-3.0" />
</transition>
<transition id="9" caption="No_Name" type="emergency" room1_id="1" subroom1_id="0" room2_id="-1" subroom2_id="-1">
<vertex px="18.0" py="-3.0" />
<vertex px="20.0" py="-3.0" />
</transition>
</transitions>
</subroom>
<subroom id="1" class="stair" A_x="-1.2" B_y="0" C="0">
<polygon caption="wall">
<vertex px="0.0" py="1.0" />
<vertex px="-5.0" py="1.0" />
</polygon>
<polygon caption="wall">
<vertex px="0.0" py="3.0" />
<vertex px="-5.0" py="3.0" />
</polygon>
<up px="-5.0" py="2" />
<down px="0.0" py="2" />
</subroom>
<subroom id="2" class="stair" A_x="1.2" B_y="0" C="-24">
<polygon caption="wall">
<vertex px="20.0" py="1.0" />
<vertex px="25.0" py="1.0" />
</polygon>
<polygon caption="wall">
<vertex px="20.0" py="3.0" />
<vertex px="25.0" py="3.0" />
</polygon>
<up px="25.0" py="2" />
<down px="20.0" py="2" />
</subroom>
<crossings>
<crossing id="0" subroom1_id="0" subroom2_id="1">
<vertex px="0.0" py="1.0" />
<vertex px="0.0" py="3.0" />
</crossing>
<crossing id="1" subroom1_id="0" subroom2_id="2">
<vertex px="20.0" py="1.0" />
<vertex px="20.0 " py="3.0" />
</crossing>
</crossings>
</room>
<room id="1" caption="Hall">
<subroom id="0" class="subroom" A_x="0" B_y="0" C="6">
<polygon caption="wall">
<vertex px="-5.0" py="7.0" />
<vertex px="25.0" py="7.0" />
</polygon>
<polygon caption="wall">
<vertex px="2.0" py="-3.0" />
<vertex px="18.0" py="-3.0" />
</polygon>
<polygon caption="wall">
<vertex px="-5.0" py="-3.0" />
<vertex px="0.0" py="-3.0" />
</polygon>
<polygon caption="wall">
<vertex px="20.0" py="-3.0" />
<vertex px="25.0" py="-3.0" />
</polygon>
<polygon caption="wall">
<vertex px="25.0" py="1.0" />
<vertex px="20.0" py="1.0" />
<vertex px="20.0" py="3.0" />
<vertex px="25.0" py="3.0" />
</polygon>
<polygon caption="wall">
<vertex px="-5.0" py="1.0" />
<vertex px="0.0" py="1.0" />
<vertex px="0.0" py="3.0" />
<vertex px="-5.0" py="3.0" />
</polygon>
</subroom>
<subroom id="1" class="subroom" A_x="0" B_y="0" C="6">
<polygon caption="wall">
<vertex px="-5.0" py="-3.0" />
<vertex px="-7.0" py="-3.0" />
<vertex px="-7.0" py="7.0" />
<vertex px="-5.0" py="7.0" />
</polygon>
</subroom>
<subroom id="2" class="subroom" A_x="0" B_y="0" C="6">
<polygon caption="wall">
<vertex px="25.0" py="-3.0" />
<vertex px="27.0" py="-3.0" />
<vertex px="27.0" py="7.0" />
<vertex px="25.0" py="7.0" />
</polygon>
</subroom>
<crossings>
<crossing id="2" subroom1_id="0" subroom2_id="2">
<vertex px="25.0" py="-3.0" />
<vertex px="25.0" py="1.0" />
</crossing>
<crossing id="3" subroom1_id="0" subroom2_id="2">
<vertex px="25.0" py="3.0" />
<vertex px="25.0 " py="7.0" />
</crossing>
<crossing id="4" subroom1_id="0" subroom2_id="1">
<vertex px="-5.0" py="-3.0" />
<vertex px="-5.0 " py="1.0" />
</crossing>
<crossing id="5" subroom1_id="0" subroom2_id="1">
<vertex px="-5.0" py="3.0" />
<vertex px="-5.0 " py="7.0" />
</crossing>
</crossings>
</room>
</rooms>
<transitions>
<transition id="6" caption="No_Name" type="emergency" room1_id="0" subroom1_id="1" room2_id="1" subroom2_id="1">
<vertex px="-5.0" py="1.0" />
<vertex px="-5.0" py="3.0" />
</transition>
<transition id="7" caption="No_Name" type="emergency" room1_id="0" subroom1_id="2" room2_id="1" subroom2_id="2">
<vertex px="25.0" py="1.0" />
<vertex px="25.0" py="3.0" />
</transition>
<transition id="8" caption="No_Name" type="emergency" room1_id="1" subroom1_id="0" room2_id="-1" subroom2_id="-1">
<vertex px="0.0" py="-3.0" />
<vertex px="2.0" py="-3.0" />
</transition>
<transition id="9" caption="No_Name" type="emergency" room1_id="1" subroom1_id="0" room2_id="-1" subroom2_id="-1">
<vertex px="18.0" py="-3.0" />
<vertex px="20.0" py="-3.0" />
</transition>
</transitions>
</geometry>
inputfiles/subway/ini_subway.xml
View file @ 8be9fe25
......@@ -8,7 +8,7 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<!-- geometry file -->
<geometry>geometry.xml</geometry>
<!-- trajectories file and format -->
<trajectories format="xml-plain" fps="8">
<trajectories format="xml-plain" fps="8" color_mode="group">
<file location="trajectorie.xml" />
<socket hostname="localhost" port="8989" />
</trajectories>
......@@ -39,8 +39,9 @@ xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<!--persons information and distribution -->
<agents operational_model_id="2">
<agents_distribution>
<group group_id="1" agent_parameter_id="1" room_id="0" subroom_id="0" number="100" goal_id="-1" router_id="1" />
<group group_id="2" agent_parameter_id="1" room_id="0" subroom_id="0" number="100" goal_id="-1" router_id="1"
<group group_id="3" agent_parameter_id="1" room_id="0" subroom_id="0" number="20" goal_id="-1" router_id="1" />
<group group_id="1" agent_parameter_id="1" room_id="0" subroom_id="0" number="10" goal_id="-1" router_id="1" />
<group group_id="2" agent_parameter_id="1" room_id="0" subroom_id="0" number="10" goal_id="-1" router_id="1"
pre_movement_mean="15" pre_movement_sigma="0.6" />
</agents_distribution>
......
scripts/update_version.sh
View file @ 8be9fe25
#!/bin/sh
old_version='v0.5'
new_version='v0.6'
old_version='v0.7'
new_version='v0.7'
#old_version='http://134.94.2.137/jps_ini_core.xsd'
#new_version='http://xsd.jupedsim.org/0.6/jps_ini_core.xsd'
for f in $(find ../ -name '*.cpp' -or -name '*.h' -or -name '*.xml' -or -name '*.py');
#for f in $(find ../ -name '*.cpp' -or -name '*.h' -or -name '*.xml' -or -name '*.py');
for f in $(find ../ -name '*.cpp' -or -name '*.h' );
do
#file uptodate
if grep -R -q "$new_version" $f; then
echo "File $f is uptodate"
#echo "File $f is uptodate"
continue
fi
if grep -R -q "$old_version" $f; then
echo "Processing $f $old_version ---> $new_version"
sed -i "s/${old_version}/${new_version}/g" $f
# sed -i "s/${old_version}/${new_version}/g" $f
else
echo "File $f does not contain a version number"
fi
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment