[jboss-svn-commits] JBL Code SVN: r17222 - in labs/jbossrules/branches/temporal_rete/drools-compiler/src: test/resources/org/drools/integrationtests and 1 other directory.

[jboss-svn-commits at lists.jboss.org]

Author: mgroch
Date: 2007-12-13 09:53:35 -0500 (Thu, 13 Dec 2007)
New Revision: 17222

Modified:
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/resources/META-INF/drools.default.packagebuilder.conf
   labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
Log:
JBRULES-1374
added support for remaining evaluators, i.e. starts, startedby, finishes & finishedby
recalculating the UIDs for all evaluators (useful for serialization)

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/resources/META-INF/drools.default.packagebuilder.conf
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/resources/META-INF/drools.default.packagebuilder.conf	2007-12-13 12:27:47 UTC (rev 17221)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/main/resources/META-INF/drools.default.packagebuilder.conf	2007-12-13 14:53:35 UTC (rev 17222)
@@ -20,6 +20,10 @@
 drools.evaluator.overlappedby = org.drools.base.evaluators.OverlappedByEvaluatorDefinition
 drools.evaluator.during = org.drools.base.evaluators.DuringEvaluatorDefinition
 drools.evaluator.includes = org.drools.base.evaluators.IncludesEvaluatorDefinition
+drools.evaluator.starts = org.drools.base.evaluators.StartsEvaluatorDefinition
+drools.evaluator.startedby = org.drools.base.evaluators.StartedByEvaluatorDefinition
+drools.evaluator.finishes = org.drools.base.evaluators.FinishesEvaluatorDefinition
+drools.evaluator.finishedby = org.drools.base.evaluators.FinishedByEvaluatorDefinition
 drools.evaluator.equality = org.drools.base.evaluators.EqualityEvaluatorsDefinition
 drools.evaluator.comparable = org.drools.base.evaluators.ComparableEvaluatorsDefinition
 drools.evaluator.set = org.drools.base.evaluators.SetEvaluatorsDefinition

Modified: labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl
===================================================================
--- labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl	2007-12-13 12:27:47 UTC (rev 17221)
+++ labs/jbossrules/branches/temporal_rete/drools-compiler/src/test/resources/org/drools/integrationtests/test_CEP_TimeRelationalOperators.drl	2007-12-13 14:53:35 UTC (rev 17222)
@@ -1,7 +1,6 @@
 package org.drools;
 
 import event org.drools.StockTick;
-import event org.drools.ComplexEv;
 
 global java.util.List results_coincides;
 global java.util.List results_after;
@@ -10,11 +9,17 @@
 global java.util.List results_met_by;
 global java.util.List results_overlaps;
 global java.util.List results_overlapped_by;
+global java.util.List results_during;
+global java.util.List results_includes;
+global java.util.List results_starts;
+global java.util.List results_started_by;
+global java.util.List results_finishes;
+global java.util.List results_finished_by;
 
 rule "coincides operator"
 when
     $a : StockTick( company == "DROO" )
-    $b : StockTick( company == "ACME", this ~coincides $a )
+    $b : StockTick( company == "ACME", this ~coincides[2] $a )
 then
     results_coincides.add( $b );
 end
@@ -53,16 +58,64 @@
 
 rule "overlaps operator"
 when
-    $a : ComplexEv( company == "ACME" )
-    $b : ComplexEv( company == "DROO", this ~overlaps[2,5,2,5] $a )
+    $a : StockTick( company == "ACME" )
+    $b : StockTick( company == "DROO", this ~overlaps[4] $a )
 then
     results_overlaps.add( $b );
 end
 
 rule "overlapped-by operator"
 when
-    $a : ComplexEv( company == "DROO" )
-    $b : ComplexEv( company == "ACME", this ~overlappedby[2,5,2,5] $a )
+    $a : StockTick( company == "DROO" )
+    $b : StockTick( company == "ACME", this ~overlappedby[4] $a )
 then
     results_overlapped_by.add( $b );
+end
+
+rule "during operator"
+when
+    $a : StockTick( company == "DROO" )
+    $b : StockTick( company == "ACME", this ~during[2,0] $a )
+then
+    results_during.add( $b );
+end
+
+rule "includes operator"
+when
+    $a : StockTick( company == "ACME" )
+    $b : StockTick( company == "DROO", this ~includes[2,0] $a )
+then
+    results_includes.add( $b );
+end
+
+rule "starts operator"
+when
+    $a : StockTick( company == "DROO" )
+    $b : StockTick( company == "ACME", this ~starts[2,0,1] $a )
+then
+    results_starts.add( $b );
+end
+
+rule "started-by operator"
+when
+    $a : StockTick( company == "ACME" )
+    $b : StockTick( company == "DROO", this ~startedby[2,0,1] $a )
+then
+    results_started_by.add( $b );
+end
+
+rule "finishes operator"
+when
+    $a : StockTick( company == "DROO" )
+    $b : StockTick( company == "ACME", this ~finishes[2] $a )
+then
+    results_finishes.add( $b );
+end
+
+rule "finished-by operator"
+when
+    $a : StockTick( company == "ACME" )
+    $b : StockTick( company == "DROO", this ~finishedby[2] $a )
+then
+    results_finished_by.add( $b );
 end
\ No newline at end of file