[jboss-svn-commits] JBL Code SVN: r17180 - in labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics: optimisation and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Dec 11 10:09:13 EST 2007
Author: tirelli
Date: 2007-12-11 10:09:13 -0500 (Tue, 11 Dec 2007)
New Revision: 17180
Modified:
labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/missingEquality/MissingEquality.drl
labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/RestrictionOrder.drl
Log:
fixing rules after CEP/ESP merge
Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/missingEquality/MissingEquality.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/missingEquality/MissingEquality.drl 2007-12-11 14:14:28 UTC (rev 17179)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/missingEquality/MissingEquality.drl 2007-12-11 15:09:13 UTC (rev 17180)
@@ -3,6 +3,8 @@
#list any import classes here.
import org.drools.base.evaluators.Operator;
+import org.drools.base.evaluators.MatchesEvaluatorsDefinition;
+import org.drools.base.evaluators.SetEvaluatorsDefinition;
import org.drools.analytics.components.VariableRestriction;
import org.drools.analytics.components.LiteralRestriction;
@@ -53,25 +55,25 @@
#
) or (
$r :LiteralRestriction(
- operator == Operator.MATCHES,
+ operator == MatchesEvaluatorsDefinition.MATCHES,
valueAsString matches $r.valueAsString
)
and
not LiteralRestriction(
fieldId == $r.fieldId,
- operator == Operator.NOT_MATCHES,
+ operator == MatchesEvaluatorsDefinition.NOT_MATCHES,
patternIsNot == $r.patternIsNot,
valueAsString matches $r.valueAsString
)
) or (
$r :LiteralRestriction(
- operator == Operator.NOT_MATCHES,
+ operator == MatchesEvaluatorsDefinition.NOT_MATCHES,
valueAsString matches $r.valueAsString
)
and
not LiteralRestriction(
fieldId == $r.fieldId,
- operator == Operator.MATCHES,
+ operator == MatchesEvaluatorsDefinition.MATCHES,
patternIsNot == $r.patternIsNot,
valueAsString matches $r.valueAsString
)
@@ -128,24 +130,24 @@
#
) or (
$r :VariableRestriction(
- operator == Operator.MATCHES
+ operator == MatchesEvaluatorsDefinition.MATCHES
)
and
not VariableRestriction(
fieldId == $r.fieldId,
- operator == Operator.NOT_MATCHES,
+ operator == MatchesEvaluatorsDefinition.NOT_MATCHES,
patternIsNot == $r.patternIsNot,
variable.objectId == $r.variable.objectId,
variable.objectType == $r.variable.objectType
)
) or (
$r :VariableRestriction(
- operator == Operator.NOT_MATCHES
+ operator == MatchesEvaluatorsDefinition.NOT_MATCHES
)
and
not VariableRestriction(
fieldId == $r.fieldId,
- operator == Operator.MATCHES,
+ operator == MatchesEvaluatorsDefinition.MATCHES,
patternIsNot == $r.patternIsNot,
variable.objectId == $r.variable.objectId,
variable.objectType == $r.variable.objectType
@@ -155,24 +157,24 @@
#
) or (
$r :VariableRestriction(
- operator == Operator.MEMBEROF
+ operator == SetEvaluatorsDefinition.MEMBEROF
)
and
not VariableRestriction(
fieldId == $r.fieldId,
- operator == Operator.NOTMEMBEROF,
+ operator == SetEvaluatorsDefinition.NOT_MEMBEROF,
patternIsNot == $r.patternIsNot,
variable.objectId == $r.variable.objectId,
variable.objectType == $r.variable.objectType
)
) or (
$r :VariableRestriction(
- operator == Operator.NOTMEMBEROF
+ operator == SetEvaluatorsDefinition.NOT_MEMBEROF
)
and
not VariableRestriction(
fieldId == $r.fieldId,
- operator == Operator.MEMBEROF,
+ operator == SetEvaluatorsDefinition.MEMBEROF,
patternIsNot == $r.patternIsNot,
variable.objectId == $r.variable.objectId,
variable.objectType == $r.variable.objectType
@@ -182,24 +184,24 @@
#
) or (
$r :VariableRestriction(
- operator == Operator.CONTAINS
+ operator == SetEvaluatorsDefinition.CONTAINS
)
and
not VariableRestriction(
fieldId == $r.fieldId,
- operator == Operator.NOT_CONTAINS,
+ operator == SetEvaluatorsDefinition.NOT_CONTAINS,
patternIsNot == $r.patternIsNot,
variable.objectId == $r.variable.objectId,
variable.objectType == $r.variable.objectType
)
) or (
$r :VariableRestriction(
- operator == Operator.NOT_CONTAINS
+ operator == SetEvaluatorsDefinition.NOT_CONTAINS
)
and
not VariableRestriction(
fieldId == $r.fieldId,
- operator == Operator.CONTAINS,
+ operator == SetEvaluatorsDefinition.CONTAINS,
patternIsNot == $r.patternIsNot,
variable.objectId == $r.variable.objectId,
variable.objectType == $r.variable.objectType
Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/RestrictionOrder.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/RestrictionOrder.drl 2007-12-11 14:14:28 UTC (rev 17179)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/RestrictionOrder.drl 2007-12-11 15:09:13 UTC (rev 17180)
@@ -6,6 +6,7 @@
import java.util.ArrayList;
import org.drools.base.evaluators.Operator;
+import org.drools.base.evaluators.MatchesEvaluatorsDefinition;
import org.drools.analytics.components.Restriction;
import org.drools.analytics.components.Pattern;
@@ -17,7 +18,6 @@
import org.drools.analytics.report.components.AnalyticsMessage;
import org.drools.analytics.dao.AnalyticsResult;
-
#declare any global variables here
global AnalyticsResult result;
@@ -35,26 +35,26 @@
(
$r1 :Restriction(
parent.parent == $operator,
- ( operator == Operator.EQUAL || == Operator.MATCHES )
+ ( operator == Operator.EQUAL || == MatchesEvaluatorsDefinition.MATCHES )
)
and
# There is no reason to check if there is a less expensive constraint
# if this one has a restriction that is more expensive.
not Restriction(
parent == $r1.parent,
- ( operator == Operator.GREATER || == Operator.LESS || == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == Operator.NOT_MATCHES || == Operator.NOT_EQUAL )
+ ( operator == Operator.GREATER || == Operator.LESS || == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == MatchesEvaluatorsDefinition.NOT_MATCHES || == Operator.NOT_EQUAL )
)
and
$r2 :Restriction(
parent.parent == $operator,
parent.orderNumber < $r1.parent.orderNumber,
- ( operator == Operator.GREATER || == Operator.LESS || == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == Operator.NOT_MATCHES || == Operator.NOT_EQUAL )
+ ( operator == Operator.GREATER || == Operator.LESS || == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == MatchesEvaluatorsDefinition.NOT_MATCHES || == Operator.NOT_EQUAL )
)
and
# The other restriction should not have any less expensive restrictions.
not Restriction(
parent == $r2.parent,
- ( operator == Operator.EQUAL || == Operator.MATCHES )
+ ( operator == Operator.EQUAL || == MatchesEvaluatorsDefinition.MATCHES )
)
) or (
$r1 :Restriction(
@@ -66,19 +66,19 @@
# if this one has a restriction that is more expensive.
not Restriction(
parent == $r1.parent,
- ( operator == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == Operator.NOT_MATCHES || == Operator.NOT_EQUAL )
+ ( operator == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == MatchesEvaluatorsDefinition.NOT_MATCHES || == Operator.NOT_EQUAL )
)
and
$r2 :Restriction(
parent.parent == $operator,
parent.orderNumber < $r1.parent.orderNumber,
- ( operator == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == Operator.NOT_MATCHES || == Operator.NOT_EQUAL )
+ ( operator == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == MatchesEvaluatorsDefinition.NOT_MATCHES || == Operator.NOT_EQUAL )
)
and
# The other restriction should not have any less expensive restrictions.
not Restriction(
parent == $r2.parent,
- ( operator == Operator.EQUAL || == Operator.MATCHES || == Operator.GREATER || == Operator.LESS )
+ ( operator == Operator.EQUAL || == MatchesEvaluatorsDefinition.MATCHES || == Operator.GREATER || == Operator.LESS )
)
) or (
$r1 :Restriction(
@@ -90,19 +90,19 @@
# if this one has a restriction that is more expensive.
not Restriction(
parent == $r1.parent,
- ( operator == Operator.NOT_MATCHES || == Operator.NOT_EQUAL )
+ ( operator == MatchesEvaluatorsDefinition.NOT_MATCHES || == Operator.NOT_EQUAL )
)
and
$r2 :Restriction(
parent.parent == $operator,
parent.orderNumber < $r1.parent.orderNumber,
- ( operator == Operator.NOT_MATCHES || == Operator.NOT_EQUAL )
+ ( operator == MatchesEvaluatorsDefinition.NOT_MATCHES || == Operator.NOT_EQUAL )
)
and
# The other restriction should not have any less expensive restrictions.
not Restriction(
parent == $r2.parent,
- ( operator == Operator.EQUAL || == Operator.MATCHES || == Operator.GREATER || == Operator.LESS || == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL )
+ ( operator == Operator.EQUAL || == MatchesEvaluatorsDefinition.MATCHES || == Operator.GREATER || == Operator.LESS || == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL )
)
)
@@ -135,13 +135,13 @@
when
(
$r1 :Restriction(
- ( operator == Operator.EQUAL || == Operator.MATCHES )
+ ( operator == Operator.EQUAL || == MatchesEvaluatorsDefinition.MATCHES )
)
and
$r2 :Restriction(
parent == $r1.parent,
orderNumber < $r1.orderNumber,
- ( operator == Operator.GREATER || == Operator.LESS || == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == Operator.NOT_MATCHES || == Operator.NOT_EQUAL )
+ ( operator == Operator.GREATER || == Operator.LESS || == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == MatchesEvaluatorsDefinition.NOT_MATCHES || == Operator.NOT_EQUAL )
)
) or (
$r1 :Restriction(
@@ -151,7 +151,7 @@
$r2 :Restriction(
parent == $r1.parent,
orderNumber < $r1.orderNumber,
- ( operator == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == Operator.NOT_MATCHES || == Operator.NOT_EQUAL )
+ ( operator == Operator.GREATER_OR_EQUAL || == Operator.LESS_OR_EQUAL || == MatchesEvaluatorsDefinition.NOT_MATCHES || == Operator.NOT_EQUAL )
)
) or (
$r1 :Restriction(
@@ -161,7 +161,7 @@
$r2 :Restriction(
parent == $r1.parent,
orderNumber < $r1.orderNumber,
- ( operator == Operator.NOT_MATCHES || == Operator.NOT_EQUAL )
+ ( operator == MatchesEvaluatorsDefinition.NOT_MATCHES || == Operator.NOT_EQUAL )
)
)
More information about the jboss-svn-commits
mailing list