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

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

Author: mark.proctor at jboss.com
Date: 2006-10-12 21:12:26 -0400 (Thu, 12 Oct 2006)
New Revision: 6777

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSink.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSource.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java
Log:
JBRULES-498 Optimised HashMap implementations
-minor updates

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java	2006-10-13 00:19:49 UTC (rev 6776)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java	2006-10-13 01:12:26 UTC (rev 6777)
@@ -47,7 +47,7 @@
     /**
      * 
      */
-    private static final long     serialVersionUID = 8936511451364612838L;
+    private static final long     serialVersionUID = 320L;
 
     /** The <code>FieldConstraint</code> */
     private final AlphaNodeFieldConstraint constraint;

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSink.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSink.java	2006-10-13 00:19:49 UTC (rev 6776)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSink.java	2006-10-13 01:12:26 UTC (rev 6777)
@@ -58,5 +58,5 @@
      */
     void retractObject(InternalFactHandle handle,
                        PropagationContext context,
-                       InternalWorkingMemory workingMemory);  
+                       InternalWorkingMemory workingMemory);      
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSource.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSource.java	2006-10-13 00:19:49 UTC (rev 6776)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSource.java	2006-10-13 01:12:26 UTC (rev 6777)
@@ -120,5 +120,9 @@
         }         
     }
     
-    public abstract void updateSink(ObjectSink sink, PropagationContext context, InternalWorkingMemory workingMemory);    
+    public abstract void updateSink(ObjectSink sink, PropagationContext context, InternalWorkingMemory workingMemory);
+    
+    public ObjectSinkPropagator getSinkPropagator() {
+        return this.sink;
+    }
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java	2006-10-13 00:19:49 UTC (rev 6776)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/VariableConstraint.java	2006-10-13 01:12:26 UTC (rev 6777)
@@ -16,15 +16,11 @@
  * limitations under the License.
  */
 
-import org.drools.WorkingMemory;
 import org.drools.common.InternalFactHandle;
 import org.drools.reteoo.ReteTuple;
 import org.drools.spi.BetaNodeFieldConstraint;
 import org.drools.spi.Evaluator;
-import org.drools.spi.AlphaNodeFieldConstraint;
 import org.drools.spi.FieldExtractor;
-import org.drools.spi.Tuple;
-import org.drools.util.BaseEntry;
 
 public class VariableConstraint
     implements
@@ -45,12 +41,12 @@
         this.restriction = new VariableRestriction( declaration,
                                                     evaluator );
     }
-    
+
     public VariableConstraint(final FieldExtractor fieldExtractor,
                               final VariableRestriction restriction) {
         this.fieldExtractor = fieldExtractor;
         this.restriction = restriction;
-    }    
+    }
 
     public Declaration[] getRequiredDeclarations() {
         return this.restriction.getRequiredDeclarations();
@@ -64,20 +60,25 @@
         return this.restriction.getEvaluator();
     }
 
-    public boolean isAllowedCachedLeft(ContextEntry context, Object object ) {
-        return this.restriction.isAllowedCachedLeft( context, this.fieldExtractor.getValue( object ) );        
-    }    
-    
-    public boolean isAllowedCachedRight(ReteTuple tuple, ContextEntry context) {
-        return this.restriction.isAllowedCachedRight( tuple, context );        
-    }        
-    
+    public boolean isAllowedCachedLeft(ContextEntry context,
+                                       Object object) {
+        return this.restriction.isAllowedCachedLeft( context,
+                                                     this.fieldExtractor.getValue( object ) );
+    }
+
+    public boolean isAllowedCachedRight(ReteTuple tuple,
+                                        ContextEntry context) {
+        return this.restriction.isAllowedCachedRight( tuple,
+                                                      context );
+    }
+
     public String toString() {
         return "[VariableConstraint fieldExtractor=" + this.fieldExtractor + " declaration=" + getRequiredDeclarations() + "]";
     }
-    
+
     public ContextEntry getContextEntry() {
-        return new  VariableContextEntry(this.fieldExtractor,  this.restriction.getRequiredDeclarations()[0] );
+        return new VariableContextEntry( this.fieldExtractor,
+                                         this.restriction.getRequiredDeclarations()[0] );
     }
 
     public int hashCode() {
@@ -101,39 +102,39 @@
 
         return this.fieldExtractor.equals( other.fieldExtractor ) && this.restriction.equals( other.restriction );
     }
-    
-    
-    public static class VariableContextEntry implements ContextEntry {
-        public Object left;
-        public Object right;        
-        
+
+    public static class VariableContextEntry
+        implements
+        ContextEntry {
+        public Object          left;
+        public Object          right;
+
         private FieldExtractor extractor;
-        private Declaration declaration;
-        private ContextEntry entry;
-        
-        
-        public VariableContextEntry(FieldExtractor extractor, Declaration declaration) {
+        private Declaration    declaration;
+        private ContextEntry   entry;
+
+        public VariableContextEntry(FieldExtractor extractor,
+                                    Declaration declaration) {
             this.extractor = extractor;
             this.declaration = declaration;
-        }       
-        
+        }
+
         public ContextEntry getNext() {
             return this.entry;
         }
-        
-        public void setNext(ContextEntry  entry) {
+
+        public void setNext(ContextEntry entry) {
             this.entry = entry;
-        }        
-        
+        }
+
         public void updateFromTuple(ReteTuple tuple) {
-            this.left =  this.declaration.getValue( tuple.get( this.declaration ).getObject() );            
+            this.left = this.declaration.getValue( tuple.get( this.declaration ).getObject() );
         }
-        
+
         public void updateFromFactHandle(InternalFactHandle handle) {
             this.right = this.extractor.getValue( handle.getObject() );
-            
-        }                        
+
+        }
     }
-    
 
 }
\ No newline at end of file