[jboss-svn-commits] JBL Code SVN: r6754 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common

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

Author: mark.proctor at jboss.com
Date: 2006-10-12 08:17:13 -0400 (Thu, 12 Oct 2006)
New Revision: 6754

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java
Log:
JBRULES-498 Optimised HashMap implementations
-Skips the first test

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java	2006-10-12 12:04:00 UTC (rev 6753)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java	2006-10-12 12:17:13 UTC (rev 6754)
@@ -112,8 +112,8 @@
      * @see org.drools.common.BetaNodeConstraints#isAllowedCachedLeft(java.lang.Object)
      */
     public boolean isAllowedCachedLeft(Object object) {
-        return this.constraint0.isAllowedCachedLeft( context0,
-                                                     object ) && this.constraint1.isAllowedCachedLeft( context1,
+        return ( this.indexed || this.constraint0.isAllowedCachedLeft( context0,
+                                                     object ) ) && this.constraint1.isAllowedCachedLeft( context1,
                                                                                                        object );
     }
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java	2006-10-12 12:04:00 UTC (rev 6753)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java	2006-10-12 12:17:13 UTC (rev 6754)
@@ -17,30 +17,16 @@
  */
 
 import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-import org.drools.WorkingMemory;
 import org.drools.base.evaluators.Operator;
-import org.drools.common.InstanceNotEqualsConstraint.InstanceNotEqualsConstraintContextEntry;
 import org.drools.reteoo.BetaMemory;
-import org.drools.reteoo.ObjectHashTable;
 import org.drools.reteoo.ReteTuple;
 import org.drools.rule.ContextEntry;
-import org.drools.rule.Declaration;
-import org.drools.rule.LiteralConstraint;
 import org.drools.rule.VariableConstraint;
 import org.drools.spi.BetaNodeFieldConstraint;
-import org.drools.spi.Constraint;
-import org.drools.spi.Evaluator;
-import org.drools.spi.AlphaNodeFieldConstraint;
-import org.drools.spi.FieldExtractor;
-import org.drools.spi.Tuple;
 import org.drools.util.FactHashTable;
 import org.drools.util.FieldIndexHashTable;
 import org.drools.util.LinkedList;
 import org.drools.util.LinkedListEntry;
-import org.drools.util.LinkedListNode;
 import org.drools.util.TupleHashTable;
 
 public class SingleBetaConstraints
@@ -96,8 +82,8 @@
      * @see org.drools.common.BetaNodeConstraints#isAllowedCachedLeft(java.lang.Object)
      */
     public boolean isAllowedCachedLeft(Object object) {
-        return this.constraint.isAllowedCachedLeft( context,
-                                                    object );
+        return this.indexed || this.constraint.isAllowedCachedLeft( context,
+                                                                    object );
     }
 
     /* (non-Javadoc)

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java	2006-10-12 12:04:00 UTC (rev 6753)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java	2006-10-12 12:17:13 UTC (rev 6754)
@@ -119,8 +119,8 @@
      * @see org.drools.common.BetaNodeConstraints#isAllowedCachedLeft(java.lang.Object)
      */
     public boolean isAllowedCachedLeft(Object object) {
-        return this.constraint0.isAllowedCachedLeft( context0,
-                                                     object ) && this.constraint1.isAllowedCachedLeft( context1,
+        return ( this.indexed || this.constraint0.isAllowedCachedLeft( context0,
+                                                                       object ) ) && this.constraint1.isAllowedCachedLeft( context1,
                                                                                                        object ) && this.constraint2.isAllowedCachedLeft( context2,
                                                                                                                                                          object );
     }