more schema adaptions #2

eclipse-sumo · Mar 22, 2024 · 5250ec1 · 5250ec1
1 parent 2da7c50
commit 5250ec1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 9 deletions.
diff --git a/data/xsd/statistic_file.xsd b/data/xsd/statistic_file.xsd
@@ -52,6 +52,7 @@
                 </xsd:element>
                 <xsd:element name="personTeleports">
                     <xsd:complexType>
+                        <xsd:attribute name="total" use="required" type="xsd:nonNegativeInteger"/>
                         <xsd:attribute name="abortWait" use="required" type="xsd:nonNegativeInteger"/>
                         <xsd:attribute name="wrongDest" use="required" type="xsd:nonNegativeInteger"/>
                     </xsd:complexType>
@@ -65,7 +66,7 @@
                         <xsd:attribute name="waitingTime" use="required" type="timeType"/>
                         <xsd:attribute name="timeLoss" use="required" type="timeType"/>
                         <xsd:attribute name="departDelay" use="required" type="timeType"/>
-                        <xsd:attribute name="departDelayWaiting" use="required" type="timeType"/>
+                        <xsd:attribute name="departDelayWaiting" use="required" type="timeTypeWithErrorValue"/>
                         <xsd:attribute name="totalTravelTime" use="required" type="timeType"/>
                         <xsd:attribute name="totalDepartDelay" use="required" type="timeType"/>
                     </xsd:complexType>
@@ -97,13 +98,13 @@
 
     <xsd:complexType name="rideStatisticsType">
 		<xsd:attribute name="number" use="required" type="xsd:nonNegativeInteger"/>
-		<xsd:attribute name="routeLength" use="required" type="nonNegativeFloatType"/>
-		<xsd:attribute name="duration" use="required" type="timeType"/>
-		<xsd:attribute name="bus" use="required" type="xsd:nonNegativeInteger"/>
-		<xsd:attribute name="train" use="required" type="xsd:nonNegativeInteger"/>
-		<xsd:attribute name="taxi" use="required" type="xsd:nonNegativeInteger"/>
-		<xsd:attribute name="bike" use="required" type="xsd:nonNegativeInteger"/>
-		<xsd:attribute name="aborted" use="required" type="xsd:nonNegativeInteger"/>
+		<xsd:attribute name="routeLength" use="optional" type="nonNegativeFloatType"/>
+		<xsd:attribute name="duration" use="optional" type="timeType"/>
+		<xsd:attribute name="bus" use="optional" type="xsd:nonNegativeInteger"/>
+		<xsd:attribute name="train" use="optional" type="xsd:nonNegativeInteger"/>
+		<xsd:attribute name="taxi" use="optional" type="xsd:nonNegativeInteger"/>
+		<xsd:attribute name="bike" use="optional" type="xsd:nonNegativeInteger"/>
+		<xsd:attribute name="aborted" use="optional" type="xsd:nonNegativeInteger"/>
     </xsd:complexType>
 
 </xsd:schema>
diff --git a/tests/tools/xml/schemaCheck/tests/sim_outputs/options.tools b/tests/tools/xml/schemaCheck/tests/sim_outputs/options.tools
@@ -1 +1 @@
-$SUMO_HOME/tests detector.sumo*,rawdump.sumo*,aggregated*.sumo*,tripinfos.sumo*,queue.sumo*,emissions.sumo*,tripinfos.traci,net_state.traci,bt.sumo*,stopinfos.sumo*,vtypeprobe.sumo*,*state*.sumo*,*state*.traci*,*state*.complex* tools/build_config/schemaCheck.py
+$SUMO_HOME/tests detector.sumo*,rawdump.sumo*,aggregated*.sumo*,tripinfos.sumo*,queue.sumo*,emissions.sumo*,tripinfos.traci,net_state.traci,bt.sumo*,stopinfos.sumo*,vtypeprobe.sumo*,*state*.sumo*,*state*.traci*,*state*.complex*,statistic.sumo* tools/build_config/schemaCheck.py