Menu
▾
▴
[Jboss-svn-commits] JBL Code SVN: r4222 - in labs/jbossrules/trunk/drools-core/src: main/java/org/drools/common main/java/org/drools/leaps main/java/org/drools/reteoo main/java/org/drools/rule main/java/org/drools/spi test/java/org/drools/reteoo
Author: mar...@jb...
Date: 2006-05-15 07:26:12 -0400 (Mon, 15 May 2006)
New Revision: 4222
Added:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ActivationGroupImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ActivationGroupNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ActivationGroup.java
Removed:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupImpl.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/XorGroup.java
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/Agenda.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Activation.java
labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/AgendaTest.java
Log:
-Change xor-group to activation-group
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ActivationGroupImpl.java (from rev 4217, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupImpl.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupImpl.java 2006-05-14 23:24:48 UTC (rev 4217)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ActivationGroupImpl.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -0,0 +1,52 @@
+package org.drools.common;
+
+import java.util.Iterator;
+
+import org.drools.spi.Activation;
+import org.drools.spi.ActivationGroup;
+import org.drools.util.LinkedList;
+import org.drools.util.LinkedListObjectWrapper;
+
+public class ActivationGroupImpl implements ActivationGroup {
+ private String name;
+
+ private final LinkedList list;
+
+ public ActivationGroupImpl(String name) {
+ this.name = name;
+ this.list = new LinkedList();
+ }
+
+ public String getName() {
+ return this.name;
+ }
+
+ public void addActivation(Activation activation) {
+ ActivationGroupNode node = new ActivationGroupNode(activation, this);
+ activation.setActivationGroupNode( node );
+ this.list.add( node );
+ }
+
+ public void removeActivation(Activation activation) {
+ ActivationGroupNode node = activation.getActivationGroupNode( );
+ this.list.remove( node );
+ activation.setActivationGroupNode( null );
+ }
+
+ public Iterator iterator() {
+ return this.list.iterator();
+ }
+
+ public boolean isEmpty() {
+ return this.list.isEmpty();
+ }
+
+ public int size() {
+ return this.list.size();
+ }
+
+ public void clear() {
+ this.list.clear();
+ }
+
+}
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ActivationGroupNode.java (from rev 4217, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupNode.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupNode.java 2006-05-14 23:24:48 UTC (rev 4217)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ActivationGroupNode.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -0,0 +1,30 @@
+package org.drools.common;
+
+import org.drools.spi.Activation;
+import org.drools.spi.ActivationGroup;
+import org.drools.util.AbstractBaseLinkedListNode;
+
+public class ActivationGroupNode extends AbstractBaseLinkedListNode {
+
+ private Activation activation;
+
+ private ActivationGroup activationGroup;
+
+ public ActivationGroupNode(Activation activation,
+ ActivationGroup activationGroup) {
+ super();
+ this.activation = activation;
+ this.activationGroup = activationGroup;
+ }
+
+ public Activation getActivation() {
+ return this.activation;
+ }
+
+ public ActivationGroup getActivationGroup() {
+ return this.activationGroup;
+ }
+
+
+
+}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/Agenda.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/Agenda.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/Agenda.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -31,7 +31,7 @@
import org.drools.spi.AgendaGroup;
import org.drools.spi.ConsequenceException;
import org.drools.spi.KnowledgeHelper;
-import org.drools.spi.XorGroup;
+import org.drools.spi.ActivationGroup;
import org.drools.util.LinkedListNode;
import org.drools.util.LinkedListObjectWrapper;
import org.drools.util.Queueable;
@@ -69,7 +69,7 @@
private final Map agendaGroups;
- private final Map xorGroups;
+ private final Map activationGroups;
private final LinkedList focusStack;
@@ -92,7 +92,7 @@
public Agenda(WorkingMemory workingMemory) {
this.workingMemory = workingMemory;
this.agendaGroups = new HashMap();
- this.xorGroups = new HashMap();
+ this.activationGroups = new HashMap();
this.focusStack = new LinkedList();
// MAIN should always be the first AgendaGroup and can never be removed
@@ -208,13 +208,13 @@
return (AgendaGroup[]) this.focusStack.toArray( new AgendaGroup[this.focusStack.size()] );
}
- public XorGroup getXorGroup(String name) {
- XorGroupImpl xorGroup = (XorGroupImpl) this.xorGroups.get( name );
- if (xorGroup == null) {
- xorGroup = new XorGroupImpl( name );
- this.xorGroups.put( name, xorGroup );
+ public ActivationGroup getActivationGroup(String name) {
+ ActivationGroupImpl activationGroup = (ActivationGroupImpl) this.activationGroups.get( name );
+ if (activationGroup == null) {
+ activationGroup = new ActivationGroupImpl( name );
+ this.activationGroups.put( name, activationGroup );
}
- return xorGroup;
+ return activationGroup;
}
/**
@@ -314,8 +314,8 @@
// this must be set false before removal from the XorGroup. Otherwise the XorGroup will also try to cancel the Actvation
item.setActivated( false );
- if ( item.getXorGroupNode() != null ) {
- item.getXorGroupNode().getXorGroup().removeActivation( item );
+ if ( item.getActivationGroupNode() != null ) {
+ item.getActivationGroupNode().getActivationGroup().removeActivation( item );
}
eventsupport.getAgendaEventSupport().fireActivationCancelled( item );
@@ -325,15 +325,15 @@
/**
- * Clears all Activations from an Xor Group. Any Activations that are also in an Agenda Group are removed
+ * Clears all Activations from an Activation-Group. Any Activations that are also in an Agenda Group are removed
* from the Agenda Group.
*
- * @param xorGroup
+ * @param activationGroup
*/
- public void clearXorGroup(String name) {
- XorGroup xorGroup = (XorGroup) this.xorGroups.get( name );
- if ( xorGroup != null ) {
- clearXorGroup( xorGroup );
+ public void clearActivationGroup(String name) {
+ ActivationGroup activationGroup = (ActivationGroup) this.activationGroups.get( name );
+ if ( activationGroup != null ) {
+ clearActivationGroup( activationGroup );
}
}
@@ -341,13 +341,13 @@
* Clears all Activations from an Xor Group. Any Activations that are also in an Agenda Group are removed
* from the Agenda Group.
*
- * @param xorGroup
+ * @param activationGroup
*/
- public void clearXorGroup(XorGroup xorGroup) {
+ public void clearActivationGroup(ActivationGroup activationGroup) {
EventSupport eventsupport = (EventSupport) this.workingMemory;
- for ( Iterator it = xorGroup.iterator(); it.hasNext(); ) {
- Activation activation = ( Activation)( (XorGroupNode) it.next() ).getActivation();
- activation.setXorGroupNode( null );
+ for ( Iterator it = activationGroup.iterator(); it.hasNext(); ) {
+ Activation activation = ( Activation)( (ActivationGroupNode) it.next() ).getActivation();
+ activation.setActivationGroupNode( null );
if ( activation.isActivated() ) {
activation.setActivated( false );
@@ -355,7 +355,7 @@
eventsupport.getAgendaEventSupport().fireActivationCancelled( activation );
}
}
- xorGroup.clear();
+ activationGroup.clear();
}
/**
@@ -398,10 +398,10 @@
eventsupport.getAgendaEventSupport().fireBeforeActivationFired( activation );
- if ( activation.getXorGroupNode() != null ) {
- XorGroup xorGroup = activation.getXorGroupNode().getXorGroup();
- xorGroup.removeActivation( activation );
- clearXorGroup(xorGroup);
+ if ( activation.getActivationGroupNode() != null ) {
+ ActivationGroup activationGroup = activation.getActivationGroupNode().getActivationGroup();
+ activationGroup.removeActivation( activation );
+ clearActivationGroup(activationGroup);
}
activation.setActivated( false );
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/AgendaItem.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -65,7 +65,7 @@
private boolean activated;
- private XorGroupNode xorGroupNode;
+ private ActivationGroupNode activationGroupNode;
// ------------------------------------------------------------
// Constructors
@@ -204,11 +204,11 @@
dequeue();
}
- public XorGroupNode getXorGroupNode() {
- return this.xorGroupNode;
+ public ActivationGroupNode getActivationGroupNode() {
+ return this.activationGroupNode;
}
- public void setXorGroupNode(XorGroupNode xorNode) {
- this.xorGroupNode = xorNode;
- }
+ public void setActivationGroupNode(ActivationGroupNode activationNode) {
+ this.activationGroupNode = activationNode;
+ }
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/ScheduledAgendaItem.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -24,7 +24,7 @@
import org.drools.spi.Activation;
import org.drools.spi.PropagationContext;
import org.drools.spi.Tuple;
-import org.drools.spi.XorGroup;
+import org.drools.spi.ActivationGroup;
import org.drools.util.LinkedList;
import org.drools.util.LinkedListNode;
import org.drools.util.LinkedListObjectWrapper;
@@ -63,7 +63,7 @@
private boolean activated;
- private XorGroupNode xorGroupNode;
+ private ActivationGroupNode activationGroupNode;
// ------------------------------------------------------------
// Constructors
@@ -184,12 +184,12 @@
this.activated = activated;
}
- public XorGroupNode getXorGroupNode() {
- return this.xorGroupNode;
+ public ActivationGroupNode getActivationGroupNode() {
+ return this.activationGroupNode;
}
- public void setXorGroupNode(XorGroupNode xorGroupNode) {
- this.xorGroupNode = xorGroupNode;
+ public void setActivationGroupNode(ActivationGroupNode activationGroupNode) {
+ this.activationGroupNode = activationGroupNode;
}
/*
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupImpl.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupImpl.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupImpl.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -1,52 +0,0 @@
-package org.drools.common;
-
-import java.util.Iterator;
-
-import org.drools.spi.Activation;
-import org.drools.spi.XorGroup;
-import org.drools.util.LinkedList;
-import org.drools.util.LinkedListObjectWrapper;
-
-public class XorGroupImpl implements XorGroup {
- private String name;
-
- private final LinkedList list;
-
- public XorGroupImpl(String name) {
- this.name = name;
- this.list = new LinkedList();
- }
-
- public String getName() {
- return this.name;
- }
-
- public void addActivation(Activation activation) {
- XorGroupNode node = new XorGroupNode(activation, this);
- activation.setXorGroupNode( node );
- this.list.add( node );
- }
-
- public void removeActivation(Activation activation) {
- XorGroupNode node = activation.getXorGroupNode( );
- this.list.remove( node );
- activation.setXorGroupNode( null );
- }
-
- public Iterator iterator() {
- return this.list.iterator();
- }
-
- public boolean isEmpty() {
- return this.list.isEmpty();
- }
-
- public int size() {
- return this.list.size();
- }
-
- public void clear() {
- this.list.clear();
- }
-
-}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupNode.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/common/XorGroupNode.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -1,30 +0,0 @@
-package org.drools.common;
-
-import org.drools.spi.Activation;
-import org.drools.spi.XorGroup;
-import org.drools.util.AbstractBaseLinkedListNode;
-
-public class XorGroupNode extends AbstractBaseLinkedListNode {
-
- private Activation activation;
-
- private XorGroup xorGroup;
-
- public XorGroupNode(Activation activation,
- XorGroup xorGroup) {
- super();
- this.activation = activation;
- this.xorGroup = xorGroup;
- }
-
- public Activation getActivation() {
- return this.activation;
- }
-
- public XorGroup getXorGroup() {
- return this.xorGroup;
- }
-
-
-
-}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/leaps/LeapsAgenda.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -47,14 +47,14 @@
activation.getTuple( ) );
}
else {
- if (activation.getRule( ).getXorGroup( ) == null
- || ( activation.getRule( ).getXorGroup( ) != null && this.getXorGroup( activation.getRule( )
- .getXorGroup( ) )
+ if (activation.getRule( ).getActivationGroup( ) == null
+ || ( activation.getRule( ).getActivationGroup( ) != null && this.getActivationGroup( activation.getRule( )
+ .getActivationGroup( ) )
.isEmpty( ) )) {
// fire regular rule
super.fireActivation( activation );
- if (activation.getRule( ).getXorGroup( ) != null) {
- this.getXorGroup( activation.getRule( ).getXorGroup( ) );
+ if (activation.getRule( ).getActivationGroup( ) != null) {
+ this.getActivationGroup( activation.getRule( ).getActivationGroup( ) );
}
}
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/reteoo/TerminalNode.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -30,7 +30,7 @@
import org.drools.spi.AgendaGroup;
import org.drools.spi.Duration;
import org.drools.spi.PropagationContext;
-import org.drools.spi.XorGroup;
+import org.drools.spi.ActivationGroup;
import org.drools.util.LinkedListObjectWrapper;
import org.drools.util.Queueable;
@@ -132,13 +132,13 @@
context,
this.rule );
- if ( this.rule.getXorGroup() != null ) {
+ if ( this.rule.getActivationGroup() != null ) {
final TerminalNodeMemory memory = (TerminalNodeMemory) workingMemory.getNodeMemory( this );
- // Lazy cache xorGroup
- if ( memory.getXorGroup() == null ) {
- memory.setXorGroup( workingMemory.getAgenda().getXorGroup( this.rule.getXorGroup() ) );
+ // Lazy cache activationGroup
+ if ( memory.getActivationGroup() == null ) {
+ memory.setActivationGroup( workingMemory.getAgenda().getActivationGroup( this.rule.getActivationGroup() ) );
}
- memory.getXorGroup().addActivation( item );
+ memory.getActivationGroup().addActivation( item );
}
agenda.scheduleItem( item );
@@ -183,12 +183,12 @@
context,
this.rule );
- if ( this.rule.getXorGroup() != null ) {
- // Lazy cache xorGroup
- if ( memory.getXorGroup() == null ) {
- memory.setXorGroup( workingMemory.getAgenda().getXorGroup( this.rule.getXorGroup() ) );
+ if ( this.rule.getActivationGroup() != null ) {
+ // Lazy cache activationGroup
+ if ( memory.getActivationGroup() == null ) {
+ memory.setActivationGroup( workingMemory.getAgenda().getActivationGroup( this.rule.getActivationGroup() ) );
}
- memory.getXorGroup().addActivation( item );
+ memory.getActivationGroup().addActivation( item );
}
// Makes sure the Lifo is added to the AgendaGroup priority queue
@@ -319,7 +319,7 @@
class TerminalNodeMemory {
private AgendaGroupImpl agendaGroup;
- private XorGroup xorGroup;
+ private ActivationGroup activationGroup;
public AgendaGroupImpl getAgendaGroup() {
return this.agendaGroup;
@@ -329,12 +329,12 @@
this.agendaGroup = agendaGroup;
}
- public XorGroup getXorGroup() {
- return this.xorGroup;
+ public ActivationGroup getActivationGroup() {
+ return this.activationGroup;
}
- public void setXorGroup(XorGroup xorGroup) {
- this.xorGroup = xorGroup;
+ public void setActivationGroup(ActivationGroup activationGroup) {
+ this.activationGroup = activationGroup;
}
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/Rule.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -78,7 +78,7 @@
/** makes the rule's much the current focus */
private boolean autoFocus;
- private String xorGroup;
+ private String ActivationGroup;
/** indicates that the rule is semantically correct. */
private boolean semanticallyValid = true;
@@ -245,12 +245,12 @@
this.autoFocus = autoFocus;
}
- public String getXorGroup() {
- return this.xorGroup;
+ public String getActivationGroup() {
+ return this.ActivationGroup;
}
- public void setXorGroup(String xorGroup) {
- this.xorGroup = xorGroup;
+ public void setXorGroup(String activationGroup) {
+ this.ActivationGroup = activationGroup;
}
/**
@@ -427,7 +427,7 @@
Rule other = (Rule) object;
- return (this.name.equals( other.name ) && this.agendaGroup.equals( other.agendaGroup ) && this.xorGroup.equals( other.xorGroup )&& this.salience == other.salience && this.noLoop == other.noLoop);
+ return (this.name.equals( other.name ) && this.agendaGroup.equals( other.agendaGroup ) && this.ActivationGroup.equals( other.ActivationGroup )&& this.salience == other.salience && this.noLoop == other.noLoop);
}
public int hashCode() {
Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Activation.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Activation.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/Activation.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -20,7 +20,7 @@
import org.drools.common.LogicalDependency;
-import org.drools.common.XorGroupNode;
+import org.drools.common.ActivationGroupNode;
import org.drools.rule.Rule;
import org.drools.util.LinkedList;
import org.drools.util.LinkedListObjectWrapper;
@@ -76,7 +76,7 @@
public void setActivated(boolean activated);
- public XorGroupNode getXorGroupNode();
+ public ActivationGroupNode getActivationGroupNode();
- public void setXorGroupNode(XorGroupNode xorGroupNode);
+ public void setActivationGroupNode(ActivationGroupNode activationGroupNode);
}
\ No newline at end of file
Copied: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ActivationGroup.java (from rev 4217, labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/XorGroup.java)
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/XorGroup.java 2006-05-14 23:24:48 UTC (rev 4217)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/ActivationGroup.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -0,0 +1,19 @@
+package org.drools.spi;
+
+import java.util.Iterator;
+
+public interface ActivationGroup {
+ public String getName();
+
+ public void addActivation(Activation activation);
+
+ public void removeActivation(Activation activation);
+
+ public Iterator iterator();
+
+ public boolean isEmpty();
+
+ public int size();
+
+ public void clear();
+}
Deleted: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/XorGroup.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/XorGroup.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/spi/XorGroup.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -1,19 +0,0 @@
-package org.drools.spi;
-
-import java.util.Iterator;
-
-public interface XorGroup {
- public String getName();
-
- public void addActivation(Activation activation);
-
- public void removeActivation(Activation activation);
-
- public Iterator iterator();
-
- public boolean isEmpty();
-
- public int size();
-
- public void clear();
-}
Modified: labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/AgendaTest.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/AgendaTest.java 2006-05-15 07:35:06 UTC (rev 4221)
+++ labs/jbossrules/trunk/drools-core/src/test/java/org/drools/reteoo/AgendaTest.java 2006-05-15 11:26:12 UTC (rev 4222)
@@ -35,7 +35,7 @@
import org.drools.spi.ConsequenceException;
import org.drools.spi.KnowledgeHelper;
import org.drools.spi.PropagationContext;
-import org.drools.spi.XorGroup;
+import org.drools.spi.ActivationGroup;
/**
* @author mproctor
@@ -482,7 +482,7 @@
// create a rule for each agendaGroup
Rule rule0 = new Rule( "test-rule0" );
- rule0.setXorGroup( "xor-group-0" );
+ rule0.setXorGroup( "activation-group-0" );
TerminalNode node0 = new TerminalNode( 3,
new MockTupleSource( 2 ),
rule0 );
@@ -493,7 +493,7 @@
null );
Rule rule1 = new Rule( "test-rule1" );
- rule1.setXorGroup( "xor-group-0" );
+ rule1.setXorGroup( "activation-group-0" );
TerminalNode node1 = new TerminalNode( 5,
new MockTupleSource( 4 ),
rule1 );
@@ -515,7 +515,7 @@
Rule rule3 = new Rule( "test-rule3",
"agendaGroup3" );
- rule3.setXorGroup( "xor-group-3" );
+ rule3.setXorGroup( "activation-group-3" );
TerminalNode node3 = new TerminalNode( 9,
new MockTupleSource( 8 ),
rule3 );
@@ -525,23 +525,23 @@
rule3,
null );
- // Assert the tuple and check it was added to xor-group-0
+ // Assert the tuple and check it was added to activation-group-0
node0.assertTuple( tuple, context0, workingMemory );
- XorGroup xorGroup0 = agenda.getXorGroup( "xor-group-0" );
- assertEquals( 1, xorGroup0.size() );
+ ActivationGroup activationGroup0 = agenda.getActivationGroup( "activation-group-0" );
+ assertEquals( 1, activationGroup0.size() );
- // Assert another tuple and check it was added to xor-group-0
+ // Assert another tuple and check it was added to activation-group-0
node1.assertTuple( tuple, context1, workingMemory );
- assertEquals( 2, xorGroup0.size() );
+ assertEquals( 2, activationGroup0.size() );
// There should now be two potential activations to fire
assertEquals( 2, agenda.focusStackSize() );
- // The first tuple should fire, adding itself to the List and clearing and cancelling the other Activations in the xor-group-0
+ // The first tuple should fire, adding itself to the List and clearing and cancelling the other Activations in the activation-group-0
agenda.fireNextItem( null );
- // Make sure the xor-group-0 is clear
- assertEquals( 0, xorGroup0.size() );
+ // Make sure the activation-group-0 is clear
+ assertEquals( 0, activationGroup0.size() );
// Make sure the Agenda is empty
assertEquals( 0, agenda.focusStackSize() );
@@ -559,23 +559,23 @@
node2.assertTuple( tuple, context2, workingMemory );
node3.assertTuple( tuple, context3, workingMemory );
- // xor-group-0 should be populated again
- assertEquals( 2, xorGroup0.size() );
+ // activation-group-0 should be populated again
+ assertEquals( 2, activationGroup0.size() );
- // make sure the xor-group-3 is cleared when we can clear the Agenda Group for the activation that is in both
- XorGroup xorGroup3 = agenda.getXorGroup( "xor-group-3" );
+ // make sure the activation-group-3 is cleared when we can clear the Agenda Group for the activation that is in both
+ ActivationGroup activationGroup3 = agenda.getActivationGroup( "activation-group-3" );
assertEquals( 4, agenda.agendaSize() );
- assertEquals( 1, xorGroup3.size() );
+ assertEquals( 1, activationGroup3.size() );
agenda.clearAgendaGroup( "agendaGroup3" );
assertEquals( 3, agenda.agendaSize() );
- assertEquals( 0, xorGroup3.size() );
+ assertEquals( 0, activationGroup3.size() );
- // Activation for xor-group-0 should be next - the activation in no xor/agenda group should remain on the agenda
+ // Activation for activation-group-0 should be next - the activation in no activation/agenda group should remain on the agenda
agenda.fireNextItem( null );
assertEquals( 1, agenda.agendaSize() );
- assertEquals( 0, xorGroup0.size() );
+ assertEquals( 0, activationGroup0.size() );
// Fire the last activation and make sure the Agenda Empties
|
