[jboss-svn-commits] JBL Code SVN: r6688 - 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:16:23 -0400 (Sun, 08 Oct 2006)
New Revision: 6688

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/BetaNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java
   labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java
Log:
JBRULES-498 Optimised HashMap implementations
-Added  extra print info

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-08 13:41:57 UTC (rev 6687)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/AlphaNode.java	2006-10-08 14:16:23 UTC (rev 6688)
@@ -52,9 +52,6 @@
     /** The <code>FieldConstraint</code> */
     private final FieldConstraint constraint;
 
-    /** The <code>ObjectSource</code> */
-    private final ObjectSource    objectSource;
-
     private ObjectSinkNode        previousObjectSinkNode;
     private ObjectSinkNode        nextObjectSinkNode;
 

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 13:41:57 UTC (rev 6687)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/BetaNode.java	2006-10-08 14:16:23 UTC (rev 6688)
@@ -57,10 +57,10 @@
     // ------------------------------------------------------------
 
     /** The left input <code>TupleSource</code>. */
-    private final TupleSource           leftInput;
+    protected final TupleSource           leftInput;
 
     /** The right input <code>TupleSource</code>. */
-    private final ObjectSource          rightInput;
+    protected final ObjectSource          rightInput;
 
     protected final BetaNodeConstraints constraints;
 

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java	2006-10-08 13:41:57 UTC (rev 6687)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/JoinNode.java	2006-10-08 14:16:23 UTC (rev 6688)
@@ -226,6 +226,11 @@
     }
     
     public String toString() {
-        return "[JoinNode]";
+        ObjectSource source = this.rightInput;
+        while ( source.getClass() != ObjectTypeNode.class ) {
+            source = source.objectSource;
+        }
+        
+        return "[JoinNode - " + ((ObjectTypeNode)source).getObjectType()+ "]";
     }
 }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java	2006-10-08 13:41:57 UTC (rev 6687)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/NotNode.java	2006-10-08 14:16:23 UTC (rev 6688)
@@ -251,6 +251,11 @@
     }
     
     public String toString() {
-        return "[NotNode]";
+        ObjectSource source = this.rightInput;
+        while ( source.getClass() != ObjectTypeNode.class ) {
+            source = source.objectSource;
+        }
+        
+        return "[NotNode - " + ((ObjectTypeNode)source).getObjectType()+ "]";
     }
 }

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 13:41:57 UTC (rev 6687)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/examples/manners/ReteooMannersTest.java	2006-10-08 14:16:23 UTC (rev 6688)
@@ -57,7 +57,7 @@
         //           
         //        });
 
-        final InputStream is = getClass().getResourceAsStream( "/manners128.dat" );
+        final InputStream is = getClass().getResourceAsStream( "/manners32.dat" );
         final List list = getInputObjects( is );
         for ( final Iterator it = list.iterator(); it.hasNext(); ) {
             final Object object = it.next();