[jboss-svn-commits] JBL Code SVN: r17199 - labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Dec 12 09:34:28 EST 2007
Author: mgroch
Date: 2007-12-12 09:34:28 -0500 (Wed, 12 Dec 2007)
New Revision: 17199
Modified:
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/BeforeEvaluatorDefinition.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/CoincidesEvaluatorDefinition.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/MeetsEvaluatorDefinition.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/MetByEvaluatorDefinition.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/OverlappedByEvaluatorDefinition.java
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/OverlapsEvaluatorDefinition.java
Log:
JBRULES-1374
adding support for the NOT versions of the operators which are already implemented
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/BeforeEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/BeforeEvaluatorDefinition.java 2007-12-12 14:24:06 UTC (rev 17198)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/BeforeEvaluatorDefinition.java 2007-12-12 14:34:28 UTC (rev 17199)
@@ -164,7 +164,7 @@
}
long dist = ((EventFactHandle) left ).getStartTimestamp() -
((EventFactHandle)((ObjectVariableContextEntry) context).right).getEndTimestamp();
- return dist >= this.initRange && dist <= this.finalRange;
+ return this.getOperator().isNegated() ^ (dist >= this.initRange && dist <= this.finalRange);
}
public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
@@ -177,7 +177,7 @@
long dist = ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getStartTimestamp() -
((EventFactHandle) right ).getEndTimestamp();
- return dist >= this.initRange && dist <= this.finalRange;
+ return this.getOperator().isNegated() ^ ( dist >= this.initRange && dist <= this.finalRange );
}
public boolean evaluate(InternalWorkingMemory workingMemory,
@@ -190,7 +190,7 @@
return false;
}
long dist = ((EventFactHandle) object2 ).getStartTimestamp() - ((EventFactHandle) object1 ).getEndTimestamp();
- return dist >= this.initRange && dist <= this.finalRange;
+ return this.getOperator().isNegated() ^ ( dist >= this.initRange && dist <= this.finalRange ) ;
}
public String toString() {
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/CoincidesEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/CoincidesEvaluatorDefinition.java 2007-12-12 14:24:06 UTC (rev 17198)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/CoincidesEvaluatorDefinition.java 2007-12-12 14:34:28 UTC (rev 17199)
@@ -165,7 +165,7 @@
((EventFactHandle) left ).getStartTimestamp());
long distEnd = Math.abs(((EventFactHandle)((ObjectVariableContextEntry) context).right).getEndTimestamp() -
((EventFactHandle) left ).getEndTimestamp());
- return distStart <= this.startDev && distEnd <= this.endDev;
+ return this.getOperator().isNegated() ^ ( distStart <= this.startDev && distEnd <= this.endDev);
}
public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
@@ -179,7 +179,7 @@
((EventFactHandle) ((ObjectVariableContextEntry) context).left).getStartTimestamp());
long distEnd = Math.abs(((EventFactHandle) right ).getEndTimestamp() -
((EventFactHandle) ((ObjectVariableContextEntry) context).left).getEndTimestamp());
- return distStart <= this.startDev && distEnd <= this.endDev;
+ return this.getOperator().isNegated() ^ ( distStart <= this.startDev && distEnd <= this.endDev );
}
public boolean evaluate(InternalWorkingMemory workingMemory,
@@ -193,7 +193,7 @@
}
long distStart = Math.abs(((EventFactHandle) object1 ).getStartTimestamp() - ((EventFactHandle) object2 ).getStartTimestamp());
long distEnd = Math.abs(((EventFactHandle) object1 ).getEndTimestamp() - ((EventFactHandle) object2 ).getEndTimestamp());
- return distStart <= this.startDev && distEnd <= this.endDev;
+ return this.getOperator().isNegated() ^ ( distStart <= this.startDev && distEnd <= this.endDev );
}
public String toString() {
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/MeetsEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/MeetsEvaluatorDefinition.java 2007-12-12 14:24:06 UTC (rev 17198)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/MeetsEvaluatorDefinition.java 2007-12-12 14:34:28 UTC (rev 17199)
@@ -163,8 +163,8 @@
long leftStartTS = ((EventFactHandle) left ).getStartTimestamp();
long dist = Math.abs(leftStartTS -
((EventFactHandle)((ObjectVariableContextEntry) context).right).getEndTimestamp());
- return ((EventFactHandle)((ObjectVariableContextEntry) context).right).getStartTimestamp() <= leftStartTS
- && dist <= this.finalRange;
+ return this.getOperator().isNegated() ^ ( ((EventFactHandle)((ObjectVariableContextEntry) context).right).getStartTimestamp() <= leftStartTS
+ && dist <= this.finalRange );
}
public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
@@ -176,7 +176,7 @@
}
long leftStartTS = ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getStartTimestamp();
long dist = Math.abs(leftStartTS - ((EventFactHandle) right ).getEndTimestamp());
- return ((EventFactHandle) right ).getStartTimestamp() <= leftStartTS && dist <= this.finalRange;
+ return this.getOperator().isNegated() ^ ( ((EventFactHandle) right ).getStartTimestamp() <= leftStartTS && dist <= this.finalRange);
}
public boolean evaluate(InternalWorkingMemory workingMemory,
@@ -190,7 +190,7 @@
}
long obj2StartTS = ((EventFactHandle) object2 ).getStartTimestamp();
long dist = Math.abs(obj2StartTS - ((EventFactHandle) object1 ).getEndTimestamp());
- return ((EventFactHandle) object1 ).getStartTimestamp() <= obj2StartTS && dist <= this.finalRange;
+ return this.getOperator().isNegated() ^ ( ((EventFactHandle) object1 ).getStartTimestamp() <= obj2StartTS && dist <= this.finalRange);
}
public String toString() {
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/MetByEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/MetByEvaluatorDefinition.java 2007-12-12 14:24:06 UTC (rev 17198)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/MetByEvaluatorDefinition.java 2007-12-12 14:34:28 UTC (rev 17199)
@@ -162,7 +162,7 @@
}
long rightStartTS = ((EventFactHandle)((ObjectVariableContextEntry) context).right).getStartTimestamp();
long dist = Math.abs(rightStartTS - ((EventFactHandle) left ).getEndTimestamp());
- return ((EventFactHandle) left ).getStartTimestamp() < rightStartTS && dist <= this.finalRange;
+ return this.getOperator().isNegated() ^ ( ((EventFactHandle) left ).getStartTimestamp() < rightStartTS && dist <= this.finalRange );
}
public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
@@ -175,8 +175,8 @@
long rightStartTS = ((EventFactHandle) right ).getStartTimestamp();
long dist = Math.abs(rightStartTS - ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getEndTimestamp());
- return ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getStartTimestamp() <= rightStartTS &&
- dist <= this.finalRange;
+ return this.getOperator().isNegated() ^ ( ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getStartTimestamp() <= rightStartTS &&
+ dist <= this.finalRange );
}
public boolean evaluate(InternalWorkingMemory workingMemory,
@@ -190,7 +190,7 @@
}
long obj1StartTS = ((EventFactHandle) object1 ).getStartTimestamp();
long dist = Math.abs(obj1StartTS - ((EventFactHandle) object2 ).getEndTimestamp());
- return ((EventFactHandle) object2 ).getStartTimestamp() <= obj1StartTS && dist <= this.finalRange;
+ return this.getOperator().isNegated() ^ ( ((EventFactHandle) object2 ).getStartTimestamp() <= obj1StartTS && dist <= this.finalRange );
}
public String toString() {
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/OverlappedByEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/OverlappedByEvaluatorDefinition.java 2007-12-12 14:24:06 UTC (rev 17198)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/OverlappedByEvaluatorDefinition.java 2007-12-12 14:34:28 UTC (rev 17199)
@@ -165,8 +165,8 @@
long leftEndTS = ((EventFactHandle) left ).getEndTimestamp();
long distStart = rightStartTS - ((EventFactHandle) left ).getStartTimestamp();
long distEnd = ((EventFactHandle)((ObjectVariableContextEntry) context).right).getEndTimestamp() - leftEndTS;
- return distStart >= this.startMinDev && distStart <= this.startMaxDev && distEnd >= this.startMinDev && distEnd <= this.startMaxDev
- && rightStartTS < leftEndTS;
+ return this.getOperator().isNegated() ^ ( distStart >= this.startMinDev && distStart <= this.startMaxDev
+ && distEnd >= this.startMinDev && distEnd <= this.startMaxDev && rightStartTS < leftEndTS );
}
public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
@@ -180,8 +180,8 @@
long rightStartTS = ((EventFactHandle) right ).getStartTimestamp();
long distStart = rightStartTS - ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getStartTimestamp();
long distEnd = ((EventFactHandle) right ).getEndTimestamp() - leftEndTS;
- return distStart >= this.startMinDev && distStart <= this.startMaxDev && distEnd >= this.startMinDev && distEnd <= this.startMaxDev
- && rightStartTS < leftEndTS;
+ return this.getOperator().isNegated() ^ ( distStart >= this.startMinDev && distStart <= this.startMaxDev
+ && distEnd >= this.startMinDev && distEnd <= this.startMaxDev && rightStartTS < leftEndTS );
}
public boolean evaluate(InternalWorkingMemory workingMemory,
@@ -197,8 +197,8 @@
long o2endTS = ((EventFactHandle) object2 ).getEndTimestamp();
long distStart = o1startTS - ((EventFactHandle) object2 ).getStartTimestamp();
long distEnd = ((EventFactHandle) object1 ).getEndTimestamp() - o2endTS;
- return distStart >= this.startMinDev && distStart <= this.startMaxDev && distEnd >= this.startMinDev && distEnd <= this.startMaxDev
- && o1startTS < o2endTS;
+ return this.getOperator().isNegated() ^ ( distStart >= this.startMinDev && distStart <= this.startMaxDev
+ && distEnd >= this.startMinDev && distEnd <= this.startMaxDev && o1startTS < o2endTS );
}
public String toString() {
Modified: labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/OverlapsEvaluatorDefinition.java
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/OverlapsEvaluatorDefinition.java 2007-12-12 14:24:06 UTC (rev 17198)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/OverlapsEvaluatorDefinition.java 2007-12-12 14:34:28 UTC (rev 17199)
@@ -166,8 +166,8 @@
long rightEndTS = ((EventFactHandle)((ObjectVariableContextEntry) context).right).getEndTimestamp();
long distStart = leftStartTS - ((EventFactHandle)((ObjectVariableContextEntry) context).right).getStartTimestamp();
long distEnd = ((EventFactHandle) left ).getEndTimestamp()- rightEndTS;
- return distStart >= this.startMinDev && distStart <= this.startMaxDev && distEnd >= this.startMinDev && distEnd <= this.startMaxDev
- && leftStartTS < rightEndTS;
+ return this.getOperator().isNegated() ^ ( distStart >= this.startMinDev && distStart <= this.startMaxDev
+ && distEnd >= this.startMinDev && distEnd <= this.startMaxDev && leftStartTS < rightEndTS );
}
public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
@@ -181,8 +181,8 @@
long rightEndTS = ((EventFactHandle) right ).getEndTimestamp();
long distStart = leftStartTS - ((EventFactHandle) right ).getStartTimestamp();
long distEnd = ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getEndTimestamp() - rightEndTS;
- return distStart >= this.startMinDev && distStart <= this.startMaxDev && distEnd >= this.startMinDev && distEnd <= this.startMaxDev
- && leftStartTS < rightEndTS;
+ return this.getOperator().isNegated() ^ ( distStart >= this.startMinDev && distStart <= this.startMaxDev
+ && distEnd >= this.startMinDev && distEnd <= this.startMaxDev && leftStartTS < rightEndTS );
}
public boolean evaluate(InternalWorkingMemory workingMemory,
@@ -198,8 +198,8 @@
long o1endTS = ((EventFactHandle) object1 ).getEndTimestamp();
long distStart = o2startTS - ((EventFactHandle) object1 ).getStartTimestamp();
long distEnd = ((EventFactHandle) object2 ).getEndTimestamp() - o1endTS;
- return distStart >= this.startMinDev && distStart <= this.startMaxDev && distEnd >= this.startMinDev && distEnd <= this.startMaxDev
- && o2startTS < o1endTS;
+ return this.getOperator().isNegated() ^ ( distStart >= this.startMinDev && distStart <= this.startMaxDev
+ && distEnd >= this.startMinDev && distEnd <= this.startMaxDev && o2startTS < o1endTS );
}
public String toString() {
More information about the jboss-svn-commits
mailing list