diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java index a025602b6..fd9f88aaf 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/IdentityConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -28,8 +28,7 @@ public class IdentityConnective extends UnaryConnective { /** * Constructor for unnamed rule. - * @param leftOperand left operand - * @param rightOperand right operand + * @param operand operand */ public IdentityConnective(SemanticFilterRule operand) { this(operand, null, null); @@ -37,8 +36,7 @@ public IdentityConnective(SemanticFilterRule operand) { /** * Constructor for unnamed rule with default value. - * @param leftOperand left operand - * @param rightOperand right operand + * @param operand operand * @param defaultValue the default value */ public IdentityConnective(SemanticFilterRule operand, Boolean defaultValue) { @@ -47,8 +45,7 @@ public IdentityConnective(SemanticFilterRule operand, Boolean defaultValue) { /** * Constructor for named rule. - * @param leftOperand left operand - * @param rightOperand right operand + * @param operand operand * @param ruleName rule name */ public IdentityConnective(SemanticFilterRule operand, String ruleName) { @@ -57,8 +54,7 @@ public IdentityConnective(SemanticFilterRule operand, String ruleName) { /** * Constructor for named rule with default value. - * @param leftOperand left operand - * @param rightOperand right operand + * @param operand operand * @param defaultValue the default value * @param ruleName rule name */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java index fe16b303a..05f08e4bc 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessEqualsConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -19,7 +19,7 @@ /** * A LessEquals Connective takes two numeric rules R1 and R2 and evaluates to true * iff - * R1 <= R2 + * {@code R1 <= R2} * * @author mka * diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java index 4f77983ee..55635aa45 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/LessThanConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -19,7 +19,7 @@ /** * A LessThan Connective takes two numeric rules R1 and R2 and evaluates to true * iff - * R1 < R2 + * {@code R1 < R2} * @author tik, mka * */ diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java index 566e1c733..1f47d207c 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericAdditionConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -30,11 +30,9 @@ public class NumericAdditionConnective extends BinaryConnective implements Numer protected static final String NAME = "NUMERICADDITION"; /** - * Constructor for named rule with default value. + * Constructor for numeric addition connective. * @param leftOperand left operand * @param rightOperand right operand - * @param defaultValue the default value - * @param ruleName rule name */ public NumericAdditionConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java index c7fb01c7d..5ce9218b7 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericDivisionConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -30,11 +30,9 @@ public class NumericDivisionConnective extends BinaryConnective implements Numer protected static final String NAME = "NUMERICDIVISION"; /** - * Constructor for named rule with default value. + * Constructor for numeric division connective. * @param leftOperand left operand * @param rightOperand right operand - * @param defaultValue the default value - * @param ruleName rule name */ public NumericDivisionConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java index 38bdbb88c..b44f106c0 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericMultiplicationConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -30,11 +30,9 @@ public class NumericMultiplicationConnective extends BinaryConnective implements protected static final String NAME = "NUMERICMULTIPLICATION"; /** - * Constructor for named rule with default value. + * Constructor for numeric multiplication connective. * @param leftOperand left operand * @param rightOperand right operand - * @param defaultValue the default value - * @param ruleName rule name */ public NumericMultiplicationConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java index 6b93635ee..55b383be5 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/NumericSubtractionConnective.java @@ -3,7 +3,7 @@ * * http://rtsys.informatik.uni-kiel.de/kieler * - * Copyright 2022 by + * Copyright 2022 - 2023 by * + Kiel University * + Department of Computer Science * + Real-Time and Embedded Systems Group @@ -30,11 +30,9 @@ public class NumericSubtractionConnective extends BinaryConnective implements Nu protected static final String NAME = "NUMERICSUBSTRACTION"; /** - * Constructor for named rule with default value. + * Constructor for numeric subtraction connective. * @param leftOperand left operand * @param rightOperand right operand - * @param defaultValue the default value - * @param ruleName rule name */ public NumericSubtractionConnective(NumericResult leftOperand, NumericResult rightOperand) { super(); diff --git a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java index 2de6bdf99..4d94077d9 100644 --- a/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java +++ b/plugins/de.cau.cs.kieler.klighd/src/de/cau/cs/kieler/klighd/filtering/parser/SemanticFilterRuleParser.java @@ -48,13 +48,13 @@ /** * Provides a parser for the semantic filter language. The syntax is of the form - * for all binary operators. The most basic rule is a tag - * # that evaluates to true if an element has that tag and false otherwise. - * Tags may also contain numeric values in which case they are written as $. + * <rule> <operator> <rule> for all binary operators. The most basic rule is a tag + * #<tag> that evaluates to true if an element has that tag and false otherwise. + * Tags may also contain numeric values in which case they are written as $<tag>. * Constant values can be expressed as true, false or a number. Brackets may be used * to override precedences. The full list of available operators is given in the table * below. - * + *
{@code
  * | Operator       |  Syntax                |  Input          | Output  | Precedence |
  * |----------------|------------------------|-----------------|---------|------------|
  * | And            | \ && \   | boolean         | boolean | 4          |
@@ -70,7 +70,7 @@
  * | LessThan       | \ < \    | numeric         | boolean | 8          |
  * | Equals         | \ = \    | numeric/boolean | boolean | 7          |
  * | NotEqual       | \ != \   | numeric/boolean | boolean | 7          |
-
+ * }
* @author mka * */