[Jboss-svn-commits] JBL Code SVN: r4323 - in labs/jbossrules/trunk/drools-core/src/main/java/org/drools: . reteoo reteoo/beta

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

Author: tirelli
Date: 2006-05-18 21:11:06 -0400 (Thu, 18 May 2006)
New Revision: 4323

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkListFactory.java
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BetaMemoryFactory.java
Log:
Improving constant literals

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2006-05-18 22:40:30 UTC (rev 4322)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2006-05-19 01:11:06 UTC (rev 4323)
@@ -32,36 +32,53 @@
      * Property to enable/disable left beta memory indexing
      * Defaults to false 
      */
-    public static final String INDEX_LEFT_BETA_MEMORY  = "org.drools.reteoo.beta.index-left";
+    public static final String PROPERTY_INDEX_LEFT_BETA_MEMORY  = "org.drools.reteoo.beta.index-left";
     /**
      * Property to enable/disable right beta memory indexing
      * Defaults to true 
      */
-    public static final String INDEX_RIGHT_BETA_MEMORY = "org.drools.reteoo.beta.index-right";
+    public static final String PROPERTY_INDEX_RIGHT_BETA_MEMORY = "org.drools.reteoo.beta.index-right";
     /**
      * Property to enable/disable alpha node hashing inside object type nodes
      * Defaults to true 
      */
-    public static final String HASH_OBJECT_TYPE_NODES  = "org.drools.reteoo.alpha.hash-type-node";
+    public static final String PROPERTY_HASH_OBJECT_TYPE_NODES  = "org.drools.reteoo.alpha.hash-type-node";
     /**
      * Property to enable/disable alpha node hashing inside alpha nodes
      * Defaults to false 
      */
-    public static final String HASH_ALPHA_NODES        = "org.drools.reteoo.alpha.hash-alpha-node";
+    public static final String PROPERTY_HASH_ALPHA_NODES        = "org.drools.reteoo.alpha.hash-alpha-node";
+    /**
+     * Property to define working memory assert behavior. Valid values are "identity" or "equals".
+     * Defaults to identity 
+     */
+    public static final String PROPERTY_ASSERT_BEHAVIOR         = "org.drools.wm.assert-behavior";
+    /**
+     * Property to define working memory logical assert behavior. Valid values are "identity" or "equals".
+     * Defaults to identity 
+     */
+    public static final String PROPERTY_LOGICAL_ASSERT_BEHAVIOR = "org.drools.wm.logical-assert-behavior";
+    
+    public static final String WM_BEHAVIOR_IDENTITY = "identity";
+    public static final String WM_BEHAVIOR_EQUALS   = "equals";
 
     // a generated serial version id
     private static final long  serialVersionUID        = 2989084670778336973L;
 
     public RuleBaseConfiguration() {
         // default values
-        this.setProperty( INDEX_LEFT_BETA_MEMORY, 
-                          System.getProperty( INDEX_LEFT_BETA_MEMORY, "false" ) );
-        this.setProperty( INDEX_RIGHT_BETA_MEMORY,
-                          System.getProperty( INDEX_RIGHT_BETA_MEMORY, "true" ) );
-        this.setProperty( HASH_OBJECT_TYPE_NODES,
-                          System.getProperty( HASH_OBJECT_TYPE_NODES, "true" ) );
-        this.setProperty( HASH_ALPHA_NODES,
-                          System.getProperty( HASH_ALPHA_NODES, "false" ) );
+        this.setProperty( PROPERTY_INDEX_LEFT_BETA_MEMORY, 
+                          System.getProperty( PROPERTY_INDEX_LEFT_BETA_MEMORY, "false" ) );
+        this.setProperty( PROPERTY_INDEX_RIGHT_BETA_MEMORY,
+                          System.getProperty( PROPERTY_INDEX_RIGHT_BETA_MEMORY, "true" ) );
+        this.setProperty( PROPERTY_HASH_OBJECT_TYPE_NODES,
+                          System.getProperty( PROPERTY_HASH_OBJECT_TYPE_NODES, "true" ) );
+        this.setProperty( PROPERTY_HASH_ALPHA_NODES,
+                          System.getProperty( PROPERTY_HASH_ALPHA_NODES, "false" ) );
+        this.setProperty( PROPERTY_ASSERT_BEHAVIOR,
+                          System.getProperty( PROPERTY_ASSERT_BEHAVIOR, WM_BEHAVIOR_IDENTITY ) );
+        this.setProperty( PROPERTY_LOGICAL_ASSERT_BEHAVIOR,
+                          System.getProperty( PROPERTY_LOGICAL_ASSERT_BEHAVIOR, WM_BEHAVIOR_EQUALS ) );
     }
 
     public boolean getBooleanProperty(String prop) {

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkListFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkListFactory.java	2006-05-18 22:40:30 UTC (rev 4322)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/ObjectSinkListFactory.java	2006-05-19 01:11:06 UTC (rev 4323)
@@ -34,10 +34,10 @@
     }
     
     public final ObjectSinkList newObjectSinkList(Class owner) {
-        if ( config.getBooleanProperty( RuleBaseConfiguration.HASH_OBJECT_TYPE_NODES) && 
+        if ( config.getBooleanProperty( RuleBaseConfiguration.PROPERTY_HASH_OBJECT_TYPE_NODES) && 
              (ObjectTypeNode.class.isAssignableFrom( owner )) ) {
             return new HashedObjectSinkList();
-        } else if ( config.getBooleanProperty( RuleBaseConfiguration.HASH_ALPHA_NODES ) && 
+        } else if ( config.getBooleanProperty( RuleBaseConfiguration.PROPERTY_HASH_ALPHA_NODES ) && 
                    (AlphaNode.class.isAssignableFrom( owner )) ) {
             return new HashedObjectSinkList();
         }

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BetaMemoryFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BetaMemoryFactory.java	2006-05-18 22:40:30 UTC (rev 4322)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/beta/BetaMemoryFactory.java	2006-05-19 01:11:06 UTC (rev 4323)
@@ -50,7 +50,7 @@
         BetaLeftMemory memory = null;
         BetaLeftMemory innerMostMemory = null;
         FieldConstraint[] constraints = (binder != null) ? binder.getConstraints() : null;
-        if ( (constraints != null) && (config.getBooleanProperty( RuleBaseConfiguration.INDEX_LEFT_BETA_MEMORY ))) {
+        if ( (constraints != null) && (config.getBooleanProperty( RuleBaseConfiguration.PROPERTY_INDEX_LEFT_BETA_MEMORY ))) {
             for ( int i = 0; i < constraints.length; i++ ) {
                 if ( constraints[i] instanceof BoundVariableConstraint ) {
                     BoundVariableConstraint bvc = (BoundVariableConstraint) constraints[i];
@@ -113,7 +113,7 @@
         BetaRightMemory memory = null;
         BetaRightMemory innerMostMemory = null;
         FieldConstraint[] constraints = (binder != null) ? binder.getConstraints() : null;
-        if ( (constraints != null) && ( config.getBooleanProperty( RuleBaseConfiguration.INDEX_RIGHT_BETA_MEMORY ))) {
+        if ( (constraints != null) && ( config.getBooleanProperty( RuleBaseConfiguration.PROPERTY_INDEX_RIGHT_BETA_MEMORY ))) {
             for ( int i = 0; i < constraints.length; i++ ) {
                 if ( constraints[i] instanceof BoundVariableConstraint ) {
                     BoundVariableConstraint bvc = (BoundVariableConstraint) constraints[i];