Skip to content

Commit 55cd207

Browse files
seimeseime
authored
Merge pull request #14 from entur/nand_nor_boolean_operators
Add support for NAND, NOR, XNOR as a LogicalOperation.
2 parents ad89a56 + 5cbd8d5 commit 55cd207

File tree

3 files changed

+24
-9
lines changed

3 files changed

+24
-9
lines changed

‎xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd

+20-5
Original file line numberDiff line numberDiff line change
@@ -95,9 +95,9 @@ Rail transport, Roads and Road transport
9595
</xsd:complexContent>
9696
</xsd:complexType>
9797
<!-- ======================================================================= -->
98-
<xsd:simpleType name="BooleanOperatorEnumeration">
98+
<xsd:simpleType name="LogicalOperationEnumeration">
9999
<xsd:annotation>
100-
<xsd:documentation>Allowed values for Boolean operations.</xsd:documentation>
100+
<xsd:documentation>Allowed values for logical operations. See https://en.wikipedia.org/wiki/Logic_gate</xsd:documentation>
101101
</xsd:annotation>
102102
<xsd:restriction base="xsd:NMTOKEN">
103103
<xsd:enumeration value="AND">
@@ -107,17 +107,32 @@ Rail transport, Roads and Road transport
107107
</xsd:enumeration>
108108
<xsd:enumeration value="OR">
109109
<xsd:annotation>
110-
<xsd:documentation>Successive elements are logically ORed together; comparison must satisfy at least one specified value.</xsd:documentation>
110+
<xsd:documentation>Successive elements are logically ORed together; comparison must satisfy at least one specified value.</xsd:documentation>
111111
</xsd:annotation>
112112
</xsd:enumeration>
113113
<xsd:enumeration value="NOT">
114114
<xsd:annotation>
115-
<xsd:documentation>Specified elements must be different from the given value.</xsd:documentation>
115+
<xsd:documentation>Specified elements must be different from the given value. If the number of specified elements is equal to 1, the function negates it. If the number of specified elements > 1, this operator is equal to the NOR operator</xsd:documentation>
116116
</xsd:annotation>
117117
</xsd:enumeration>
118118
<xsd:enumeration value="XOR">
119119
<xsd:annotation>
120-
<xsd:documentation>Successive elements are logically ORed together; comparison must satisfy only one specified value.</xsd:documentation>
120+
<xsd:documentation>Successive elements are logically ORed together; comparison must satisfy only one specified value.</xsd:documentation>
121+
</xsd:annotation>
122+
</xsd:enumeration>
123+
<xsd:enumeration value="NAND">
124+
<xsd:annotation>
125+
<xsd:documentation>Successive elements are logically ANDed together; comparison must satisfy all specified values. The result is then negated.</xsd:documentation>
126+
</xsd:annotation>
127+
</xsd:enumeration>
128+
<xsd:enumeration value="NOR">
129+
<xsd:annotation>
130+
<xsd:documentation>Successive elements are logically ORed together; comparison must satisfy at least one specified value. The result is then negated.</xsd:documentation>
131+
</xsd:annotation>
132+
</xsd:enumeration>
133+
<xsd:enumeration value="XNOR">
134+
<xsd:annotation>
135+
<xsd:documentation>Successive elements are logically ORed together; comparison must satisfy only one specified value. The result is then negated.</xsd:documentation>
121136
</xsd:annotation>
122137
</xsd:enumeration>
123138
</xsd:restriction>

‎xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd

+3-3
Original file line numberDiff line numberDiff line change
@@ -266,7 +266,7 @@ Rail transport, Roads and Road transport
266266
<xsd:documentation>Limiting USAGE PARAMETER Elements or ACCESS RIGHT PARAMETER ASSIGNMENT.</xsd:documentation>
267267
</xsd:annotation>
268268
<xsd:sequence>
269-
<xsd:element name="LimitationGroupingType" type="BooleanOperatorEnumeration" default="AND" minOccurs="0">
269+
<xsd:element name="LimitationGroupingType" type="LogicalOperationEnumeration" default="AND" minOccurs="0">
270270
<xsd:annotation>
271271
<xsd:documentation>Operator for Grouping Scope Elements: logical OR, AND, NOT. Default is AND.</xsd:documentation>
272272
</xsd:annotation>
@@ -289,7 +289,7 @@ Rail transport, Roads and Road transport
289289
<xsd:documentation>Comparison Operator for comparing Validity Erlements valeus. Defalut is EQ.</xsd:documentation>
290290
</xsd:annotation>
291291
</xsd:element>
292-
<xsd:element name="ValidityParameterGroupingType" type="BooleanOperatorEnumeration" default="AND" minOccurs="0">
292+
<xsd:element name="ValidityParameterGroupingType" type="LogicalOperationEnumeration" default="AND" minOccurs="0">
293293
<xsd:annotation>
294294
<xsd:documentation>Operator for Grouping Scope Elements: logical OR, AND, NOT. Default is AND.</xsd:documentation>
295295
</xsd:annotation>
@@ -735,7 +735,7 @@ Rail transport, Roads and Road transport
735735
<xsd:documentation>Elements for compound GENERIC PARAMETER ASSIGNMENT.</xsd:documentation>
736736
</xsd:annotation>
737737
<xsd:sequence>
738-
<xsd:element name="IncludesGroupingType" type="BooleanOperatorEnumeration" default="OR" minOccurs="0">
738+
<xsd:element name="IncludesGroupingType" type="LogicalOperationEnumeration" default="OR" minOccurs="0">
739739
<xsd:annotation>
740740
<xsd:documentation>Operator for Grouping Scope Elements. Default is OR.</xsd:documentation>
741741
</xsd:annotation>

‎xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd

+1-1
Original file line numberDiff line numberDiff line change
@@ -458,7 +458,7 @@ Rail transport, Roads and Road transport
458458
<xsd:documentation>Elements for Compound SPECIFIC PARAMETER ASSIGNMENT.</xsd:documentation>
459459
</xsd:annotation>
460460
<xsd:sequence>
461-
<xsd:element name="IncludesGroupingType" type="BooleanOperatorEnumeration" default="OR" minOccurs="0">
461+
<xsd:element name="IncludesGroupingType" type="LogicalOperationEnumeration" default="OR" minOccurs="0">
462462
<xsd:annotation>
463463
<xsd:documentation>Operator for Grouping Scope Elements. Default is OR.</xsd:documentation>
464464
</xsd:annotation>

0 commit comments

Comments
 (0)