[jboss-svn-commits] JBL Code SVN: r6172 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo: . beta

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

Author: mark.proctor at jboss.com
Date: 2006-09-12 09:51:58 -0400 (Tue, 12 Sep 2006)
New Revision: 6172

Added:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleMatchChildren.java
Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/InstanceEqualConstrRightMemory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java
Log:
JBRULES-484 refactor the core reteoo code for sinle and composite propagations
-added missing files.

Added: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleMatchChildren.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleMatchChildren.java	2006-09-12 13:14:13 UTC (rev 6171)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TupleMatchChildren.java	2006-09-12 13:51:58 UTC (rev 6172)
@@ -0,0 +1,16 @@
+package org.drools.reteoo;
+
+import org.drools.common.InternalWorkingMemory;
+import org.drools.spi.PropagationContext;
+
+public interface TupleMatchChildren {
+    public void add(ReteTuple tuple);
+
+    public void propagateRetractTuple(final PropagationContext context,
+                                      final InternalWorkingMemory workingMemory);
+
+    public void propagateModifyTuple(final PropagationContext context,
+                                     final InternalWorkingMemory workingMemory);
+    
+    public ReteTuple getTupleForSink(TupleSink sink);
+}

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java	2006-09-12 13:14:13 UTC (rev 6171)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BooleanConstrainedRightMemory.java	2006-09-12 13:51:58 UTC (rev 6172)
@@ -23,7 +23,7 @@
 
 import org.drools.WorkingMemory;
 import org.drools.base.evaluators.Operator;
-import org.drools.common.DefaultFactHandle;
+import org.drools.common.InternalFactHandle;
 import org.drools.reteoo.ObjectMatches;
 import org.drools.reteoo.ReteTuple;
 import org.drools.rule.Column;
@@ -251,7 +251,7 @@
      * @return
      */
     private final MultiLinkedList getMatchingList(final WorkingMemory workingMemory,
-                                                  final DefaultFactHandle handle) {
+                                                  final InternalFactHandle handle) {
         final boolean select = ((Boolean) this.extractor.getValue( handle.getObject() )).booleanValue();
         final MultiLinkedList list = (select == true) ? this.trueList : this.falseList;
         return list;
@@ -274,8 +274,8 @@
         final TreeSet set = new TreeSet( new Comparator() {
             public int compare(Object arg0,
                                Object arg1) {
-                DefaultFactHandle f0 = ((ObjectMatches) arg0).getFactHandle();
-                DefaultFactHandle f1 = ((ObjectMatches) arg1).getFactHandle();
+                InternalFactHandle f0 = ((ObjectMatches) arg0).getFactHandle();
+                InternalFactHandle f1 = ((ObjectMatches) arg1).getFactHandle();
                 return (f0.getRecency() == f1.getRecency()) ? 0 : (f0.getRecency() > f1.getRecency()) ? 1 : -1;
             }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/InstanceEqualConstrRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/InstanceEqualConstrRightMemory.java	2006-09-12 13:14:13 UTC (rev 6171)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/InstanceEqualConstrRightMemory.java	2006-09-12 13:51:58 UTC (rev 6172)
@@ -24,6 +24,7 @@
 
 import org.drools.WorkingMemory;
 import org.drools.common.DefaultFactHandle;
+import org.drools.common.InternalFactHandle;
 import org.drools.reteoo.ObjectMatches;
 import org.drools.reteoo.ReteTuple;
 import org.drools.util.IdentityMap;
@@ -187,8 +188,8 @@
         final TreeSet set = new TreeSet( new Comparator() {
             public int compare(Object arg0,
                                Object arg1) {
-                DefaultFactHandle f0 = ((ObjectMatches) arg0).getFactHandle();
-                DefaultFactHandle f1 = ((ObjectMatches) arg1).getFactHandle();
+                InternalFactHandle f0 = ((ObjectMatches) arg0).getFactHandle();
+                InternalFactHandle f1 = ((ObjectMatches) arg1).getFactHandle();
                 return (f0.getRecency() == f1.getRecency()) ? 0 : (f0.getRecency() > f1.getRecency()) ? 1 : -1;
             }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java	2006-09-12 13:14:13 UTC (rev 6171)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/ObjectEqualConstrRightMemory.java	2006-09-12 13:51:58 UTC (rev 6172)
@@ -309,8 +309,8 @@
         final TreeSet set = new TreeSet( new Comparator() {
             public int compare(Object arg0,
                                Object arg1) {
-                DefaultFactHandle f0 = ((ObjectMatches) arg0).getFactHandle();
-                DefaultFactHandle f1 = ((ObjectMatches) arg1).getFactHandle();
+                InternalFactHandle f0 = ((ObjectMatches) arg0).getFactHandle();
+                InternalFactHandle f1 = ((ObjectMatches) arg1).getFactHandle();
                 return (f0.getRecency() == f1.getRecency()) ? 0 : (f0.getRecency() > f1.getRecency()) ? 1 : -1;
             }