[jboss-svn-commits] JBL Code SVN: r17756 - labs/jbossrules/branches/righttuple/drools-core/src/main/java/org/drools/reteoo.

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

Author: mark.proctor at jboss.com
Date: 2008-01-11 22:37:03 -0500 (Fri, 11 Jan 2008)
New Revision: 17756

Modified:
   labs/jbossrules/branches/righttuple/drools-core/src/main/java/org/drools/reteoo/NotNode.java
Log:
-just testing node  memories

Modified: labs/jbossrules/branches/righttuple/drools-core/src/main/java/org/drools/reteoo/NotNode.java
===================================================================
--- labs/jbossrules/branches/righttuple/drools-core/src/main/java/org/drools/reteoo/NotNode.java	2008-01-12 02:11:42 UTC (rev 17755)
+++ labs/jbossrules/branches/righttuple/drools-core/src/main/java/org/drools/reteoo/NotNode.java	2008-01-12 03:37:03 UTC (rev 17756)
@@ -47,7 +47,7 @@
 
     private static final long serialVersionUID = 400L;
     static int                notAssertObject  = 0;
-    static int                notAssertTuple   = 0;
+    static int                notAssertTuple   = 0;    
 
     // ------------------------------------------------------------
     // Instance methods
@@ -91,8 +91,8 @@
         final BetaMemory memory = (BetaMemory) workingMemory.getNodeMemory( this );
 
         this.constraints.updateFromTuple( workingMemory,
-                                          leftTuple );
-
+                                          leftTuple );        
+        
         for ( RightTuple rightTuple = memory.getRightTupleMemory().getLast( leftTuple ); rightTuple != null; rightTuple = (RightTuple) rightTuple.getPrevious() ) {
             if ( this.constraints.isAllowedCachedLeft( rightTuple.getHandle() ) ) {
 
@@ -222,15 +222,10 @@
         memory.getRightTupleMemory().remove( rightTuple );
         
         if ( rightTuple.getBlocked() == null ) {
-            //System.out.println( "NotNode.retractObjject" + rightTuple.getHandle() + " : 0 : []");
             return;
         }           
 
-        //int blockedCount = 0;
-        //List list  = new  ArrayList();
-        
         for ( LeftTuple leftTuple = (LeftTuple) rightTuple.getBlocked(); leftTuple != null; ) {
-            //blockedCount++;
             LeftTuple temp = leftTuple.getBlockedNext();            
             
             leftTuple.setBlocker( null );
@@ -240,40 +235,37 @@
             this.constraints.updateFromTuple( workingMemory,
                                               leftTuple );
             
-            int blockSearch = 0;
-          // we know that older tuples have been checked so continue previously
-          for ( RightTuple newBlocker = memory.getRightTupleMemory().getFirst( leftTuple ); newBlocker != null; newBlocker = (RightTuple) newBlocker.getNext() ) {
-              //blockSearch++;
-              if ( this.constraints.isAllowedCachedLeft( newBlocker.getHandle() ) ) {
-                  leftTuple.setBlocker( newBlocker );
+//          // we know that older tuples have been checked so continue previously
+//          for ( RightTuple newBlocker = memory.getRightTupleMemory().getFirst( leftTuple ); newBlocker != null; newBlocker = (RightTuple) newBlocker.getNext() ) {
+//              if ( this.constraints.isAllowedCachedLeft( newBlocker.getHandle() ) ) {
+//                  leftTuple.setBlocker( newBlocker );
+//
+//                  LeftTuple blockedPrevious = newBlocker.getBlocked();
+//                  if ( blockedPrevious != null ) {
+//                      leftTuple.setBlockedNext( blockedPrevious );
+//                      blockedPrevious.setBlockedPrevious( leftTuple );
+//                  }
+//                  newBlocker.setBlocked( leftTuple );
+//
+//                  break;
+//              }
+//          }  
 
-                  LeftTuple blockedPrevious = newBlocker.getBlocked();
-                  if ( blockedPrevious != null ) {
-                      leftTuple.setBlockedNext( blockedPrevious );
-                      blockedPrevious.setBlockedPrevious( leftTuple );
-                  }
-                  newBlocker.setBlocked( leftTuple );
+            // we know that older tuples have been checked so continue previously
+            for ( RightTuple newBlocker = rootBlocker; newBlocker != null; newBlocker = (RightTuple) newBlocker.getPrevious() ) {
+                if ( this.constraints.isAllowedCachedLeft( newBlocker.getHandle() ) ) {
+                    leftTuple.setBlocker( newBlocker );
 
-                  break;
-              }
-          }  
-          //list.add( blockSearch );
+                    LeftTuple blockedPrevious = newBlocker.getBlocked();
+                    if ( blockedPrevious != null ) {
+                        leftTuple.setBlockedNext( blockedPrevious );
+                        blockedPrevious.setBlockedPrevious( leftTuple );
+                    }
+                    newBlocker.setBlocked( leftTuple );
 
-//            // we know that older tuples have been checked so continue previously
-//            for ( RightTuple newBlocker = rootBlocker; newBlocker != null; newBlocker = (RightTuple) newBlocker.getPrevious() ) {
-//                if ( this.constraints.isAllowedCachedLeft( newBlocker.getHandle() ) ) {
-//                    leftTuple.setBlocker( newBlocker );
-//
-//                    LeftTuple blockedPrevious = newBlocker.getBlocked();
-//                    if ( blockedPrevious != null ) {
-//                        leftTuple.setBlockedNext( blockedPrevious );
-//                        blockedPrevious.setBlockedPrevious( leftTuple );
-//                    }
-//                    newBlocker.setBlocked( leftTuple );
-//
-//                    break;
-//                }
-//            }
+                    break;
+                }
+            }
             
             if ( leftTuple.getBlocker() == null ) {
                 // was previous blocked and not in memory, so add
@@ -286,7 +278,6 @@
             
             leftTuple = temp;
         }
-        //System.out.println( "NotNode.retractObjject" + rightTuple.getHandle() + " : " + blockedCount + " : " + list);
     }
 
     /**