From f50823281d9ddeb0f7c9f2ad08762a96535343f3 Mon Sep 17 00:00:00 2001 From: rakhimov Date: Tue, 20 Dec 2016 21:13:44 -0800 Subject: [PATCH] Use 'neq' instead of 'df' for Boolean not-equal As noted in #3 bug report, 'df' is a poor choice for Boolean not-equal, standing for 'different' and at risk of being confused for 'difference'. 'neq' is a unambiguous choice standing for 'not-equal' in similar fashion as already present operators: 'eq', 'leq', 'geq'. Fixes #3. --- mef/schema/boolean_operation.rnc | 2 +- mef/stochastic_layer.rst | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/mef/schema/boolean_operation.rnc b/mef/schema/boolean_operation.rnc index c5da4f0..e9c8f2f 100644 --- a/mef/schema/boolean_operation.rnc +++ b/mef/schema/boolean_operation.rnc @@ -3,7 +3,7 @@ Boolean-operation = | element and { expression+ } | element or { expression+ } | element eq { expression, expression } - | element df { expression, expression } + | element neq { expression, expression } | element lt { expression, expression } | element gt { expression, expression } | element leq { expression, expression } diff --git a/mef/stochastic_layer.rst b/mef/stochastic_layer.rst index 47a84a5..e9194eb 100644 --- a/mef/stochastic_layer.rst +++ b/mef/stochastic_layer.rst @@ -212,7 +212,7 @@ Their XML representation is given in :numref:`schema_boolean_operation`. +----------+------------+---------------+ | **eq** | 2 | :math:`=` | +----------+------------+---------------+ - | **df** | 2 | :math:`\neq` | + | **neq** | 2 | :math:`\neq` | +----------+------------+---------------+ | **lt** | 2 | :math:`<` | +----------+------------+---------------+