[jboss-svn-commits] JBL Code SVN: r6690 - in labs/jbossrules/trunk/drools-core/src: main/java/org/drools/reteoo test/java/org/drools/examples/manners

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

Author: mark.proctor at jboss.com
Date: 2006-10-08 10:31:56 -0400 (Sun, 08 Oct 2006)
New Revision: 6690

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/MemoryVisitor.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
-We now dump data for each find seating iteration

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/MemoryVisitor.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/MemoryVisitor.java	2006-10-08 14:20:47 UTC (rev 6689)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/MemoryVisitor.java	2006-10-08 14:31:56 UTC (rev 6690)
@@ -2,8 +2,10 @@
 
 import java.lang.reflect.Field;
 
+import org.drools.base.ClassObjectType;
 import org.drools.common.BaseNode;
 import org.drools.common.InternalWorkingMemory;
+import org.drools.examples.manners.Context;
 import org.drools.reteoo.TerminalNode.TerminalNodeMemory;
 import org.drools.util.AbstractHashTable;
 import org.drools.util.Entry;
@@ -61,8 +63,11 @@
         //            }
     }
 
-    public void visitObjectTypeNode(final ObjectTypeNode node) {
-        System.out.println( indent() + node );
+    public void visitObjectTypeNode(final ObjectTypeNode node) {        
+        if  ( Context.class != ( ( ClassObjectType ) node.getObjectType() ).getClassType() ){
+            return;
+        }
+        System.out.println( indent() + node );        
         
         FactHashTable memory  = ( FactHashTable ) this.workingMemory.getNodeMemory( node );   
         checkObjectHashTable(memory);          

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 14:20:47 UTC (rev 6689)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/BaseMannersTest.java	2006-10-08 14:31:56 UTC (rev 6690)
@@ -38,6 +38,8 @@
 import org.drools.base.ShadowProxyFactory;
 import org.drools.base.ValueType;
 import org.drools.base.evaluators.Operator;
+import org.drools.common.InternalWorkingMemory;
+import org.drools.reteoo.MemoryVisitor;
 import org.drools.rule.Column;
 import org.drools.rule.Declaration;
 import org.drools.rule.InvalidRuleException;
@@ -199,7 +201,7 @@
 
             public void evaluate(KnowledgeHelper drools,
                                  WorkingMemory workingMemory) throws ConsequenceException {
-                try {
+                try {                    
                     Rule rule = drools.getRule();
                     Tuple tuple = drools.getTuple();
 
@@ -463,6 +465,9 @@
             public void evaluate(KnowledgeHelper drools,
                                  WorkingMemory workingMemory) throws ConsequenceException {
                 try {
+                    MemoryVisitor visitor = new MemoryVisitor( ( InternalWorkingMemory ) workingMemory );
+                    visitor.visit( workingMemory.getRuleBase() );
+                    
                     Rule rule = drools.getRule();
                     Tuple tuple = drools.getTuple();
 
@@ -511,7 +516,7 @@
                     drools.modifyObject( tuple.get( contextDeclaration ),
                                          context );
 
-                    System.err.println( "find seating : " + seating + " : " + path + " : " + chosen );
+                    System.out.println( "find seating : " + seating + " : " + path + " : " + chosen );
 
                 } catch ( Exception e ) {
                     e.printStackTrace();
@@ -841,7 +846,7 @@
                     drools.modifyObject( tuple.get( contextDeclaration ),
                                          context );
 
-                    System.err.println( "We Are Done!!!" );
+                    System.out.println( "We Are Done!!!" );
                 } catch ( Exception e ) {
                     throw new ConsequenceException( e );
                 }
@@ -960,7 +965,7 @@
             public void evaluate(KnowledgeHelper drools,
                                  WorkingMemory workingMemory) throws ConsequenceException {
                 try {
-                    System.err.println( "all done" );
+                    System.out.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 14:20:47 UTC (rev 6689)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java	2006-10-08 14:31:56 UTC (rev 6690)
@@ -57,7 +57,7 @@
         //           
         //        });
 
-        final InputStream is = getClass().getResourceAsStream( "/manners32.dat" );
+        final InputStream is = getClass().getResourceAsStream( "/manners16.dat" );
         final List list = getInputObjects( is );
         for ( final Iterator it = list.iterator(); it.hasNext(); ) {
             final Object object = it.next();
@@ -68,10 +68,7 @@
 
         final long start = System.currentTimeMillis();
         workingMemory.fireAllRules();
-        System.err.println( System.currentTimeMillis() - start );
-        
-        MemoryVisitor visitor = new MemoryVisitor( ( InternalWorkingMemory ) workingMemory );
-        visitor.visit( ruleBase );               
+        System.err.println( System.currentTimeMillis() - start );                   
 
         //        final ReteooJungViewer viewer = new ReteooJungViewer(ruleBase); 
         //