Skip to content

Commit 0da2db8

Browse files
kt86kt86
authored
Merge pull request matsim-org#3375 from matsim-org/kmt_updateLspDefinition
Update LspsDefinition: remove one layer of "LSPs"
2 parents 31d2c0d + af740e6 commit 0da2db8

File tree

1 file changed

+112
-118
lines changed

1 file changed

+112
-118
lines changed

‎matsim/src/main/resources/dtd/lspsDefinitions_v1.xsd

Lines changed: 112 additions & 118 deletions
Original file line numberDiff line numberDiff line change
@@ -7,129 +7,123 @@
77

88
<xs:include schemaLocation="http://www.matsim.org/files/dtd/matsimCommon.xsd"/>
99

10-
<xs:element name="lspsDefinitions">
11-
<xs:complexType>
12-
<xs:sequence>
13-
<xs:element name="LSPs">
14-
<xs:complexType>
15-
<xs:sequence>
16-
<xs:element name="lsp" maxOccurs="unbounded">
17-
<xs:complexType>
18-
<xs:sequence>
19-
<xs:element name="resources" type="ResourceType" minOccurs="0" />
20-
<xs:element name="shipments" type="ShipmentType" minOccurs="0" />
21-
<xs:element name="LspPlans" type="LSPPlanType" minOccurs="0" />
22-
</xs:sequence>
23-
<xs:attribute name="id" type="xs:string"/>
24-
</xs:complexType>
25-
</xs:element>
26-
</xs:sequence>
27-
</xs:complexType>
28-
</xs:element>
29-
</xs:sequence>
30-
</xs:complexType>
31-
</xs:element>
10+
<xs:element name="lsps">
11+
<xs:complexType>
12+
<xs:sequence>
13+
<xs:element name="lsp" maxOccurs="unbounded">
14+
<xs:complexType>
15+
<xs:sequence>
16+
<xs:element name="resources" type="ResourceType" minOccurs="0" />
17+
<xs:element name="shipments" type="ShipmentType" minOccurs="0" />
18+
<xs:element name="LspPlans" type="LSPPlanType" minOccurs="0" />
19+
</xs:sequence>
20+
<xs:attribute name="id" type="xs:string"/>
21+
</xs:complexType>
22+
</xs:element>
23+
</xs:sequence>
24+
</xs:complexType>
25+
</xs:element>
3226

33-
<xs:complexType name="ResourceType">
34-
<xs:choice maxOccurs="unbounded" minOccurs="0">
35-
<xs:element name="carrier" maxOccurs="unbounded">
36-
<xs:complexType>
37-
<xs:attribute name="id" type="xs:string" use="required"/>
38-
</xs:complexType>
39-
</xs:element>
40-
<xs:element name="hub">
41-
<xs:complexType>
42-
<xs:sequence>
43-
<xs:element name="scheduler">
44-
<xs:complexType>
45-
<xs:attribute name="capacityNeedFixed" type="xs:string"/>
46-
<xs:attribute name="capacityNeedLinear" type="xs:string"/>
47-
</xs:complexType>
48-
</xs:element>
49-
</xs:sequence>
50-
<xs:attribute name="id" type="xs:string" use="required"/>
51-
<xs:attribute name="location" type="xs:string" use="required"/>
52-
<xs:attribute name="fixedCost" type="xs:string" use="required"/>
53-
</xs:complexType>
54-
</xs:element>
55-
</xs:choice>
56-
</xs:complexType>
27+
<xs:complexType name="ResourceType">
28+
<xs:choice maxOccurs="unbounded" minOccurs="0">
29+
<xs:element name="carrier" maxOccurs="unbounded">
30+
<xs:complexType>
31+
<xs:attribute name="id" type="xs:string" use="required"/>
32+
</xs:complexType>
33+
</xs:element>
34+
<xs:element name="hub">
35+
<xs:complexType>
36+
<xs:sequence>
37+
<xs:element name="scheduler">
38+
<xs:complexType>
39+
<xs:attribute name="capacityNeedFixed" type="xs:string"/>
40+
<xs:attribute name="capacityNeedLinear" type="xs:string"/>
41+
</xs:complexType>
42+
</xs:element>
43+
</xs:sequence>
44+
<xs:attribute name="id" type="xs:string" use="required"/>
45+
<xs:attribute name="location" type="xs:string" use="required"/>
46+
<xs:attribute name="fixedCost" type="xs:string" use="required"/>
47+
</xs:complexType>
48+
</xs:element>
49+
</xs:choice>
50+
</xs:complexType>
5751

5852

59-
<xs:complexType name="ShipmentType">
60-
<xs:sequence>
61-
<xs:element name="shipment" maxOccurs="unbounded" >
62-
<xs:complexType>
63-
<xs:attribute name="id" type="xs:string" use="required"/>
64-
<xs:attribute name="from" type="xs:string" use="required"/>
65-
<xs:attribute name="to" type="xs:string" use="required"/>
66-
<xs:attribute name="size" type="xs:string" use="required"/>
67-
<xs:attribute name="startPickup" />
68-
<xs:attribute name="endPickup"/>
69-
<xs:attribute name="pickupServiceTime" />
70-
<xs:attribute name="startDelivery" />
71-
<xs:attribute name="endDelivery" />
72-
<xs:attribute name="deliveryServiceTime" />
73-
</xs:complexType>
74-
</xs:element>
75-
</xs:sequence>
76-
</xs:complexType>
53+
<xs:complexType name="ShipmentType">
54+
<xs:sequence>
55+
<xs:element name="shipment" maxOccurs="unbounded" >
56+
<xs:complexType>
57+
<xs:attribute name="id" type="xs:string" use="required"/>
58+
<xs:attribute name="from" type="xs:string" use="required"/>
59+
<xs:attribute name="to" type="xs:string" use="required"/>
60+
<xs:attribute name="size" type="xs:string" use="required"/>
61+
<xs:attribute name="startPickup" />
62+
<xs:attribute name="endPickup"/>
63+
<xs:attribute name="pickupServiceTime" />
64+
<xs:attribute name="startDelivery" />
65+
<xs:attribute name="endDelivery" />
66+
<xs:attribute name="deliveryServiceTime" />
67+
</xs:complexType>
68+
</xs:element>
69+
</xs:sequence>
70+
</xs:complexType>
7771

