[jboss-svn-commits] JBL Code SVN: r7156 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Oct 26 20:19:32 EDT 2006
Author: tirelli
Date: 2006-10-26 20:19:26 -0400 (Thu, 26 Oct 2006)
New Revision: 7156
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/QuadroupleBetaConstraints.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-527: adding primitive support to alpha hashing code
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-26 23:13:49 UTC (rev 7155)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DoubleBetaConstraints.java 2006-10-27 00:19:26 UTC (rev 7156)
@@ -146,7 +146,8 @@
if ( this.indexed0 ) {
final VariableConstraint variableConstraint = (VariableConstraint) this.constraint0;
final FieldIndex index = new FieldIndex( variableConstraint.getFieldExtractor(),
- variableConstraint.getRequiredDeclarations()[0] );
+ variableConstraint.getRequiredDeclarations()[0],
+ variableConstraint.getEvaluator());
list.add( index );
}
@@ -154,7 +155,8 @@
if ( this.indexed1 ) {
final VariableConstraint variableConstraint = (VariableConstraint) this.constraint1;
final FieldIndex index = new FieldIndex( variableConstraint.getFieldExtractor(),
- variableConstraint.getRequiredDeclarations()[0] );
+ variableConstraint.getRequiredDeclarations()[0],
+ variableConstraint.getEvaluator());
list.add( index );
}
@@ -171,7 +173,7 @@
}
public int hashCode() {
- return this.constraint0.hashCode() ^ this.constraint0.hashCode();
+ return this.constraint0.hashCode() ^ this.constraint1.hashCode();
}
/* (non-Javadoc)
@@ -204,11 +206,11 @@
final DoubleBetaConstraints other = (DoubleBetaConstraints) object;
- if ( this.constraint0 != other.constraint0 && this.constraint0.equals( other.constraint0 ) ) {
+ if ( this.constraint0 != other.constraint0 && ! this.constraint0.equals( other.constraint0 ) ) {
return false;
}
- if ( this.constraint1 != other.constraint1 && this.constraint1.equals( other.constraint1 ) ) {
+ if ( this.constraint1 != other.constraint1 && ! this.constraint1.equals( other.constraint1 ) ) {
return false;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java 2006-10-26 23:13:49 UTC (rev 7155)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/QuadroupleBetaConstraints.java 2006-10-27 00:19:26 UTC (rev 7156)
@@ -224,7 +224,8 @@
if ( this.indexed0 ) {
final VariableConstraint variableConstraint = (VariableConstraint) this.constraint0;
final FieldIndex index = new FieldIndex( variableConstraint.getFieldExtractor(),
- variableConstraint.getRequiredDeclarations()[0] );
+ variableConstraint.getRequiredDeclarations()[0],
+ variableConstraint.getEvaluator());
list.add( index );
}
@@ -232,14 +233,16 @@
if ( this.indexed1 ) {
final VariableConstraint variableConstraint = (VariableConstraint) this.constraint1;
final FieldIndex index = new FieldIndex( variableConstraint.getFieldExtractor(),
- variableConstraint.getRequiredDeclarations()[0] );
+ variableConstraint.getRequiredDeclarations()[0],
+ variableConstraint.getEvaluator());
list.add( index );
}
if ( this.indexed2 ) {
final VariableConstraint variableConstraint = (VariableConstraint) this.constraint2;
final FieldIndex index = new FieldIndex( variableConstraint.getFieldExtractor(),
- variableConstraint.getRequiredDeclarations()[0] );
+ variableConstraint.getRequiredDeclarations()[0],
+ variableConstraint.getEvaluator());
list.add( index );
}
@@ -256,7 +259,7 @@
}
public int hashCode() {
- return this.constraint0.hashCode() ^ this.constraint0.hashCode() ^ this.constraint0.hashCode();
+ return this.constraint0.hashCode() ^ this.constraint1.hashCode() ^ this.constraint2.hashCode() ^ this.constraint3.hashCode();
}
/* (non-Javadoc)
@@ -267,6 +270,7 @@
list.add( new LinkedListEntry( this.constraint0 ) );
list.add( new LinkedListEntry( this.constraint1 ) );
list.add( new LinkedListEntry( this.constraint2 ) );
+ list.add( new LinkedListEntry( this.constraint3 ) );
return list;
}
@@ -290,18 +294,22 @@
final QuadroupleBetaConstraints other = (QuadroupleBetaConstraints) object;
- if ( this.constraint0 != other.constraint0 && this.constraint0.equals( other.constraint0 ) ) {
+ if ( this.constraint0 != other.constraint0 && ! this.constraint0.equals( other.constraint0 ) ) {
return false;
}
- if ( this.constraint1 != other.constraint1 && this.constraint1.equals( other.constraint1 ) ) {
+ if ( this.constraint1 != other.constraint1 && ! this.constraint1.equals( other.constraint1 ) ) {
return false;
}
- if ( this.constraint2 != other.constraint2 && this.constraint2.equals( other.constraint2 ) ) {
+ if ( this.constraint2 != other.constraint2 && ! this.constraint2.equals( other.constraint2 ) ) {
return false;
}
+ if ( this.constraint3 != other.constraint3 && ! this.constraint3.equals( other.constraint3 ) ) {
+ return false;
+ }
+
return true;
}
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-26 23:13:49 UTC (rev 7155)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/SingleBetaConstraints.java 2006-10-27 00:19:26 UTC (rev 7156)
@@ -114,7 +114,8 @@
if ( this.indexed ) {
final VariableConstraint variableConstraint = (VariableConstraint) this.constraint;
final FieldIndex index = new FieldIndex( variableConstraint.getFieldExtractor(),
- variableConstraint.getRequiredDeclarations()[0] );
+ variableConstraint.getRequiredDeclarations()[0],
+ variableConstraint.getEvaluator());
memory = new BetaMemory( new TupleIndexHashTable( new FieldIndex[]{index} ),
new FactHandleIndexHashTable( new FieldIndex[]{index} ) );
} else {
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-26 23:13:49 UTC (rev 7155)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/TripleBetaConstraints.java 2006-10-27 00:19:26 UTC (rev 7156)
@@ -192,7 +192,8 @@
if ( this.indexed0 ) {
final VariableConstraint variableConstraint = (VariableConstraint) this.constraint0;
final FieldIndex index = new FieldIndex( variableConstraint.getFieldExtractor(),
- variableConstraint.getRequiredDeclarations()[0] );
+ variableConstraint.getRequiredDeclarations()[0],
+ variableConstraint.getEvaluator());
list.add( index );
}
@@ -200,14 +201,16 @@
if ( this.indexed1 ) {
final VariableConstraint variableConstraint = (VariableConstraint) this.constraint1;
final FieldIndex index = new FieldIndex( variableConstraint.getFieldExtractor(),
- variableConstraint.getRequiredDeclarations()[0] );
+ variableConstraint.getRequiredDeclarations()[0],
+ variableConstraint.getEvaluator());
list.add( index );
}
if ( this.indexed2 ) {
final VariableConstraint variableConstraint = (VariableConstraint) this.constraint2;
final FieldIndex index = new FieldIndex( variableConstraint.getFieldExtractor(),
- variableConstraint.getRequiredDeclarations()[0] );
+ variableConstraint.getRequiredDeclarations()[0],
+ variableConstraint.getEvaluator());
list.add( index );
}
@@ -224,7 +227,7 @@
}
public int hashCode() {
- return this.constraint0.hashCode() ^ this.constraint0.hashCode() ^ this.constraint0.hashCode();
+ return this.constraint0.hashCode() ^ this.constraint1.hashCode() ^ this.constraint2.hashCode();
}
/* (non-Javadoc)
@@ -258,15 +261,15 @@
final TripleBetaConstraints other = (TripleBetaConstraints) object;
- if ( this.constraint0 != other.constraint0 && this.constraint0.equals( other.constraint0 ) ) {
+ if ( this.constraint0 != other.constraint0 && ! this.constraint0.equals( other.constraint0 ) ) {
return false;
}
- if ( this.constraint1 != other.constraint1 && this.constraint1.equals( other.constraint1 ) ) {
+ if ( this.constraint1 != other.constraint1 && ! this.constraint1.equals( other.constraint1 ) ) {
return false;
}
- if ( this.constraint2 != other.constraint2 && this.constraint2.equals( other.constraint2 ) ) {
+ if ( this.constraint2 != other.constraint2 && ! this.constraint2.equals( other.constraint2 ) ) {
return false;
}
More information about the jboss-svn-commits
mailing list