Skip to content

Commit

Permalink
Renamed to operator.
Browse files Browse the repository at this point in the history
  • Loading branch information
UlfBj committed Apr 19, 2022
1 parent a782f88 commit 35a1fcd
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions spec/VISSv2_Core.html
Original file line number Diff line number Diff line change
Expand Up @@ -605,7 +605,7 @@ <h2>Filter Request</h2>
The server MUST support the timebased and change types, the other types are optional.<br>
In the JSON object, the key-value pairs "type" and "value" must always be present.
The JSON expression may consist of maximum one object with type "paths", plus maximum one object with any other supported type,
which are then logically combined as with an AND operand.<br>
which are then logically combined as with an AND operator.<br>
The types timebased, range, change, and curvelog are only applicable for subscription requests.
Subscription requests are supported by the websocket and the MQTT transport protocols.<br>
The restriction on how many objects that can be combined is also set by the URL size restriction on 1k characters (*).<br>
Expand Down Expand Up @@ -666,9 +666,9 @@ <h2>Range Filter Operation</h2>
<section id="single-boundary-range">
<h2>Single Boundary Range</h2>
<p>
One logical "boundary operand" evaluates the current signal value in relation to the boundary.
One logical "boundary operator" evaluates the current signal value in relation to the boundary.
If evaluated to true, the server issues a notification message containing the signal value to the subscribing client.
The boundary operand MUST be one of the values shown in the footer (**).<br>
The boundary operator MUST be one of the values shown in the footer (**).<br>
Examples<br>
{"boundary-op":"gt", "boundary": "5"} // x > 5<br>
{"boundary-op":"eq", "boundary": "5"} // x == 5
Expand All @@ -677,20 +677,20 @@ <h2>Single Boundary Range</h2>
<section id="multi-boundary-range">
<h2>Multi Boundary Range</h2>
<p>
Two boundaries with respective boundary operands are evaluated relative to the current signal value.
Two boundaries with respective boundary operators are evaluated relative to the current signal value.
The logical outcome of the two evaluations are applied as input to a logical AND/OR operation.
If evaluated to true, the server issues a notification message containing the signal value to the subscribing client.
Besides the mandatory "boundary-op", and "boundary" key-value pairs in each JSON object,
the first object may contain a "combination-op" key value pair, which then MUST have either the value "AND", or the value "OR".
If omitted, the result of the two boundary evaluations is per default applied to an AND operation.
The JSON array MUST contain two objects.
The boundary operand MUST be one of the values shown in the footer (**).<br>
The boundary operator MUST be one of the values shown in the footer (**).<br>
Examples<br>
[{"boundary-op":"gt", "boundary": "5"},{"boundary-op":"lt", "boundary": "10"}] // x > 5 AND x < 10<br>
[{"boundary-op":"lt", "boundary": "5", "combination-op":"OR"},{"boundary-op":"gt", "boundary": "10"}] // x < 5 OR x > 10
</p>
</section>
(**)The supported boundary operands are ["eq", "ne", "gt", "gte", "lt", "lte"],
(**)The supported boundary operators are ["eq", "ne", "gt", "gte", "lt", "lte"],
where "eq" is "equal", "ne" is "not equal", "gt" is "greater than", "gte" is "greater than or equal", "lt" is "less than",
"lte" is "less than or equal".<br>
Examples can be found in the <a data-link-type="dfn" href="https://www.w3.org/TR/viss2-transport/#authorized-subscribe">authorized subscribe</a> and
Expand All @@ -701,14 +701,14 @@ <h2>Multi Boundary Range</h2>
<section id="change-filter-operation">
<h2>Change Filter Operation</h2>
<p>
The value contains the logical operand for comparison of previous and current values, {"logic-op":"X", "diff":"Y"},
where X is one of the supported logical operands (**), and Y is the value of the required change.<br>
The value contains the logical operator for comparison of previous and current values, {"logic-op":"X", "diff":"Y"},
where X is one of the supported logical operators (**), and Y is the value of the required change.<br>
For boolean values the following expressions shall be supported:<br>
"value":{"logic-op":"gt", "diff": "0"} This leads to a trigger event when the value goes false->true.<br>
"value":{"logic-op":"lt", "diff": "0"} This leads to a trigger event when the value goes true->false.<br>
"value":{"logic-op":"ne", "diff": "0"} This leads to a trigger event when the value goes true->false OR false->true.
<br><br>
(**)The supported logic operands are ["eq", "ne", "gt", "gte", "lt", "lte"],
(**)The supported logic operators are ["eq", "ne", "gt", "gte", "lt", "lte"],
where "eq" is "equal", "ne" is "not equal", "gt" is "greater than", "gte" is "greater than or equal",
"lt" is "less than", "lte" is "less than or equal".<br>
Examples can be found in the [[viss2-transport]] specification.
Expand Down

0 comments on commit 35a1fcd

Please sign in to comment.