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

[<jbo...@li...>]

Author: mar...@jb...
Date: 2006-01-06 23:19:02 -0500 (Fri, 06 Jan 2006)
New Revision: 2012

Modified:
   trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/Builder.java
   trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/RuleBaseImpl.java
   trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/MannersTest.java
Log:
-Succesfully added Manner's RuleSet to a RuleBaseImpl, although Rete is still not correctly built

Modified: trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/Builder.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/Builder.java	2006-01-07 03:28:59 UTC (rev 2011)
+++ trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/Builder.java	2006-01-07 04:19:02 UTC (rev 2012)
@@ -181,7 +181,7 @@
                     ce = (ConditionalElement) ce.getChildren().get( 0 );
                 }
                 column = (Column) ce.getChildren().get( 0 );
-                binder = attachColumn( (Column) object,
+                binder = attachColumn( column,
                                        and );
 
                 // If a tupleSource does not exist then we need to adapt an
@@ -267,7 +267,7 @@
                                                                (LiteralConstraint) constraint,
                                                                true,
                                                                objectSource ) );
-            } else {
+            } else if (constraint instanceof BetaNodeConstraint ){
                 predicateConstraints.add( constraint );
             }
         }

Modified: trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/RuleBaseImpl.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/RuleBaseImpl.java	2006-01-07 03:28:59 UTC (rev 2011)
+++ trunk/labs/jbossrules/drools-core/src/main/java/org/drools/reteoo/RuleBaseImpl.java	2006-01-07 04:19:02 UTC (rev 2012)
@@ -41,6 +41,7 @@
  */
 
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.Map;
 import java.util.Set;
@@ -69,7 +70,7 @@
  * 
  * @version $Id: RuleBaseImpl.java,v 1.5 2005/08/14 22:44:12 mproctor Exp $
  */
-class RuleBaseImpl
+public class RuleBaseImpl
     implements
     RuleBase {
     // ------------------------------------------------------------
@@ -113,10 +114,10 @@
      * @param rete
      *            The rete network.
      */
-    RuleBaseImpl() {
+    public RuleBaseImpl() {
         this( DefaultConflictResolver.getInstance(),
               new DefaultFactHandleFactory(),
-              null,
+              new HashSet(),
               new HashMap(),
               new RuleBaseContext() );
     }
@@ -133,7 +134,7 @@
      * @param ruleSets
      * @param applicationData
      */
-    RuleBaseImpl(ConflictResolver conflictResolver,
+    public RuleBaseImpl(ConflictResolver conflictResolver,
                  FactHandleFactory factHandleFactory,
                  Set ruleSets,
                  Map applicationData,
@@ -274,8 +275,7 @@
         Map newApplicationData = ruleSet.getApplicationData();
 
         // Check that the application data is valid, we cannot change the type
-        // of an already declared
-        // application data variable
+        // of an already declared application data variable
         for ( Iterator it = newApplicationData.keySet().iterator(); it.hasNext(); ) {
             String identifier = (String) it.next();
             Class type = (Class) newApplicationData.get( identifier );

Modified: trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/MannersTest.java
===================================================================
--- trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/MannersTest.java	2006-01-07 03:28:59 UTC (rev 2011)
+++ trunk/labs/jbossrules/drools-core/src/test/java/org/drools/examples/manners/MannersTest.java	2006-01-07 04:19:02 UTC (rev 2012)
@@ -14,7 +14,11 @@
 
 import org.drools.Cheese;
 import org.drools.FactException;
+import org.drools.RuleBase;
+import org.drools.RuleIntegrationException;
+import org.drools.RuleSetIntegrationException;
 import org.drools.WorkingMemory;
+import org.drools.reteoo.RuleBaseImpl;
 import org.drools.rule.And;
 import org.drools.rule.BoundVariableConstraint;
 import org.drools.rule.Column;
@@ -23,6 +27,7 @@
 import org.drools.rule.DuplicateRuleNameException;
 import org.drools.rule.EvaluatorFactory;
 import org.drools.rule.FieldBinding;
+import org.drools.rule.InvalidPatternException;
 import org.drools.rule.InvalidRuleException;
 import org.drools.rule.LiteralConstraint;
 import org.drools.rule.Not;
@@ -97,15 +102,20 @@
 
     }
     
-    public void test1() throws DuplicateRuleNameException, InvalidRuleException, IntrospectionException {
+    public void test1() throws DuplicateRuleNameException, InvalidRuleException, IntrospectionException, RuleIntegrationException, RuleSetIntegrationException, InvalidPatternException, FactException {
         RuleSet ruleSet = new RuleSet( "Miss Manners" );
         ruleSet.addRule( getAssignFirstSeatRule() );
-        ruleSet.addRule( getMakePath() );
-        ruleSet.addRule( getFindSeating() );
-        ruleSet.addRule( getPathDone() );
-        ruleSet.addRule( getAreWeDone() );
-        ruleSet.addRule( getContinueProcessing() );
-        ruleSet.addRule( getAllDone() );
+//        ruleSet.addRule( getMakePath() );
+//        ruleSet.addRule( getFindSeating() );
+//        ruleSet.addRule( getPathDone() );
+//        ruleSet.addRule( getAreWeDone() );
+//        ruleSet.addRule( getContinueProcessing() );
+//        ruleSet.addRule( getAllDone() );
+        
+        RuleBaseImpl ruleBase = new RuleBaseImpl();
+        ruleBase.addRuleSet( ruleSet );
+        
+        System.out.println( "ttt" );
     }
 
     /**