7872

79-
<xs:complexType name="LSPPlanType">
80-
<xs:sequence>
81-
<xs:element name="LspPlan" maxOccurs="unbounded">
82-
<xs:complexType>
83-
<xs:sequence>
84-
<xs:element name="logisticChains" minOccurs="0">
85-
<xs:complexType>
86-
<xs:sequence>
87-
<xs:element name="logisticChain" minOccurs="0" maxOccurs="unbounded">
88-
<xs:complexType>
89-
<xs:sequence>
90-
<xs:element name="logisticChainElement" minOccurs="0" maxOccurs="unbounded">
91-
<xs:complexType>
92-
<xs:attribute name="id" type="xs:string" />
93-
<xs:attribute name="resourceId" type="xs:string" />
94-
</xs:complexType>
95-
</xs:element>
96-
</xs:sequence>
97-
<xs:attribute name="id"/>
98-
</xs:complexType>
99-
</xs:element>
100-
</xs:sequence>
101-
</xs:complexType>
102-
</xs:element>
73+
<xs:complexType name="LSPPlanType">
74+
<xs:sequence>
75+
<xs:element name="LspPlan" maxOccurs="unbounded">
76+
<xs:complexType>
77+
<xs:sequence>
78+
<xs:element name="logisticChains" minOccurs="0">
79+
<xs:complexType>
80+
<xs:sequence>
81+
<xs:element name="logisticChain" minOccurs="0" maxOccurs="unbounded">
82+
<xs:complexType>
83+
<xs:sequence>
84+
<xs:element name="logisticChainElement" minOccurs="0" maxOccurs="unbounded">
85+
<xs:complexType>
86+
<xs:attribute name="id" type="xs:string" />
87+
<xs:attribute name="resourceId" type="xs:string" />
88+
</xs:complexType>
89+
</xs:element>
90+
</xs:sequence>
91+
<xs:attribute name="id"/>
92+
</xs:complexType>
93+
</xs:element>
94+
</xs:sequence>
95+
</xs:complexType>
96+
</xs:element>
10397

104-
<xs:element name="shipmentPlans" minOccurs="0">
105-
<xs:complexType>
106-
<xs:sequence>
107-
<xs:element name="shipmentPlan" minOccurs="0" maxOccurs="unbounded">
108-
<xs:complexType>
109-
<xs:sequence>
110-
<xs:element name="element" minOccurs="0" maxOccurs="unbounded">
111-
<xs:complexType>
112-
<xs:attribute name="id" type="xs:string" />
113-
<xs:attribute name="type" type="xs:string" />
114-
<xs:attribute name="startTime" type="xs:string" />
115-
<xs:attribute name="endTime"/>
116-
<xs:attribute name="resourceId"/>
117-
</xs:complexType>
118-
</xs:element>
119-
</xs:sequence>
120-
<xs:attribute name="shipmentId" type="xs:string"/>
121-
<xs:attribute name="chainId" type="xs:string"/>
122-
</xs:complexType>
123-
</xs:element>
124-
</xs:sequence>
125-
</xs:complexType>
126-
</xs:element>
127-
</xs:sequence>
128-
<xs:attribute name="score" type="xs:double" />
129-
<xs:attribute name="selected" type="xs:boolean" />
130-
</xs:complexType>
131-
</xs:element>
132-
</xs:sequence>
133-
</xs:complexType>
98+
<xs:element name="shipmentPlans" minOccurs="0">
99+
<xs:complexType>
100+
<xs:sequence>
101+
<xs:element name="shipmentPlan" minOccurs="0" maxOccurs="unbounded">
102+
<xs:complexType>
103+
<xs:sequence>
104+
<xs:element name="element" minOccurs="0" maxOccurs="unbounded">
105+
<xs:complexType>
106+
<xs:attribute name="id" type="xs:string" />
107+
<xs:attribute name="type" type="xs:string" />
108+
<xs:attribute name="startTime" type="xs:string" />
109+
<xs:attribute name="endTime"/>
110+
<xs:attribute name="resourceId"/>
111+
</xs:complexType>
112+
</xs:element>
113+
</xs:sequence>
114+
<xs:attribute name="shipmentId" type="xs:string"/>
115+
<xs:attribute name="chainId" type="xs:string"/>
116+
</xs:complexType>
117+
</xs:element>
118+
</xs:sequence>
119+
</xs:complexType>
120+
</xs:element>
121+
</xs:sequence>
122+
<xs:attribute name="score" type="xs:double" />
123+
<xs:attribute name="selected" type="xs:boolean" />
124+
</xs:complexType>
125+
</xs:element>
126+
</xs:sequence>
127+
</xs:complexType>
134128

135129
</xs:schema>

0 commit comments

Comments
 (0)