[jboss-svn-commits] JBL Code SVN: r6698 - in labs/jbossrules/trunk/drools-core/src: main/java/org/drools/common main/java/org/drools/reteoo test/java/org/drools/examples/manners
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Sun Oct 8 18:14:38 EDT 2006
Author: mark.proctor at jboss.com
Date: 2006-10-08 18:14:34 -0400 (Sun, 08 Oct 2006)
New Revision: 6698
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java
Log:
JBRULES-498 Optimised HashMap implementations
-manners now appears to be working, but is still slow :(
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java 2006-10-08 19:31:33 UTC (rev 6697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/DefaultFactHandle.java 2006-10-08 22:14:34 UTC (rev 6698)
@@ -106,7 +106,7 @@
* @see FactHandle
*/
public String toExternalForm() {
- return "[fid:" + this.id + ":" + this.recency + "]";
+ return "[fid:" + this.id + ":" + this.recency + ":" + this.object + "]";
}
/**
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java 2006-10-08 19:31:33 UTC (rev 6697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java 2006-10-08 22:14:34 UTC (rev 6698)
@@ -189,10 +189,13 @@
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
public String toString() {
- // return "[JoinNode: common=" + this.commonDeclarations + "; decls=" +
- // this.tupleDeclarations + "]";
return "";
}
+
+ public void dumpMemory(InternalWorkingMemory workingMemory) {
+ MemoryVisitor visitor = new MemoryVisitor( workingMemory );
+ visitor.visit( this );
+ }
/* (non-Javadoc)
* @see org.drools.reteoo.BaseNode#hashCode()
@@ -237,7 +240,7 @@
Evaluator evaluator = variableConstraint.getEvaluator();
if ( evaluator.getOperator() == Operator.EQUAL ) {
// remove this entry
- constraints.remove( entry );
+ //constraints.remove( entry );
memory = new BetaMemory( new TupleHashTable(),
new FieldIndexHashTable( extractor,
variableConstraint.getRequiredDeclarations()[0] ) );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2006-10-08 19:31:33 UTC (rev 6697)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ReteooRuleBase.java 2006-10-08 22:14:34 UTC (rev 6698)
@@ -30,6 +30,7 @@
import org.drools.WorkingMemory;
import org.drools.common.AbstractRuleBase;
import org.drools.common.DefaultFactHandle;
+import org.drools.common.InternalFactHandle;
import org.drools.rule.CompositePackageClassLoader;
import org.drools.rule.InvalidPatternException;
import org.drools.rule.Rule;
@@ -204,7 +205,7 @@
public void retractObject(final FactHandle handle,
final PropagationContext context,
final ReteooWorkingMemory workingMemory) throws FactException {
- getRete().retractObject( (DefaultFactHandle) handle,
+ getRete().retractObject( (InternalFactHandle) handle,
context,
workingMemory );
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java 2006-10-08 19:31:33 UTC (rev 6697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java 2006-10-08 22:14:34 UTC (rev 6698)
@@ -143,7 +143,7 @@
* drools.assert( new Path( count.getValue(), 1, guestName ) );
* count.setCount( count.getValue() + 1 );
*
- * System.out.println( "seat 1 " + guest.getName() + " );
+ * System.err.println( "seat 1 " + guest.getName() + " );
*
* context.setPath( Context.ASSIGN_SEATS );
* }
@@ -234,7 +234,7 @@
context.setState( Context.ASSIGN_SEATS );
drools.modifyObject( tuple.get( contextDeclaration ),
context );
- System.out.println( "assign first seat : " + seating + " : " + path );
+ System.err.println( "assign first seat : " + seating + " : " + path );
} catch ( Exception e ) {
e.printStackTrace();
@@ -276,7 +276,7 @@
* drools.assert( new Path( countValue, leftGuestName, newSeat );
* drools.assert( new Chosen( id, leftGuestName, rightGuestHobby ) );
*
- * System.out.println( "seat " + rightSeat + " " + rightSeatName + " " + leftGuestName );
+ * System.err.println( "seat " + rightSeat + " " + rightSeatName + " " + leftGuestName );
*
* count.setCount( countValue + 1 );
* context.setPath( Context.MAKE_PATH );
@@ -454,7 +454,7 @@
// drools.assert( new Path( countValue, leftGuestName, newSeat );
// drools.assert( new Chosen( id, leftGuestName, rightGuestHobby ) );
//
- // System.out.println( "seat " + rightSeat + " " + rightSeatName + " " +
+ // System.err.println( "seat " + rightSeat + " " + rightSeatName + " " +
// leftGuestName );
//
// count.setCount( countValue + 1 );
@@ -465,8 +465,8 @@
public void evaluate(KnowledgeHelper drools,
WorkingMemory workingMemory) throws ConsequenceException {
try {
- MemoryVisitor visitor = new MemoryVisitor( ( InternalWorkingMemory ) workingMemory );
- visitor.visit( workingMemory.getRuleBase() );
+// MemoryVisitor visitor = new MemoryVisitor( ( InternalWorkingMemory ) workingMemory );
+// visitor.visit( workingMemory.getRuleBase() );
Rule rule = drools.getRule();
Tuple tuple = drools.getTuple();
@@ -516,7 +516,7 @@
drools.modifyObject( tuple.get( contextDeclaration ),
context );
- System.out.println( "find seating : " + seating + " : " + path + " : " + chosen );
+ System.err.println( "find seating : " + seating + " : " + path + " : " + chosen );
} catch ( Exception e ) {
e.printStackTrace();
@@ -659,7 +659,7 @@
drools.assertObject( path );
- //System.out.println( "make path : " + path );
+ //System.err.println( "make path : " + path );
} catch ( Exception e ) {
e.printStackTrace();
throw new ConsequenceException( e );
@@ -745,7 +745,7 @@
seating.setPathDone( true );
// if ( seating.getId() == 6 ) {
-// System.out.println( "pause" );
+// System.err.println( "pause" );
// }
drools.modifyObject( tuple.get( seatingDeclaration ),
seating );
@@ -753,7 +753,7 @@
context.setState( Context.CHECK_DONE );
drools.modifyObject( tuple.get( contextDeclaration ),
context );
- //System.out.println( "path done" + seating );
+ //System.err.println( "path done" + seating );
} catch ( Exception e ) {
throw new ConsequenceException( e );
}
@@ -846,7 +846,7 @@
drools.modifyObject( tuple.get( contextDeclaration ),
context );
- System.out.println( "We Are Done!!!" );
+ System.err.println( "We Are Done!!!" );
} catch ( Exception e ) {
throw new ConsequenceException( e );
}
@@ -910,7 +910,7 @@
drools.modifyObject( tuple.get( contextDeclaration ),
context );
- //System.out.println( "continue processing" );
+ //System.err.println( "continue processing" );
} catch ( Exception e ) {
e.printStackTrace();
throw new ConsequenceException( e );
@@ -965,7 +965,7 @@
public void evaluate(KnowledgeHelper drools,
WorkingMemory workingMemory) throws ConsequenceException {
try {
- System.out.println( "all done" );
+ System.err.println( "all done" );
} catch ( Exception e ) {
throw new ConsequenceException( e );
}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java 2006-10-08 19:31:33 UTC (rev 6697)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java 2006-10-08 22:14:34 UTC (rev 6698)
@@ -57,7 +57,7 @@
//
// });
- final InputStream is = getClass().getResourceAsStream( "/manners5.dat" );
+ final InputStream is = getClass().getResourceAsStream( "/manners128.dat" );
final List list = getInputObjects( is );
for ( final Iterator it = list.iterator(); it.hasNext(); ) {
final Object object = it.next();
More information about the jboss-svn-commits
mailing list