Commit 8491367f authored by Ulrich Kemloh's avatar Ulrich Kemloh

updating schema files

parent 266bb844
JuPedSim contributors:
Andrea Portz
......
<?xml version="1.0" encoding="UTF-8" ?>
<JuPedSim project="JPS-Project" version="0.5"
<JuPedSim project="JPS-Project" version="0.6"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://134.94.2.137/jps_ini_core.xsd">
xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<!-- seed used for initialising random generator -->
<seed>12542</seed>
......@@ -111,7 +111,7 @@
<router router_id="1" description="global_shortest">
<parameters>
<navigation_mesh method="triangulation" use_for_local_planning="false" />
<!-- <navigation_lines file="routing.xml" /> -->
<navigation_lines file="routing.xml" />
</parameters>
</router>
</route_choice_models>
......
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
<JPScore project="JPS-Project" version="0.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/jps_events.xsd">
<JPScore project="JPS-Project" version="0.6"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="../../xsd/jps_events.xsd">
<events update_frequency="2" update_radius="1" agents_color_by_knowledge="true">
<event time="15" type="door" state="close" id="8" caption="left_exit" />
<event time="50" type="door" state="open" id="8" caption="left_exit" />
......@@ -9,13 +11,3 @@
<event time="130" type="door" state="close" id="8" caption="main_exit" />
</events>
</JPScore>
<!-- <JPScore project="JPS-Project" version="0.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="../../xsd/jps_events.xsd"> -->
<!-- <events update_frequency="1" update_radius="2" agents_color_by_knowledge="true"> -->
<!-- <event time="1" type="door" state="close" id="8" caption="left_exit" /> -->
<!-- <event time="10" type="door" state="open" id="8" caption="left_exit" /> -->
<!-- <event time="25" type="door" state="close" id="4" caption="main_exit" /> -->
<!-- <event time="40" type="door" state="open" id="4" caption="main_exit" /> -->
<!-- <event time="370" type="door" state="close" id="8" caption="main_exit" /> -->
<!-- </events> -->
<!-- </JPScore> -->
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8" ?>
<JuPedSim project="JPS-Project" version="0.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="ini.xsd">
<JuPedSim project="JPS-Project" version="0.5" 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>
<!-- geometry file -->
<geometry>geo.xml</geometry>
<max_sim_time>900</max_sim_time>
<events>events.xml</events>
<events_file>events.xml</events_file>
<!-- trajectories file and format -->
<trajectories format="xml-plain" fps="8">
<file location="testSchulTrajectories.xml" />
......@@ -18,12 +19,6 @@
<!-- traffic information: e.g closed doors or smoked rooms -->
<traffic_constraints>
<!-- room states are: good or smoked -->
<rooms>
<room room_id="0" state="good" />
<room room_id="1" state="good" />
<room room_id="2" state="good" />
</rooms>
<!-- doors states are: close or open -->
<doors>
<door trans_id="0" caption="roomdoor0" state="open" />
......@@ -36,7 +31,6 @@
<door trans_id="7" caption="roomdoor7" state="open" />
<door trans_id="8" caption="left_exit" state="open" />
</doors>
</traffic_constraints>
<routing>
......@@ -60,11 +54,6 @@
</polygon>
</goal>
</goals>
<routes>
<route id="1">0</route>
<route id="2">1</route>
</routes>
</routing>
<!--persons information and distribution -->
......
<?xml version="1.0" encoding="UTF-8" ?>
<JuPedSim project="JPS-Project" version="0.5" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:noNamespaceSchemaLocation="http://134.94.2.137/jps_ini_core.xsd">
xsi:noNamespaceSchemaLocation="../../xsd/jps_ini_core.xsd">
<!-- seed used for initialising random generator -->
<seed>12542</seed>
......@@ -17,18 +17,10 @@ xsi:noNamespaceSchemaLocation="http://134.94.2.137/jps_ini_core.xsd">
<!-- traffic information: e.g closed doors or smoked rooms -->
<traffic_constraints>
<!-- room states are: good or smoked -->
<!-- <rooms> -->
<!-- <room room_id="0" state="good" /> -->
<!-- </rooms> -->
<!-- doors states are: close or open -->
<doors>
</doors>
<doors> </doors>
</traffic_constraints>
<routing>
<goals>
<goal id="0" final="true" caption="goal 0">
......@@ -48,6 +40,8 @@ xsi:noNamespaceSchemaLocation="http://134.94.2.137/jps_ini_core.xsd">
<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"
pre_movement_mean="15" pre_movement_sigma="0.6" />
</agents_distribution>
<!-- frequency in persons/minute -->
......
<?xml version="1.0" encoding="UTF-8"?>
<xs:schema attributeFormDefault="unqualified" elementFormDefault="qualified" xmlns:xs="http://www.w3.org/2001/XMLSchema">
<xs:element name="JPScore">
<xs:complexType>
......@@ -10,21 +11,44 @@
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:float" name="time" use="required"/>
<xs:attribute type="xs:string" name="type" use="required"/>
<xs:attribute type="xs:string" name="state" use="required"/>
<xs:attribute type="xs:int" name="id" use="required" />
<xs:attribute type="xs:float" name="time" use="required" />
<xs:attribute type="xs:int" name="id" use="required" />
<xs:attribute type="xs:string" name="caption" use="optional" />
<xs:attribute name="type" use="optional">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="door" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="state" use="optional">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="open" />
<xs:enumeration value="close" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute type="xs:float" name="update_frequency" use="required" />
<xs:attribute type="xs:float" name="update_radius" use="required" />
<xs:attribute name="agents_color_by_knowledge" use="optional">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:enumeration value="true" />
<xs:enumeration value="false" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:attribute type="xs:string" name="project" use="required"/>
<xs:attribute type="xs:float" name="version" use="required"/>
<xs:attribute type="xs:string" name="project" />
<xs:attribute type="xs:float" name="version" />
</xs:complexType>
</xs:element>
</xs:schema>
\ No newline at end of file
</xs:schema>
......@@ -81,7 +81,7 @@
<xs:attribute type="xs:int" name="closed" use="optional" />
<xs:attribute type="xs:float" name="A_x" use="optional" />
<xs:attribute type="xs:float" name="B_y" use="optional" />
<xs:attribute type="xs:float" name="C_z" use="optional" />
<xs:attribute type="xs:float" name="C" use="optional" />
<xs:attribute name="class" use="required">
<xs:simpleType>
<xs:restriction base="xs:string">
......
......@@ -2,18 +2,19 @@
<xs:schema xmlns:xs="http://www.w3.org/2001/XMLSchema" attributeFormDefault="unqualified" elementFormDefault="qualified">
<xs:element name="JuPedSim">
<xs:complexType>
<xs:sequence>
<xs:all>
<xs:element type="xs:int" name="seed" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>seed used for initialising random generator</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element type="xs:int" name="num_cpus" minOccurs="0" maxOccurs="1">
<xs:element type="xs:int" name="num_threads" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>maximal simulation time</xs:documentation>
</xs:annotation>
</xs:element>
<xs:element type="xs:float" name="max_sim_time" minOccurs="0" maxOccurs="1" />
<xs:element type="xs:string" name="events_file" minOccurs="0" maxOccurs="1" />
<xs:element type="xs:string" name="geometry" minOccurs="1" maxOccurs="1">
<xs:annotation>
<xs:documentation>geometry file</xs:documentation>
......@@ -163,6 +164,8 @@
<xs:attribute type="xs:float" name="x_max" use="optional" />
<xs:attribute type="xs:float" name="y_min" use="optional" />
<xs:attribute type="xs:float" name="y_max" use="optional" />
<xs:attribute type="xs:float" name="pre_movement_mean" use="optional" />
<xs:attribute type="xs:float" name="pre_movement_sigma" use="optional" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
......@@ -250,6 +253,26 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="v0_upstairs" maxOccurs="1" minOccurs="0">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:float" name="mu" use="required" />
<xs:attribute type="xs:float" name="sigma" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="v0_downstairs" maxOccurs="1" minOccurs="0">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute type="xs:float" name="mu" use="required" />
<xs:attribute type="xs:float" name="sigma" use="required" />
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
<xs:element name="bmax" maxOccurs="1" minOccurs="1">
<xs:complexType>
<xs:simpleContent>
......@@ -319,7 +342,7 @@
</xs:sequence>
</xs:complexType>
</xs:element>
<xs:element name="route_choice_models" maxOccurs="unbounded" minOccurs="1">
<xs:element name="route_choice_models" maxOccurs="1" minOccurs="1">
<xs:complexType>
<xs:sequence>
<xs:element name="router" maxOccurs="unbounded" minOccurs="1">
......@@ -327,7 +350,7 @@
<xs:sequence>
<xs:element name="parameters">
<xs:complexType mixed="true">
<xs:sequence>
<xs:all>
<xs:element name="navigation_lines" minOccurs="0" maxOccurs="1">
<xs:annotation>
<xs:documentation>extra routing information</xs:documentation>
......@@ -340,7 +363,29 @@
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:sequence>
<xs:element name="navigation_mesh" maxOccurs="1" minOccurs="0">
<xs:complexType>
<xs:simpleContent>
<xs:extension base="xs:string">
<xs:attribute name="method" use="required">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:pattern value="triangulation" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
<xs:attribute name="use_for_local_planning" use="required">
<xs:simpleType>
<xs:restriction base="xs:string">
<xs:pattern value="true|false" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
</xs:extension>
</xs:simpleContent>
</xs:complexType>
</xs:element>
</xs:all>
</xs:complexType>
</xs:element>
</xs:sequence>
......@@ -348,7 +393,7 @@
<xs:simpleType>
<xs:restriction base="xs:int">
<xs:minInclusive value="1" />
<xs:maxInclusive value="2" />
<xs:maxInclusive value="3" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
......@@ -357,6 +402,7 @@
<xs:restriction base="xs:string">
<xs:enumeration value="quickest" />
<xs:enumeration value="global_shortest" />
<xs:enumeration value="cognitive_map" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
......@@ -365,12 +411,13 @@
</xs:sequence>
</xs:complexType>
</xs:element>
</xs:sequence>
</xs:all>
<xs:attribute type="xs:string" name="project" />
<xs:attribute name="version" use="required">
<xs:simpleType>
<xs:restriction base="xs:float">
<xs:enumeration value="0.5" />
<xs:enumeration value="0.6" />
</xs:restriction>
</xs:simpleType>
</xs:attribute>
......
Markdown is supported
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