[jboss-svn-commits] JBL Code SVN: r17178 - 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
Tue Dec 11 05:20:35 EST 2007
Author: mgroch
Date: 2007-12-11 05:20:35 -0500 (Tue, 11 Dec 2007)
New Revision: 17178
Added:
labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/CoincidesEvaluatorDefinition.java
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/MetByEvaluatorDefinition.java
Log:
fixing meets & met-by
additional support for coincides ( = equals)
Added: 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 (rev 0)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/CoincidesEvaluatorDefinition.java 2007-12-11 10:20:35 UTC (rev 17178)
@@ -0,0 +1,262 @@
+/*
+ * Copyright 2007 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ * Created on Dec 6, 2007
+ */
+package org.drools.base.evaluators;
+
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.Map;
+
+import org.drools.RuntimeDroolsException;
+import org.drools.base.BaseEvaluator;
+import org.drools.base.ValueType;
+import org.drools.common.EventFactHandle;
+import org.drools.common.InternalFactHandle;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
+import org.drools.rule.VariableRestriction.VariableContextEntry;
+import org.drools.spi.Evaluator;
+import org.drools.spi.Extractor;
+import org.drools.spi.FieldValue;
+
+/**
+ * The implementation of the 'coincides' evaluator definition
+ *
+ * @author mgroch
+ */
+public class CoincidesEvaluatorDefinition
+ implements
+ EvaluatorDefinition {
+
+ public static final Operator COINCIDES = Operator.addOperatorToRegistry( "coincides",
+ false );
+ public static final Operator COINCIDES_NOT = Operator.addOperatorToRegistry( "coincides",
+ true );
+
+ private static final String[] SUPPORTED_IDS = { COINCIDES.getOperatorString() };
+
+ private Map<String, CoincidesEvaluator> cache = Collections.emptyMap();
+
+ /**
+ * @inheridDoc
+ */
+ public Evaluator getEvaluator(ValueType type,
+ Operator operator) {
+ return this.getEvaluator( type,
+ operator.getOperatorString(),
+ operator.isNegated(),
+ null );
+ }
+
+ /**
+ * @inheridDoc
+ */
+ public Evaluator getEvaluator(ValueType type,
+ Operator operator,
+ String parameterText) {
+ return this.getEvaluator( type,
+ operator.getOperatorString(),
+ operator.isNegated(),
+ parameterText );
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public Evaluator getEvaluator(final ValueType type,
+ final String operatorId,
+ final boolean isNegated,
+ final String parameterText) {
+ if ( this.cache == Collections.EMPTY_MAP ) {
+ this.cache = new HashMap<String, CoincidesEvaluator>();
+ }
+ String key = isNegated + ":" + parameterText;
+ CoincidesEvaluator eval = this.cache.get( key );
+ if ( eval == null ) {
+ eval = new CoincidesEvaluator( type,
+ isNegated,
+ parameterText );
+ this.cache.put( key,
+ eval );
+ }
+ return eval;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public String[] getEvaluatorIds() {
+ return SUPPORTED_IDS;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public boolean isNegatable() {
+ return true;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public boolean operatesOnFactHandles() {
+ return true;
+ }
+
+ /**
+ * @inheritDoc
+ */
+ public boolean supportsType(ValueType type) {
+ // supports all types, since it operates over fact handles
+ // Note: should we change this interface to allow checking of event classes only?
+ return true;
+ }
+
+ /**
+ * Implements the 'coincides' evaluator itself
+ */
+ public static class CoincidesEvaluator extends BaseEvaluator {
+ private static final long serialVersionUID = 542620783453908232L;
+
+ private long startDev;
+ private long endDev;
+
+ public CoincidesEvaluator(final ValueType type,
+ final boolean isNegated,
+ final String parameters) {
+ super( type,
+ isNegated ? COINCIDES_NOT : COINCIDES );
+ this.parseParameters( parameters );
+ }
+
+ @Override
+ public Object prepareObject(InternalFactHandle handle) {
+ return handle;
+ }
+
+ public boolean evaluate(InternalWorkingMemory workingMemory,
+ final Extractor extractor,
+ final Object object1,
+ final FieldValue object2) {
+ throw new RuntimeDroolsException( "The 'coincides' operator can only be used to compare one event to another, and never to compare to literal constraints." );
+ }
+
+ public boolean evaluateCachedRight(InternalWorkingMemory workingMemory,
+ final VariableContextEntry context,
+ final Object left) {
+ if ( context.rightNull ) {
+ return false;
+ }
+ long distStart = ((EventFactHandle)((ObjectVariableContextEntry) context).right).getStartTimestamp() -
+ ((EventFactHandle) left ).getStartTimestamp();
+ long distEnd = ((EventFactHandle)((ObjectVariableContextEntry) context).right).getEndTimestamp() -
+ ((EventFactHandle) left ).getEndTimestamp();
+ return distStart <= this.startDev && distEnd <= this.endDev;
+ }
+
+ public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
+ final VariableContextEntry context,
+ final Object right) {
+ if ( context.extractor.isNullValue( workingMemory,
+ right ) ) {
+ return false;
+ }
+ long distStart = Math.abs(((EventFactHandle) right ).getStartTimestamp() -
+ ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getStartTimestamp());
+ long distEnd = Math.abs(((EventFactHandle) right ).getEndTimestamp() -
+ ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getEndTimestamp());
+ return distStart <= this.startDev && distEnd <= this.endDev;
+ }
+
+ public boolean evaluate(InternalWorkingMemory workingMemory,
+ final Extractor extractor1,
+ final Object object1,
+ final Extractor extractor2,
+ final Object object2) {
+ if ( extractor1.isNullValue( workingMemory,
+ object1 ) ) {
+ return false;
+ }
+ 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;
+ }
+
+ public String toString() {
+ return "coincides[" + startDev + ", " + endDev + "]";
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#hashCode()
+ */
+ @Override
+ public int hashCode() {
+ final int PRIME = 31;
+ int result = super.hashCode();
+ result = PRIME * result + (int) (endDev ^ (endDev >>> 32));
+ result = PRIME * result + (int) (startDev ^ (startDev >>> 32));
+ return result;
+ }
+
+ /* (non-Javadoc)
+ * @see java.lang.Object#equals(java.lang.Object)
+ */
+ @Override
+ public boolean equals(Object obj) {
+ if ( this == obj ) return true;
+ if ( !super.equals( obj ) ) return false;
+ if ( getClass() != obj.getClass() ) return false;
+ final CoincidesEvaluator other = (CoincidesEvaluator) obj;
+ return endDev == other.endDev && startDev == other.startDev;
+ }
+
+ /**
+ * This methods tries to parse the string of parameters to customize
+ * the evaluator.
+ *
+ * @param parameters
+ */
+ private void parseParameters(String parameters) {
+ if ( parameters == null || parameters.trim().length() == 0 ) {
+ // open bounded range
+ this.startDev = 0;
+ this.endDev = 0;
+ return;
+ }
+
+ try {
+ String[] ranges = parameters.split( "," );
+ if ( ranges.length == 1 ) {
+ // deterministic point in time
+ this.startDev = Long.parseLong( ranges[0] );
+ this.endDev = this.startDev;
+ } else if ( ranges.length == 2 ) {
+ // regular range
+ this.startDev = Long.parseLong( ranges[0] );
+ this.endDev = Long.parseLong( ranges[1] );
+ } else {
+ throw new RuntimeDroolsException( "[Coincides Evaluator]: Not possible to parse parameters: '" + parameters + "'" );
+ }
+ } catch ( NumberFormatException e ) {
+ throw new RuntimeDroolsException( "[Coincides Evaluator]: Not possible to parse parameters: '" + parameters + "'",
+ e );
+ }
+ }
+
+ }
+
+}
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-11 10:20:26 UTC (rev 17177)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/MeetsEvaluatorDefinition.java 2007-12-11 10:20:35 UTC (rev 17178)
@@ -24,12 +24,9 @@
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.base.evaluators.MatchesEvaluatorsDefinition.StringMatchesEvaluator;
-import org.drools.base.evaluators.MatchesEvaluatorsDefinition.StringNotMatchesEvaluator;
import org.drools.common.EventFactHandle;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
-import org.drools.rule.VariableRestriction.LongVariableContextEntry;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
@@ -135,7 +132,6 @@
public static class MeetsEvaluator extends BaseEvaluator {
private static final long serialVersionUID = 1018648684053005286L;
- private long initRange;
private long finalRange;
public MeetsEvaluator(final ValueType type,
@@ -164,9 +160,11 @@
if ( context.rightNull ) {
return false;
}
- long dist = Math.abs(((EventFactHandle) left ).getStartTimestamp() -
+ long leftStartTS = ((EventFactHandle) left ).getStartTimestamp();
+ long dist = Math.abs(leftStartTS -
((EventFactHandle)((ObjectVariableContextEntry) context).right).getEndTimestamp());
- return dist >= this.initRange && dist <= this.finalRange;
+ return ((EventFactHandle)((ObjectVariableContextEntry) context).right).getStartTimestamp() <= leftStartTS
+ && dist <= this.finalRange;
}
public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
@@ -176,10 +174,9 @@
right ) ) {
return false;
}
- long dist = Math.abs(((EventFactHandle) ((ObjectVariableContextEntry) context).left).getStartTimestamp() -
- ((EventFactHandle) right ).getEndTimestamp());
-
- return dist >= this.initRange && dist <= this.finalRange;
+ long leftStartTS = ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getStartTimestamp();
+ long dist = Math.abs(leftStartTS - ((EventFactHandle) right ).getEndTimestamp());
+ return ((EventFactHandle) right ).getStartTimestamp() <= leftStartTS && dist <= this.finalRange;
}
public boolean evaluate(InternalWorkingMemory workingMemory,
@@ -191,12 +188,13 @@
object1 ) ) {
return false;
}
- long dist = Math.abs(((EventFactHandle) object2 ).getStartTimestamp() - ((EventFactHandle) object1 ).getEndTimestamp());
- return dist >= this.initRange && dist <= this.finalRange;
+ long obj2StartTS = ((EventFactHandle) object2 ).getStartTimestamp();
+ long dist = Math.abs(obj2StartTS - ((EventFactHandle) object1 ).getEndTimestamp());
+ return ((EventFactHandle) object1 ).getStartTimestamp() <= obj2StartTS && dist <= this.finalRange;
}
public String toString() {
- return "meets[" + initRange + ", " + finalRange + "]";
+ return "meets[" + finalRange + "]";
}
/* (non-Javadoc)
@@ -207,7 +205,6 @@
final int PRIME = 31;
int result = super.hashCode();
result = PRIME * result + (int) (finalRange ^ (finalRange >>> 32));
- result = PRIME * result + (int) (initRange ^ (initRange >>> 32));
return result;
}
@@ -220,7 +217,7 @@
if ( !super.equals( obj ) ) return false;
if ( getClass() != obj.getClass() ) return false;
final MeetsEvaluator other = (MeetsEvaluator) obj;
- return finalRange == other.finalRange && initRange == other.initRange;
+ return finalRange == other.finalRange;
}
/**
@@ -232,7 +229,6 @@
private void parseParameters(String parameters) {
if ( parameters == null || parameters.trim().length() == 0 ) {
// exact meet
- this.initRange = 0;
this.finalRange = 0;
return;
}
@@ -240,8 +236,7 @@
try {
String[] ranges = parameters.split( "," );
if ( ranges.length == 1 ) {
- // limit of tolerance
- this.initRange = 0;
+ // limit of tolerance for overlap or gap, respectively
this.finalRange = Long.parseLong( ranges[0] );
} else {
throw new RuntimeDroolsException( "[Meets Evaluator]: Not possible to parse parameters: '" + parameters + "'" );
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-11 10:20:26 UTC (rev 17177)
+++ labs/jbossrules/branches/temporal_rete/drools-core/src/main/java/org/drools/base/evaluators/MetByEvaluatorDefinition.java 2007-12-11 10:20:35 UTC (rev 17178)
@@ -24,12 +24,9 @@
import org.drools.RuntimeDroolsException;
import org.drools.base.BaseEvaluator;
import org.drools.base.ValueType;
-import org.drools.base.evaluators.MatchesEvaluatorsDefinition.StringMatchesEvaluator;
-import org.drools.base.evaluators.MatchesEvaluatorsDefinition.StringNotMatchesEvaluator;
import org.drools.common.EventFactHandle;
import org.drools.common.InternalFactHandle;
import org.drools.common.InternalWorkingMemory;
-import org.drools.rule.VariableRestriction.LongVariableContextEntry;
import org.drools.rule.VariableRestriction.ObjectVariableContextEntry;
import org.drools.rule.VariableRestriction.VariableContextEntry;
import org.drools.spi.Evaluator;
@@ -135,7 +132,6 @@
public static class MetByEvaluator extends BaseEvaluator {
private static final long serialVersionUID = 4628787624924047853L;
- private long initRange;
private long finalRange;
public MetByEvaluator(final ValueType type,
@@ -164,9 +160,9 @@
if ( context.rightNull ) {
return false;
}
- long dist = Math.abs(((EventFactHandle)((ObjectVariableContextEntry) context).right).getStartTimestamp() -
- ((EventFactHandle) left ).getEndTimestamp());
- return dist >= this.initRange && dist <= this.finalRange;
+ long rightStartTS = ((EventFactHandle)((ObjectVariableContextEntry) context).right).getStartTimestamp();
+ long dist = Math.abs(rightStartTS - ((EventFactHandle) left ).getEndTimestamp());
+ return ((EventFactHandle) left ).getStartTimestamp() < rightStartTS && dist <= this.finalRange;
}
public boolean evaluateCachedLeft(InternalWorkingMemory workingMemory,
@@ -176,10 +172,11 @@
right ) ) {
return false;
}
- long dist = Math.abs(((EventFactHandle) right ).getStartTimestamp() -
- ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getEndTimestamp());
+ long rightStartTS = ((EventFactHandle) right ).getStartTimestamp();
+ long dist = Math.abs(rightStartTS - ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getEndTimestamp());
- return dist >= this.initRange && dist <= this.finalRange;
+ return ((EventFactHandle) ((ObjectVariableContextEntry) context).left).getStartTimestamp() <= rightStartTS &&
+ dist <= this.finalRange;
}
public boolean evaluate(InternalWorkingMemory workingMemory,
@@ -191,12 +188,13 @@
object1 ) ) {
return false;
}
- long dist = Math.abs(((EventFactHandle) object1 ).getStartTimestamp() - ((EventFactHandle) object2 ).getEndTimestamp());
- return dist >= this.initRange && dist <= this.finalRange;
+ long obj1StartTS = ((EventFactHandle) object1 ).getStartTimestamp();
+ long dist = Math.abs(obj1StartTS - ((EventFactHandle) object2 ).getEndTimestamp());
+ return ((EventFactHandle) object2 ).getStartTimestamp() <= obj1StartTS && dist <= this.finalRange;
}
public String toString() {
- return "metby[" + initRange + ", " + finalRange + "]";
+ return "metby[" + finalRange + "]";
}
/* (non-Javadoc)
@@ -207,7 +205,6 @@
final int PRIME = 31;
int result = super.hashCode();
result = PRIME * result + (int) (finalRange ^ (finalRange >>> 32));
- result = PRIME * result + (int) (initRange ^ (initRange >>> 32));
return result;
}
@@ -220,7 +217,7 @@
if ( !super.equals( obj ) ) return false;
if ( getClass() != obj.getClass() ) return false;
final MetByEvaluator other = (MetByEvaluator) obj;
- return finalRange == other.finalRange && initRange == other.initRange;
+ return finalRange == other.finalRange;
}
/**
@@ -232,7 +229,7 @@
private void parseParameters(String parameters) {
if ( parameters == null || parameters.trim().length() == 0 ) {
// exact met-by
- this.initRange = 0;
+
this.finalRange = 0;
return;
}
@@ -240,8 +237,7 @@
try {
String[] ranges = parameters.split( "," );
if ( ranges.length == 1 ) {
- // limit of tolerance
- this.initRange = 0;
+ // limit of tolerance for overlap or gap, respectively
this.finalRange = Long.parseLong( ranges[0] );
} else {
throw new RuntimeDroolsException( "[Metby Evaluator]: Not possible to parse parameters: '" + parameters + "'" );
More information about the jboss-svn-commits
mailing list