Skip to content

Commit

Permalink
renaming attributes, converting everything to int in amitran schemas,…
Browse files Browse the repository at this point in the history 
… refs #2

git-svn-id: file:///home/behr_mi/git/sumo_synched/trunk@15922 afbd958f-9f77-42d5-a016-97a22340ccf4
  • Loading branch information
@behrisch
behrisch committed Mar 13, 2014
1 parent 4cd952a commit ae71587
Show file tree
Hide file tree
Showing 4 changed files with 52 additions and 51 deletions.
24 changes: 12 additions & 12 deletions sumo/data/xsd/amitran/linkdata.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@
<xsd:element name="linkData">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="linkStatData" type="linkStatData" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="timeSlice" type="timeSliceType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>
</xsd:element>

<xsd:complexType name="linkStatData">
<xsd:complexType name="timeSliceType">
<xsd:sequence>
<xsd:element name="linkActorData" type="linkActorData" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="link" type="linkType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="startTime" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="duration" type="xsd:unsignedInt" use="required"/>
</xsd:complexType>

<xsd:complexType name="linkActorData">
<xsd:complexType name="link">
<xsd:sequence>
<xsd:element name="actorInfo" type="actorInfo" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="actorConfig" type="actorConfigType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="linkId" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="linkAmount" type="xsd:unsignedShort" use="required"/>
<xsd:attribute name="linkAverageSpeed" type="xsd:unsignedShort" use="required"/>
<xsd:attribute name="id" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="amount" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="averageSpeed" type="xsd:unsignedInt" use="required"/>
</xsd:complexType>

<xsd:complexType name="actorInfo">
<xsd:attribute name="actorConfigId" type="xsd:unsignedShort" use="required"/>
<xsd:attribute name="amount" type="xsd:unsignedShort" use="required"/>
<xsd:attribute name="speedAveraged" type="xsd:unsignedShort" use="required"/>
<xsd:complexType name="actorConfigType">
<xsd:attribute name="id" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="amount" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="averageSpeed" type="xsd:unsignedInt" use="required"/>
</xsd:complexType>

</xsd:schema>
22 changes: 11 additions & 11 deletions sumo/data/xsd/amitran/network.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,30 +13,30 @@
<xsd:complexType name="nodeType">
<xsd:attribute name="id" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="type" type="xsd:nodeTypeType" use="optional"/>
<xsd:attribute name="od_zone" type="xsd:unsignedInt" use="optional"/>
<xsd:attribute name="odZone" type="xsd:unsignedInt" use="optional"/>
</xsd:complexType>

<xsd:simpleType name="nodeTypeType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="traffic_light" />
<xsd:enumeration value="trafficLight" />
<xsd:enumeration value="priority" />
<xsd:enumeration value="priority_stop" />
<xsd:enumeration value="right_before_left" />
<xsd:enumeration value="allway_stop" />
<xsd:enumeration value="roundabout" />
<xsd:enumeration value="roundabout_dual" />
<xsd:enumeration value="dead_end" />
<xsd:enumeration value="priorityStop" />
<xsd:enumeration value="rightBeforeLeft" />
<xsd:enumeration value="allwayStop" />
<xsd:enumeration value="roundaboutSingle" />
<xsd:enumeration value="roundaboutMulti" />
<xsd:enumeration value="deadEnd" />
</xsd:restriction>
</xsd:simpleType>

<xsd:complexType name="linkType">
<xsd:attribute name="id" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="from" type="xsd:unsignedInt" use="optional"/>
<xsd:attribute name="to" type="xsd:unsignedInt" use="optional"/>
<xsd:attribute name="roadClass" type="xsd:unsignedByte" use="required"/>
<xsd:attribute name="roadClass" type="xsd:unsignedInt" use="required"/> <!-- functional road class in the Navteq sense -->
<xsd:attribute name="length" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="speedLimitKmh" type="xsd:unsignedByte" use="optional"/>
<xsd:attribute name="laneNr" type="xsd:unsignedByte" use="optional"/>
<xsd:attribute name="speedLimitKmh" type="xsd:unsignedInt" use="optional"/>
<xsd:attribute name="laneNr" type="xsd:unsignedInt" use="optional"/>
</xsd:complexType>

</xsd:schema>
9 changes: 5 additions & 4 deletions sumo/data/xsd/amitran/od.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
<xsd:sequence>
<xsd:element name="timeSlice" type="timeSliceType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="id" type="xsd:unsignedShort" use="required"/>
<xsd:attribute name="id" type="xsd:unsignedInt" use="required"/>
</xsd:complexType>

<xsd:complexType name="timeSliceType">
Expand All @@ -25,17 +25,18 @@
</xsd:complexType>

<xsd:complexType name="odPairType">
<xsd:attribute name="id" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="origin" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="destination" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="demand" type="xsd:double" use="required"/>
<xsd:sequence>
<xsd:element name="routeCost" type="routeCostType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
</xsd:complexType>

<xsd:complexType name="routeCostType">
<xsd:attribute name="id" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="routeId" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="amount" type="xsd:double" use="optional"/>
<xsd:attribute name="avgTraveltime" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="averageTraveltime" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="stdDevTraveltime" type="xsd:unsignedInt" use="optional"/>
<xsd:attribute name="fixedCost" type="xsd:unsignedInt" use="optional"/>
</xsd:complexType>
Expand Down
48 changes: 24 additions & 24 deletions sumo/data/xsd/amitran/trajectories.xsd
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,53 +5,53 @@
<xsd:complexType>
<xsd:sequence>
<xsd:element name="actorConfig" type="actorConfigType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="vehicleData" type="vehicleDataType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="vehicle" type="vehicleType" minOccurs="0" maxOccurs="unbounded"/>
<xsd:element name="motionState" type="motionStateType" minOccurs="0" maxOccurs="unbounded"/>
</xsd:sequence>
<xsd:attribute name="timestep" use="required" type="xsd:double"/>
<xsd:attribute name="timeStepSize" use="required" type="xsd:double"/> <!-- unit: seconds -->
</xsd:complexType>
</xsd:element>

