[jboss-svn-commits] JBL Code SVN: r19365 - in labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools: rule/builder/dialect/mvel and 1 other directory.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Tue Apr 1 15:16:36 EDT 2008
Author: mark.proctor at jboss.com
Date: 2008-04-01 15:16:36 -0400 (Tue, 01 Apr 2008)
New Revision: 19365
Modified:
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java
labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
Log:
JBRULES-1520 RightTuple merge for asymmetrical Rete propagations
-Fixing for queries which requires no left memory.
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java 2008-04-01 19:16:19 UTC (rev 19364)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/waltz/Waltz.java 2008-04-01 19:16:36 UTC (rev 19365)
@@ -20,6 +20,7 @@
import org.drools.PackageIntegrationException;
import org.drools.RuleBase;
import org.drools.RuleIntegrationException;
+import org.drools.StatefulSession;
import org.drools.WorkingMemory;
import org.drools.compiler.DrlParser;
import org.drools.compiler.DroolsParserException;
@@ -48,31 +49,33 @@
//load up the rulebase
final RuleBase ruleBase = readRule();
- final WorkingMemory workingMemory = ruleBase.newStatefulSession();
-
- workingMemory.setGlobal( "sysout",
- System.out );
-
- // DebugWorkingMemoryEventListener wmListener = new DebugWorkingMemoryEventListener();
- // DebugAgendaEventListener agendaListener = new DebugAgendaEventListener();
- // workingMemory.addEventListener( wmListener );
- // workingMemory.addEventListener( agendaListener );
-
- //go !
- this.loadLines( workingMemory,
- "waltz50.dat" );
-
- //final Stage stage = new Stage( Stage.START );
- //workingMemory.assertObject( stage );
-
- final long start = System.currentTimeMillis();
-
- final Stage stage = new Stage( Stage.DUPLICATE );
- workingMemory.insert( stage );
- workingMemory.fireAllRules();
-
- final long end = System.currentTimeMillis();
- System.out.println( end - start );
+ for ( int i = 0; i < 5; i++ ) {
+ final StatefulSession session = ruleBase.newStatefulSession();
+
+ // workingMemory.setGlobal( "sysout",
+ // System.out );
+
+ // DebugWorkingMemoryEventListener wmListener = new DebugWorkingMemoryEventListener();
+ // DebugAgendaEventListener agendaListener = new DebugAgendaEventListener();
+ // workingMemory.addEventListener( wmListener );
+ // workingMemory.addEventListener( agendaListener );
+
+ //go !
+ this.loadLines( session,
+ "waltz50.dat" );
+
+ //final Stage stage = new Stage( Stage.START );
+ //workingMemory.assertObject( stage );
+
+ final long start = System.currentTimeMillis();
+
+ final Stage stage = new Stage( Stage.DUPLICATE );
+ session.insert( stage );
+ session.fireAllRules();
+ session.dispose();
+ final long end = System.currentTimeMillis();
+ System.out.println( end - start );
+ }
} catch ( final Throwable t ) {
t.printStackTrace();
fail( t.getMessage() );
@@ -100,7 +103,8 @@
//add the package to a rulebase
final RuleBase ruleBase = getRuleBase();
ruleBase.addPackage( pkg );
- return SerializationHelper.serializeObject(ruleBase);
+ return ruleBase;
+// return SerializationHelper.serializeObject(ruleBase);
}
private void loadLines(final WorkingMemory wm,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2008-04-01 19:16:19 UTC (rev 19364)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELConsequenceBuilderTest.java 2008-04-01 19:16:36 UTC (rev 19365)
@@ -88,7 +88,7 @@
final Cheese cheddar = new Cheese( "cheddar",
10 );
final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
- final LeftTuple tuple = new LeftTuple( f0, sink );
+ final LeftTuple tuple = new LeftTuple( f0, sink, true );
final AgendaItem item = new AgendaItem( 0,
tuple,
@@ -156,7 +156,7 @@
final Cheese cheddar = new Cheese( "cheddar",
10 );
final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
- final LeftTuple tuple = new LeftTuple( f0, null );
+ final LeftTuple tuple = new LeftTuple( f0, null, true );
final AgendaItem item = new AgendaItem( 0,
tuple,
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2008-04-01 19:16:19 UTC (rev 19364)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELEvalBuilderTest.java 2008-04-01 19:16:36 UTC (rev 19365)
@@ -77,7 +77,7 @@
final Cheese cheddar = new Cheese( "cheddar",
10 );
final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
- final LeftTuple tuple = new LeftTuple( f0, sink );
+ final LeftTuple tuple = new LeftTuple( f0, sink, true );
Object evalContext = eval.createContext();
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java 2008-04-01 19:16:19 UTC (rev 19364)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELPredicateBuilderTest.java 2008-04-01 19:16:36 UTC (rev 19365)
@@ -110,7 +110,7 @@
final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
final InternalFactHandle f1 = (InternalFactHandle) wm.insert( stilton );
- final LeftTuple tuple = new LeftTuple( f0, sink );
+ final LeftTuple tuple = new LeftTuple( f0, sink, true );
final PredicateContextEntry predicateContext = (PredicateContextEntry) predicate.createContextEntry();
predicateContext.leftTuple = tuple;
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java 2008-04-01 19:16:19 UTC (rev 19364)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELReturnValueBuilderTest.java 2008-04-01 19:16:36 UTC (rev 19365)
@@ -114,11 +114,11 @@
final Cheese cheddar = new Cheese( "cheddar",
10 );
final InternalFactHandle f0 = (InternalFactHandle) wm.insert( cheddar );
- LeftTuple tuple = new LeftTuple( f0, null );
+ LeftTuple tuple = new LeftTuple( f0, null, true );
final InternalFactHandle f1 = (InternalFactHandle) wm.insert( stilton );
tuple = new LeftTuple( tuple,
- new RightTuple( f1, null ), null );
+ new RightTuple( f1, null ), null, true );
final Cheese brie = new Cheese( "brie",
20 );
Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java 2008-04-01 19:16:19 UTC (rev 19364)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/rule/builder/dialect/mvel/MVELSalienceBuilderTest.java 2008-04-01 19:16:36 UTC (rev 19365)
@@ -62,7 +62,7 @@
final Person p = new Person("mark", "", 31);
final InternalFactHandle f0 = (InternalFactHandle) wm.insert( p );
- final LeftTuple tuple = new LeftTuple( f0, null );
+ final LeftTuple tuple = new LeftTuple( f0, null, true );
SalienceBuilder salienceBuilder = new MVELSalienceBuilder();
salienceBuilder.build( context );
More information about the jboss-svn-commits
mailing list