From 5cbd8d51be2ed99c11b7b7aef90989f5e2d698d8 Mon Sep 17 00:00:00 2001 From: Arne Seime Date: Tue, 3 Nov 2020 11:12:03 +0100 Subject: [PATCH] Add support for NAND, NOR, XNOR as a LogicalOperation. Also renamed BooleanOperatorEnumeration to LogicalOperationEnumeration to better reflect actual use --- .../netex_validityCondition_support.xsd | 25 +++++++++++++++---- .../netex_accessRightParameter_version.xsd | 6 ++--- .../netex_customerPurchasePackage_version.xsd | 2 +- 3 files changed, 24 insertions(+), 9 deletions(-) diff --git a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd index 5c42c40ca..a6b2daf72 100644 --- a/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd +++ b/xsd/netex_framework/netex_responsibility/netex_validityCondition_support.xsd @@ -95,9 +95,9 @@ Rail transport, Roads and Road transport - + - Allowed values for Boolean operations. + Allowed values for logical operations. See https://en.wikipedia.org/wiki/Logic_gate @@ -107,17 +107,32 @@ Rail transport, Roads and Road transport - Successive elements are logically ORed together; comparison must satisfy at least one specified value. + Successive elements are logically ORed together; comparison must satisfy at least one specified value. - Specified elements must be different from the given value. + 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 - Successive elements are logically ORed together; comparison must satisfy only one specified value. + Successive elements are logically ORed together; comparison must satisfy only one specified value. + + + + + Successive elements are logically ANDed together; comparison must satisfy all specified values. The result is then negated. + + + + + Successive elements are logically ORed together; comparison must satisfy at least one specified value. The result is then negated. + + + + + Successive elements are logically ORed together; comparison must satisfy only one specified value. The result is then negated. diff --git a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd index 962c688a4..412ff43b6 100644 --- a/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd +++ b/xsd/netex_part_3/part3_fares/netex_accessRightParameter_version.xsd @@ -263,7 +263,7 @@ Rail transport, Roads and Road transport Limiting USAGE PARAMETER Elements or ACCESS RIGHT PARAMETER ASSIGNMENT. - + Operator for Grouping Scope Elements: logical OR, AND, NOT. Default is AND. @@ -286,7 +286,7 @@ Rail transport, Roads and Road transport Comparison Operator for comparing Validity Erlements valeus. Defalut is EQ. - + Operator for Grouping Scope Elements: logical OR, AND, NOT. Default is AND. @@ -732,7 +732,7 @@ Rail transport, Roads and Road transport Elements for compound GENERIC PARAMETER ASSIGNMENT. - + Operator for Grouping Scope Elements. Default is OR. diff --git a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd index 74b445002..e45d0d37b 100644 --- a/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd +++ b/xsd/netex_part_3/part3_salesTransactions/netex_customerPurchasePackage_version.xsd @@ -458,7 +458,7 @@ Rail transport, Roads and Road transport Elements for Compound SPECIFIC PARAMETER ASSIGNMENT. - + Operator for Grouping Scope Elements. Default is OR.