<xsd:complexType name="actorConfigType">
<xsd:attribute name="id" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="id" type="xsd:unsignedInt" use="required"/> <!-- unique ID -->
<xsd:attribute name="emissionClass" type="emissionClassType" use="optional"/>
<xsd:attribute name="fuelType" type="fuelTypeType" use="optional"/>
<xsd:attribute name="vehicleClass" type="vehicleClassType" use="optional"/>
<xsd:attribute name="vehicleLength" type="xsd:unsignedShort" use="optional"/>
<xsd:attribute name="vehicleWeight" type="xsd:unsignedShort" use="optional"/>
<xsd:attribute name="vehicleAge" type="xsd:unsignedByte" use="optional"/>
<xsd:attribute name="vehicleMake" type="vehicleMakeType" use="optional"/>
<xsd:attribute name="vehicleLength" type="xsd:unsignedInt" use="optional"/> <!-- unit: 0.01m -->
<xsd:attribute name="vehicleWeight" type="xsd:unsignedInt" use="optional"/> <!-- unit: 10kg -->
<xsd:attribute name="vehicleAge" type="xsd:unsignedInt" use="optional"/> <!-- unit: years -->
<xsd:attribute name="vehicleBrand" type="vehicleBrandType" use="optional"/>
<xsd:attribute name="vehicleModel" type="xsd:string" use="optional"/>
</xsd:complexType>

<xsd:complexType name="vehicleDataType">
<xsd:attribute name="vehicleId" type="xsd:unsignedInt" use="required"/>
<xsd:attribute name="actorConfigId" type="xsd:unsignedShort" use="required"/>
<xsd:attribute name="startTime" type="xsd:double" use="required"/>
<xsd:complexType name="vehicleType">
<xsd:attribute name="id" type="xsd:unsignedInt" use="required"/> <!-- unique ID -->
<xsd:attribute name="actorConfig" type="xsd:unsignedInt" use="required"/> <!-- reference to actorConfig id -->
<xsd:attribute name="startTime" type="xsd:double" use="required"/> <!-- unit: seconds -->
</xsd:complexType>

<xsd:complexType name="motionStateType">
<xsd:attribute name="vehicleId" type="xsd:unsignedShort" use="required"/>
<xsd:attribute name="speed" type="xsd:unsignedShort" use="required"/>
<xsd:attribute name="time" type="xsd:unsignedInt"/>
<xsd:attribute name="acceleration" type="xsd:short"/>
<xsd:attribute name="gear" type="xsd:byte"/>
<xsd:attribute name="engineSpeed" type="xsd:unsignedShort"/>
<xsd:attribute name="vehicle" type="xsd:unsignedInt" use="required"/> <!-- reference to vehicle id -->
<xsd:attribute name="speed" type="xsd:unsignedInt" use="required"/> <!-- unit: 0.01m/s -->
<xsd:attribute name="time" type="xsd:unsignedInt"/> <!-- unit: 0.001s -->
<xsd:attribute name="acceleration" type="xsd:int"/> <!-- unit: 0.001m/s^2 -->
<xsd:attribute name="gear" type="xsd:int"/>
<xsd:attribute name="engineSpeed" type="xsd:unsignedInt"/> <!-- unit: rpm -->
<xsd:attribute name="worldLocationLong" type="xsd:int"/>
<xsd:attribute name="worldLocationLat" type="xsd:int"/>
<xsd:attribute name="worldLocationHeight" type="xsd:int"/>
<xsd:attribute name="cartesianX" type="xsd:int"/>
<xsd:attribute name="cartesianY" type="xsd:int"/>
<xsd:attribute name="cartesianZ" type="xsd:int"/>
<xsd:attribute name="linkId" type="xsd:unsignedInt"/>
<xsd:attribute name="laneNr" type="xsd:unsignedByte"/>
<xsd:attribute name="link" type="xsd:unsignedInt"/>
<xsd:attribute name="laneIndex" type="xsd:unsignedInt"/> <!-- 1 based counting from right -->
<xsd:attribute name="slope" type="xsd:short"/>
<xsd:attribute name="radiusOfCurvature" type="xsd:int"/>
<xsd:attribute name="roadType" type="roadTypeType"/>
<xsd:attribute name="speedLimitKmh" type="xsd:unsignedByte"/>
<xsd:attribute name="airDragCoefficient" type="xsd:unsignedShort"/>
<xsd:attribute name="timeHeadway" type="xsd:unsignedShort"/>
<xsd:attribute name="timeToCollision" type="xsd:unsignedShort"/>
<xsd:attribute name="speedLimitKmh" type="xsd:unsignedInt"/>
<xsd:attribute name="airDragCoefficient" type="xsd:unsignedInt"/>
<xsd:attribute name="timeHeadway" type="xsd:unsignedInt"/>
<xsd:attribute name="timeToCollision" type="xsd:unsignedInt"/>
<xsd:attribute name="vehicleInFrontId" type="xsd:int"/>
</xsd:complexType>

Expand Down Expand Up @@ -90,7 +90,7 @@
</xsd:restriction>
</xsd:simpleType>

<xsd:simpleType name="vehicleMakeType">
<xsd:simpleType name="vehicleBrandType">
<xsd:restriction base="xsd:string">
<xsd:enumeration value="BMW" />
<xsd:enumeration value="Opel" />
Expand Down

0 comments on commit ae71587

Please sign in to comment.