[jboss-svn-commits] JBL Code SVN: r13356 - in labs/jbossrules/trunk/drools-examples/src/main: java/org/drools/benchmark/waltz and 10 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Wed Jul 11 08:58:22 EDT 2007
Author: tirelli
Date: 2007-07-11 08:58:21 -0400 (Wed, 11 Jul 2007)
New Revision: 13356
Modified:
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/manners/MannersBenchmark.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltz/WaltzBenchmark.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltzdb/WaltzDbBenchmark.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/FibonacciExample.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/GolfingExample.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/HelloWorldExample.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/HonestPoliticianExample.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleUsingAgendGroup.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleUsingSalience.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleWithDynamicRules.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/TroubleTicketExample.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/TroubleTicketExampleWithDSL.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/CellGrid.java
labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/sudoku/SudokuExample.java
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/manners/manners.drl
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/waltz/waltz.drl
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/waltzdb/waltzdb.drl
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/Fibonacci.drl
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/HelloWorld.drl
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/HonestPolitician.drl
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/LogicalAssertionsNotPingPong.drl
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/TroubleTicket.drl
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/conway/conway.drl
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/sudoku/sudoku.drl
labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/ticketing.dsl
Log:
Updating examples to the new syntax
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/manners/MannersBenchmark.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/manners/MannersBenchmark.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/manners/MannersBenchmark.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -15,7 +15,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.rule.Package;
@@ -56,10 +55,10 @@
List list = getInputObjects(is);
for (Iterator it = list.iterator(); it.hasNext();) {
Object object = it.next();
- session.assertObject(object);
+ session.insert(object);
}
- session.assertObject(new Count(1));
+ session.insert(new Count(1));
long start = System.currentTimeMillis();
session.fireAllRules();
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltz/WaltzBenchmark.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltz/WaltzBenchmark.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltz/WaltzBenchmark.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -57,7 +57,7 @@
loadLines( session, filename );
Stage stage = new Stage(Stage.DUPLICATE);
- session.assertObject( stage );
+ session.insert( stage );
long start = System.currentTimeMillis();
session.fireAllRules();
@@ -75,7 +75,7 @@
if(m.matches()) {
Line l = new Line(Integer.parseInt( m.group( 1 ) ),
Integer.parseInt( m.group( 2 ) ) );
- wm.assertObject( l );
+ wm.insert( l );
}
line = reader.readLine();
}
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltzdb/WaltzDbBenchmark.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltzdb/WaltzDbBenchmark.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltzdb/WaltzDbBenchmark.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -7,12 +7,11 @@
import java.util.regex.Pattern;
import org.drools.RuleBase;
-import org.drools.rule.Package;
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
+import org.drools.rule.Package;
public class WaltzDbBenchmark {
@@ -35,19 +34,19 @@
Iterator iter =lines.iterator();
while(iter.hasNext()){
Line line = (Line)iter.next();
- session.assertObject(line);
+ session.insert(line);
System.out.println(line.getP1() + " " + line.getP2());
}
iter =labels.iterator();
while(iter.hasNext()){
Label label = (Label)iter.next();
- session.assertObject(label);
+ session.insert(label);
System.out.println(label.getId() + " " + label.getType());
}
Stage stage = new Stage(Stage.DUPLICATE);
- session.assertObject( stage );
+ session.insert( stage );
session.fireAllRules();
System.out.println("Time: " + (System.currentTimeMillis() - now));
session.dispose();
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/FibonacciExample.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/FibonacciExample.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/FibonacciExample.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -5,7 +5,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.compiler.PackageBuilder;
@@ -31,7 +30,7 @@
// PropertyChangeListeners so you don't have to call modifyObject().
final boolean dynamic = false;
- session.assertObject( new Fibonacci( 50 ),
+ session.insert( new Fibonacci( 50 ),
dynamic );
session.fireAllRules();
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/GolfingExample.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/GolfingExample.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/GolfingExample.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -5,7 +5,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
public class GolfingExample {
@@ -30,7 +29,7 @@
for ( int n = 0; n < names.length; n++ ) {
for ( int c = 0; c < colors.length; c++ ) {
for ( int p = 0; p < positions.length; p++ ) {
- session.assertObject( new Golfer( names[n], colors[c], positions[p]) );
+ session.insert( new Golfer( names[n], colors[c], positions[p]) );
}
}
}
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/HelloWorldExample.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/HelloWorldExample.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/HelloWorldExample.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -6,7 +6,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.rule.Package;
@@ -24,7 +23,7 @@
final Message message = new Message();
message.setMessage( "Hello World" );
message.setStatus( Message.HELLO );
- session.assertObject( message );
+ session.insert( message );
session.fireAllRules();
session.dispose();
}
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/HonestPoliticianExample.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/HonestPoliticianExample.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/HonestPoliticianExample.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -2,11 +2,9 @@
import java.io.InputStreamReader;
-import org.drools.FactHandle;
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.compiler.PackageBuilder;
@@ -33,10 +31,10 @@
final Politician chirac = new Politician("chirac", true);
final Politician schroder = new Politician("schroder", true);
- session.assertObject( blair );
- session.assertObject( bush );
- session.assertObject( chirac );
- session.assertObject( schroder );
+ session.insert( blair );
+ session.insert( bush );
+ session.insert( chirac );
+ session.insert( schroder );
session.fireAllRules();
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleUsingAgendGroup.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleUsingAgendGroup.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleUsingAgendGroup.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -5,7 +5,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.compiler.PackageBuilder;
import org.drools.event.AfterActivationFiredEvent;
@@ -28,7 +27,8 @@
session.addEventListener( new DefaultAgendaEventListener() {
public void afterActivationFired(final AfterActivationFiredEvent arg0) {
- super.afterActivationFired( arg0, session );
+ super.afterActivationFired( arg0,
+ session );
}
} );
@@ -44,14 +44,14 @@
// PropertyChangeListeners so you don't have to call modifyObject().
final boolean dynamic = true;
- session.assertObject( a,
- dynamic );
- session.assertObject( b,
- dynamic );
- session.assertObject( c,
- dynamic );
- session.assertObject( d,
- dynamic );
+ session.insert( a,
+ dynamic );
+ session.insert( b,
+ dynamic );
+ session.insert( c,
+ dynamic );
+ session.insert( d,
+ dynamic );
session.fireAllRules();
session.dispose();
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleUsingSalience.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleUsingSalience.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleUsingSalience.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -5,7 +5,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.compiler.PackageBuilder;
@@ -36,14 +35,14 @@
// PropertyChangeListeners so you don't have to call modifyObject().
final boolean dynamic = true;
- session.assertObject( a,
- dynamic );
- session.assertObject( b,
- dynamic );
- session.assertObject( c,
- dynamic );
- session.assertObject( d,
- dynamic );
+ session.insert( a,
+ dynamic );
+ session.insert( b,
+ dynamic );
+ session.insert( c,
+ dynamic );
+ session.insert( d,
+ dynamic );
session.fireAllRules();
session.dispose();
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleWithDynamicRules.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleWithDynamicRules.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/StateExampleWithDynamicRules.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -5,7 +5,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.compiler.PackageBuilder;
@@ -37,16 +36,16 @@
// PropertyChangeListeners so you don't have to call modifyObject().
final boolean dynamic = true;
- session.assertObject( a,
- dynamic );
- session.assertObject( b,
- dynamic );
- session.assertObject( c,
- dynamic );
- session.assertObject( d,
- dynamic );
- session.assertObject( e,
- dynamic );
+ session.insert( a,
+ dynamic );
+ session.insert( b,
+ dynamic );
+ session.insert( c,
+ dynamic );
+ session.insert( d,
+ dynamic );
+ session.insert( e,
+ dynamic );
session.fireAllRules();
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/TroubleTicketExample.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/TroubleTicketExample.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/TroubleTicketExample.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -6,7 +6,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.compiler.PackageBuilder;
@@ -42,22 +41,22 @@
final Ticket t3 = new Ticket( c );
final Ticket t4 = new Ticket( d );
- final FactHandle fa = session.assertObject( a );
- final FactHandle fb = session.assertObject( b );
- final FactHandle fc = session.assertObject( c );
- final FactHandle fd = session.assertObject( d );
+ final FactHandle fa = session.insert( a );
+ final FactHandle fb = session.insert( b );
+ final FactHandle fc = session.insert( c );
+ final FactHandle fd = session.insert( d );
- final FactHandle ft1 = session.assertObject( t1 );
- final FactHandle ft2 = session.assertObject( t2 );
- final FactHandle ft3 = session.assertObject( t3 );
- final FactHandle ft4 = session.assertObject( t4 );
+ final FactHandle ft1 = session.insert( t1 );
+ final FactHandle ft2 = session.insert( t2 );
+ final FactHandle ft3 = session.insert( t3 );
+ final FactHandle ft4 = session.insert( t4 );
session.fireAllRules();
t3.setStatus( "Done" );
- session.modifyObject( ft3,
- t3 );
+ session.update( ft3,
+ t3 );
try {
System.err.println( "[[ Sleeping 5 seconds ]]" );
@@ -67,7 +66,7 @@
}
System.err.println( "[[ awake ]]" );
-
+
session.dispose();
logger.writeToDisk();
@@ -78,9 +77,9 @@
private String subscription;
public Customer() {
-
+
}
-
+
public Customer(final String name,
final String subscription) {
super();
@@ -107,9 +106,9 @@
private String status;
public Ticket() {
-
+
}
-
+
public Ticket(final Customer customer) {
super();
this.customer = customer;
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/TroubleTicketExampleWithDSL.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/TroubleTicketExampleWithDSL.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/TroubleTicketExampleWithDSL.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -7,7 +7,6 @@
import org.drools.RuleBase;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.audit.WorkingMemoryFileLogger;
import org.drools.compiler.PackageBuilder;
@@ -31,35 +30,35 @@
logger.setFileName( "log/state" );
final Customer a = new Customer( "A",
- "Gold" );
+ "Gold" );
final Customer b = new Customer( "B",
- "Platinum" );
+ "Platinum" );
final Customer c = new Customer( "C",
- "Silver" );
+ "Silver" );
final Customer d = new Customer( "D",
- "Silver" );
+ "Silver" );
final Ticket t1 = new Ticket( a );
final Ticket t2 = new Ticket( b );
final Ticket t3 = new Ticket( c );
final Ticket t4 = new Ticket( d );
- final FactHandle fa = session.assertObject( a );
- final FactHandle fb = session.assertObject( b );
- final FactHandle fc = session.assertObject( c );
- final FactHandle fd = session.assertObject( d );
+ final FactHandle fa = session.insert( a );
+ final FactHandle fb = session.insert( b );
+ final FactHandle fc = session.insert( c );
+ final FactHandle fd = session.insert( d );
- final FactHandle ft1 = session.assertObject( t1 );
- final FactHandle ft2 = session.assertObject( t2 );
- final FactHandle ft3 = session.assertObject( t3 );
- final FactHandle ft4 = session.assertObject( t4 );
+ final FactHandle ft1 = session.insert( t1 );
+ final FactHandle ft2 = session.insert( t2 );
+ final FactHandle ft3 = session.insert( t3 );
+ final FactHandle ft4 = session.insert( t4 );
session.fireAllRules();
t3.setStatus( "Done" );
- session.modifyObject( ft3,
- t3 );
+ session.update( ft3,
+ t3 );
try {
System.err.println( "[[ Sleeping 5 seconds ]]" );
@@ -71,7 +70,7 @@
session.fireAllRules();
session.dispose();
-
+
logger.writeToDisk();
}
@@ -89,9 +88,9 @@
private String subscription;
public Customer() {
-
+
}
-
+
public Customer(final String name,
final String subscription) {
super();
@@ -118,9 +117,9 @@
private String status;
public Ticket() {
-
+
}
-
+
public Ticket(final Customer customer) {
super();
this.customer = customer;
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/CellGrid.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/CellGrid.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/conway/CellGrid.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -16,9 +16,9 @@
*/
public class CellGrid {
- private final Cell[][] cells;
+ private final Cell[][] cells;
- private StatefulSession session;
+ private StatefulSession session;
/**
* Constructs a CellGrid
@@ -46,7 +46,7 @@
this.session.addEventListener( listener );
- this.session.assertObject( this );
+ this.session.insert( this );
// populate the array of Cells and hook each
// cell up with its neighbors...
@@ -55,7 +55,7 @@
final Cell newCell = new Cell( column,
row );
this.cells[row][column] = newCell;
- this.session.assertObject( newCell );
+ this.session.insert( newCell );
}
}
this.session.setFocus( "register neighbor" );
@@ -154,8 +154,8 @@
final Cell cell = getCellAt( row + rowOffset,
column + columnOffset );
cell.setCellState( CellState.LIVE );
- this.session.modifyObject( this.session.getFactHandle( cell ),
- cell );
+ this.session.update( this.session.getFactHandle( cell ),
+ cell );
}
}
}
@@ -168,7 +168,7 @@
this.session.dispose();
}
}
-
+
public String toString() {
StringBuffer buf = new StringBuffer();
Modified: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/sudoku/SudokuExample.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/sudoku/SudokuExample.java 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/sudoku/SudokuExample.java 2007-07-11 12:58:21 UTC (rev 13356)
@@ -11,11 +11,9 @@
import org.drools.RuleBaseConfiguration;
import org.drools.RuleBaseFactory;
import org.drools.StatefulSession;
-import org.drools.WorkingMemory;
import org.drools.compiler.PackageBuilder;
import org.drools.rule.Package;
-
/**
* This example shows, how a Sudoku puzzle can be solved using JBoss Rules
*
@@ -23,141 +21,144 @@
*/
public class SudokuExample {
- public static void testWithInput(int[][] field){
+ public static void testWithInput(int[][] field) {
StatefulSession session = null;
- try {
- Collection fields = new ArrayList();
- //create Fields for every element of the matrix
- //Print Sudoku, which is to solve
- for(int i = 0; i < field.length; i++){
- String row = "{";
- for(int j = 0; j < field[i].length; j++){
- row += field[i][j] + ",";
- fields.add(new Field(""+field[i][j], j+1, i+1, getZone(i,j)));
- }
- row+= "}";
- System.out.println(row);
- }
- //load up the rulebase
+ try {
+ Collection fields = new ArrayList();
+ //create Fields for every element of the matrix
+ //Print Sudoku, which is to solve
+ for ( int i = 0; i < field.length; i++ ) {
+ String row = "{";
+ for ( int j = 0; j < field[i].length; j++ ) {
+ row += field[i][j] + ",";
+ fields.add( new Field( "" + field[i][j],
+ j + 1,
+ i + 1,
+ getZone( i,
+ j ) ) );
+ }
+ row += "}";
+ System.out.println( row );
+ }
+ //load up the rulebase
RuleBase ruleBase = readRule();
session = ruleBase.newStatefulSession();
-
+
//go !
Iterator iter = fields.iterator();
- Collection handles = new ArrayList();
- while(iter.hasNext()){
- handles.add(session.assertObject( iter.next() ));
- }
+ Collection handles = new ArrayList();
+ while ( iter.hasNext() ) {
+ handles.add( session.insert( iter.next() ) );
+ }
session.fireAllRules();
-
- System.out.println("Size: " + iteratorToList(session.iterateObjects()).size());
-
+
+ System.out.println( "Size: " + iteratorToList( session.iterateObjects() ).size() );
+
//Get Result
iter = session.iterateObjects();
//Copy the values of the fields into the matrix
- while(iter.hasNext()) {
- Object next = iter.next();
- if(next instanceof Field){
- field[((Field)next).getRow()-1][((Field)next).getColumn()-1] = Integer.parseInt(((Field)next).getValue());
- }
+ while ( iter.hasNext() ) {
+ Object next = iter.next();
+ if ( next instanceof Field ) {
+ field[((Field) next).getRow() - 1][((Field) next).getColumn() - 1] = Integer.parseInt( ((Field) next).getValue() );
+ }
}
-
+
//Pr
- for(int i = 0; i < field.length; i++){
- String row = "{";
- for(int j = 0; j < field[i].length; j++){
- row += field[i][j] + ",";
- fields.add(new Field(""+field[i][j], j+1, i+1, getZone(i,j)));
- }
- row+= "}";
- System.out.println(row);
- }
-
- } catch (Throwable t) {
+ for ( int i = 0; i < field.length; i++ ) {
+ String row = "{";
+ for ( int j = 0; j < field[i].length; j++ ) {
+ row += field[i][j] + ",";
+ fields.add( new Field( "" + field[i][j],
+ j + 1,
+ i + 1,
+ getZone( i,
+ j ) ) );
+ }
+ row += "}";
+ System.out.println( row );
+ }
+
+ } catch ( Throwable t ) {
t.printStackTrace();
} finally {
if ( session != null ) {
session.dispose();
}
}
- }
+ }
+
public static final void main(String[] args) {
-// testWithInput(FieldGenerator.getInstance().getField());
-// testWithInput(FieldGenerator.getInstance().getFieldMiddle());
-// testWithInput(FieldGenerator.getInstance().getFieldHard());
-// testWithInput(FieldGenerator.getInstance().getFieldHard2());
-// testWithInput(FieldGenerator.getInstance().getFieldHard3());
- testWithInput(FieldGenerator.getInstance().getFieldHard4());
+ // testWithInput(FieldGenerator.getInstance().getField());
+ // testWithInput(FieldGenerator.getInstance().getFieldMiddle());
+ // testWithInput(FieldGenerator.getInstance().getFieldHard());
+ // testWithInput(FieldGenerator.getInstance().getFieldHard2());
+ // testWithInput(FieldGenerator.getInstance().getFieldHard3());
+ testWithInput( FieldGenerator.getInstance().getFieldHard4() );
}
- private static int getZone(int row, int column) {
- if(column < 3 && row < 3){
- return 1;
- }
- else if( column < 6 && row < 3 ){
- return 2;
- }
- else if( column < 9 && row < 3){
- return 3;
- }
- else if( column < 3 && row < 6){
- return 4;
- }
- else if( column < 6 && row < 6){
- return 5;
- }
- else if( column < 9 && row < 6){
- return 6;
- }
- else if( column < 3){
- return 7;
- }
- else if( column < 6){
- return 8;
- }
- else if(column < 9){
- return 9;
- }
- return 0;
- }
+ private static int getZone(int row,
+ int column) {
+ if ( column < 3 && row < 3 ) {
+ return 1;
+ } else if ( column < 6 && row < 3 ) {
+ return 2;
+ } else if ( column < 9 && row < 3 ) {
+ return 3;
+ } else if ( column < 3 && row < 6 ) {
+ return 4;
+ } else if ( column < 6 && row < 6 ) {
+ return 5;
+ } else if ( column < 9 && row < 6 ) {
+ return 6;
+ } else if ( column < 3 ) {
+ return 7;
+ } else if ( column < 6 ) {
+ return 8;
+ } else if ( column < 9 ) {
+ return 9;
+ }
+ return 0;
+ }
- /**
+ /**
* Please note that this is the "low level" rule assembly API.
*/
- private static RuleBase readRule() throws Exception {
- //read in the source
- Reader source = new InputStreamReader( SudokuExample.class.getResourceAsStream( "sudoku.drl" ) );
-
- //optionally read in the DSL (if you are using it).
- //Reader dsl = new InputStreamReader( DroolsTest.class.getResourceAsStream( "/mylang.dsl" ) );
+ private static RuleBase readRule() throws Exception {
+ //read in the source
+ Reader source = new InputStreamReader( SudokuExample.class.getResourceAsStream( "sudoku.drl" ) );
- //Use package builder to build up a rule package.
- //An alternative lower level class called "DrlParser" can also be used...
-
- PackageBuilder builder = new PackageBuilder();
+ //optionally read in the DSL (if you are using it).
+ //Reader dsl = new InputStreamReader( DroolsTest.class.getResourceAsStream( "/mylang.dsl" ) );
- //this wil parse and compile in one step
- //NOTE: There are 2 methods here, the one argument one is for normal DRL.
- builder.addPackageFromDrl( source );
+ //Use package builder to build up a rule package.
+ //An alternative lower level class called "DrlParser" can also be used...
- //Use the following instead of above if you are using a DSL:
- //builder.addPackageFromDrl( source, dsl );
-
- //get the compiled package (which is serializable)
- Package pkg = builder.getPackage();
-
- //add the package to a rulebase (deploy the rule package).
- RuleBaseConfiguration conf = new RuleBaseConfiguration();
- conf.setRemoveIdentities( true );
- RuleBase ruleBase = RuleBaseFactory.newRuleBase(RuleBase.RETEOO, conf);
- ruleBase.addPackage( pkg );
- return ruleBase;
- }
-
+ PackageBuilder builder = new PackageBuilder();
+
+ //this wil parse and compile in one step
+ //NOTE: There are 2 methods here, the one argument one is for normal DRL.
+ builder.addPackageFromDrl( source );
+
+ //Use the following instead of above if you are using a DSL:
+ //builder.addPackageFromDrl( source, dsl );
+
+ //get the compiled package (which is serializable)
+ Package pkg = builder.getPackage();
+
+ //add the package to a rulebase (deploy the rule package).
+ RuleBaseConfiguration conf = new RuleBaseConfiguration();
+ conf.setRemoveIdentities( true );
+ RuleBase ruleBase = RuleBaseFactory.newRuleBase( RuleBase.RETEOO,
+ conf );
+ ruleBase.addPackage( pkg );
+ return ruleBase;
+ }
+
private static List iteratorToList(Iterator it) {
List list = new ArrayList();
- for (;it.hasNext();) {
+ for ( ; it.hasNext(); ) {
list.add( it.next() );
}
return list;
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/manners/manners.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/manners/manners.drl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/manners/manners.drl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -9,18 +9,18 @@
String guestName = guest.getName();
Seating seating = new Seating( count.getValue(), 1, true, 1, guestName, 1, guestName);
- assert( seating );
+ insert( seating );
Path path = new Path( count.getValue(), 1, guestName );
- assert( path );
+ insert( path );
count.setValue( count.getValue() + 1 );
- modify( count );
+ update( count );
System.out.println( "assign first seat : " + seating + " : " + path );
context.setState( Context.ASSIGN_SEATS );
- modify( context );
+ update( context );
end
rule findSeating
@@ -40,21 +40,21 @@
int countValue = count.getValue();
Seating seating = new Seating( countValue, seatId, false, rightSeat, seatingRightGuestName, rightSeat + 1, leftGuestName );
- assert( seating );
+ insert( seating );
Path path = new Path( countValue, rightSeat + 1, leftGuestName );
- assert( path );
+ insert( path );
Chosen chosen = new Chosen( seatId, leftGuestName, rightGuestHobby );
- assert( chosen );
+ insert( chosen );
System.err.println( "find seating : " + seating + " : " + path + " : " + chosen);
count.setValue( countValue + 1 );
- modify( count );
+ update( count );
context.setState( Context.MAKE_PATH );
- modify( context );
+ update( context );
retract ( $s );
end
@@ -66,7 +66,7 @@
Path( id == seatingPid, pathGuestName:guestName, pathSeat:seat )
not Path( id == seatingId, guestName == pathGuestName )
then
- assert( new Path( seatingId, pathSeat, pathGuestName ) );
+ insert( new Path( seatingId, pathSeat, pathGuestName ) );
end
rule pathDone
@@ -75,10 +75,10 @@
seating : Seating( pathDone == false )
then
seating.setPathDone( true );
- modify( seating );
+ update( seating );
context.setState( Context.CHECK_DONE );
- modify( context );
+ update( context );
end
@@ -89,7 +89,7 @@
Seating( rightSeat == lastSeat )
then
context.setState(Context.PRINT_RESULTS );
- modify( context );
+ update( context );
end
rule continue
@@ -97,7 +97,7 @@
context : Context( state == Context.CHECK_DONE )
then
context.setState( Context.ASSIGN_SEATS );
- modify( context );
+ update( context );
end
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/waltz/waltz.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/waltz/waltz.drl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/waltz/waltz.drl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -16,8 +16,8 @@
$line : Line ( $p1:p1, $p2:p2 )
then
System.out.println("Draw "+$p1+" "+$p2);
- assert( new Edge ( $p1, $p2, false, Edge.NIL, false ) );
- assert( new Edge ( $p2, $p1, false, Edge.NIL, false ) );
+ insert( new Edge ( $p1, $p2, false, Edge.NIL, false ) );
+ insert( new Edge ( $p2, $p1, false, Edge.NIL, false ) );
retract( $line );
end
@@ -29,7 +29,7 @@
not ( Line() )
then
$stage.setValue ( Stage.DETECT_JUNCTIONS );
- modify($stage);
+ update($stage);
System.out.println("reversing done");
end
@@ -47,13 +47,13 @@
then
Junction junction = WaltzUtil.make_3_junction( $basePoint, $edge1P2, $edge2P2, $edge3P2 );
System.out.println( junction );
- assert( junction );
+ insert( junction );
$edge1.setJoined(true);
$edge2.setJoined(true);
$edge3.setJoined(true);
- modify( $edge1 );
- modify( $edge2 );
- modify( $edge3 );
+ update( $edge1 );
+ update( $edge2 );
+ update( $edge3 );
end
#If two, and only two, edges meet that have not already been joined, then
@@ -65,11 +65,11 @@
$edge2: Edge( p1==$basePoint, $edge2P2:p2 != $edge1P2, joined == false )
not Edge( p1==$basePoint, p2 != $edge1P2, p2 != $edge2P2 )
then
- assert( new Junction($edge1P2, $edge2P2, 0, $basePoint, Junction.L) );
+ insert( new Junction($edge1P2, $edge2P2, 0, $basePoint, Junction.L) );
$edge1.setJoined(true);
$edge2.setJoined(true);
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("make L");
end
@@ -80,7 +80,7 @@
$stage : Stage ( value == Stage.DETECT_JUNCTIONS )
then
$stage.setValue( Stage.FIND_INITIAL_BOUNDARY );
- modify( $stage );
+ update( $stage );
System.out.println("detecting done");
end
@@ -96,9 +96,9 @@
$edge1.setLabel( Edge.B );
$edge2.setLabel( Edge.B );
$stage.setValue( Stage.FIND_SECOND_BOUNDARY );
- modify( $edge1 );
- modify( $edge2 );
- modify( $stage );
+ update( $edge1 );
+ update( $edge2 );
+ update( $stage );
System.out.println("initial boundary junction L");
end
@@ -116,10 +116,10 @@
$edge2.setLabel( Edge.PLUS );
$edge3.setLabel( Edge.B );
$stage.setValue( Stage.FIND_SECOND_BOUNDARY );
- modify( $edge1 );
- modify( $edge2 );
- modify( $edge3 );
- modify( $stage );
+ update( $edge1 );
+ update( $edge2 );
+ update( $edge3 );
+ update( $stage );
System.out.println("initial boundary junction arrow");
end
@@ -136,9 +136,9 @@
$edge1.setLabel( Edge.B );
$edge2.setLabel( Edge.B );
$stage.setValue( Stage.LABELING );
- modify( $edge1 );
- modify( $edge2 );
- modify( $stage );
+ update( $edge1 );
+ update( $edge2 );
+ update( $stage );
System.out.println("second boundary junction L");
end
@@ -156,10 +156,10 @@
$edge2.setLabel( Edge.PLUS );
$edge3.setLabel( Edge.B );
$stage.setValue( Stage.LABELING );
- modify( $edge1 );
- modify( $edge2 );
- modify( $edge3 );
- modify( $stage );
+ update( $edge1 );
+ update( $edge2 );
+ update( $edge3 );
+ update( $stage );
System.out.println("second boundary junction arrow");
end
@@ -168,14 +168,14 @@
rule "match edge"
when
Stage( value == Stage.LABELING )
- $edge1: Edge( $p1:p1, $p2:p2, $label:label == Edge.PLUS | == Edge.MINUS | == Edge.B )
+ $edge1: Edge( $p1:p1, $p2:p2, $label:label in ( Edge.PLUS, Edge.MINUS, Edge.B ) )
$edge2: Edge( p1 == $p2, p2 == $p1, label == Edge.NIL )
then
$edge1.setPlotted( true );
$edge2.setLabel( $label );
$edge2.setPlotted( true );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("match edge - Plot "+$label+" "+$p1+" "+$p2);
end
@@ -190,11 +190,11 @@
when
Stage( value == Stage.LABELING )
Junction( type == Junction.L, $basePoint:basePoint )
- Edge( p1 == $basePoint, $Edge1P2 : p2, label == Edge.PLUS | == Edge.MINUS )
+ Edge( p1 == $basePoint, $Edge1P2 : p2, label in ( Edge.PLUS, Edge.MINUS ) )
$edge: Edge( p1 == $basePoint, p2 != $Edge1P2, label == Edge.NIL )
then
$edge.setLabel( Edge.B );
- modify( $edge );
+ update( $edge );
System.out.println("Label L");
end
@@ -207,8 +207,8 @@
then
$edge1.setLabel( Edge.B );
$edge2.setLabel( Edge.B );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("Label tee A");
end
@@ -222,8 +222,8 @@
then
$edge1.setLabel( Edge.B );
$edge2.setLabel( Edge.B );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("Label tee B");
end
@@ -237,8 +237,8 @@
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label fork 1");
end
@@ -251,7 +251,7 @@
$edge: Edge( p1 == $basePoint, p2 != $p1, p2 != $p2, label == Edge.NIL )
then
$edge.setLabel( Edge.B );
- modify( $edge );
+ update( $edge );
System.out.println("label fork 2");
end
@@ -264,7 +264,7 @@
$edge: Edge( p1 == $basePoint, p2 != $p1, p2 != $p2, label == Edge.NIL )
then
$edge.setLabel( Edge.MINUS );
- modify( $edge );
+ update( $edge );
System.out.println("label fork 3");
end
@@ -277,7 +277,7 @@
$edge: Edge( p1 == $basePoint, p2 != $p1, p2 != $p2, label == Edge.NIL )
then
$edge.setLabel( Edge.MINUS );
- modify( $edge );
+ update( $edge );
System.out.println("label fork 4");
end
@@ -285,14 +285,14 @@
when
Stage( value == Stage.LABELING )
Junction( type == Junction.ARROW, $basePoint:basePoint, $p1:p1, $p2:p2, $p3:p3 )
- Edge( p1 == $basePoint, p2 == $p1, $label:label == Edge.B | == Edge.MINUS )
+ Edge( p1 == $basePoint, p2 == $p1, $label:label in ( Edge.B, Edge.MINUS ) )
$edge1: Edge( p1 == $basePoint, p2 == $p2, label == Edge.NIL )
$edge2: Edge( p1 == $basePoint, p2 == $p3 )
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( $label );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label arrow 1A");
end
@@ -300,14 +300,14 @@
when
Stage( value == Stage.LABELING )
Junction( type == Junction.ARROW, $basePoint:basePoint, $p1:p1, $p2:p2, $p3:p3 )
- Edge( p1 == $basePoint, p2 == $p1, $label:label == Edge.B | == Edge.MINUS )
+ Edge( p1 == $basePoint, p2 == $p1, $label:label in ( Edge.B, Edge.MINUS ) )
$edge1: Edge( p1 == $basePoint, p2 == $p2 )
$edge2: Edge( p1 == $basePoint, p2 == $p3, label == Edge.NIL )
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( $label );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label arrow 1B");
end
@@ -315,14 +315,14 @@
when
Stage( value == Stage.LABELING )
Junction( type == Junction.ARROW, $basePoint:basePoint, $p1:p1, $p2:p2, $p3:p3 )
- Edge( p1 == $basePoint, p2 == $p3, $label:label == Edge.B | == Edge.MINUS )
+ Edge( p1 == $basePoint, p2 == $p3, $label:label in ( Edge.B, Edge.MINUS ) )
$edge1: Edge( p1 == $basePoint, p2 == $p2, label == Edge.NIL )
$edge2: Edge( p1 == $basePoint, p2 == $p1 )
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( $label );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label arrow 2A");
end
@@ -330,14 +330,14 @@
when
Stage( value == Stage.LABELING )
Junction( type == Junction.ARROW, $basePoint:basePoint, $p1:p1, $p2:p2, $p3:p3 )
- Edge( p1 == $basePoint, p2 == $p3, $label:label == Edge.B | == Edge.MINUS )
+ Edge( p1 == $basePoint, p2 == $p3, $label:label in ( Edge.B, Edge.MINUS ) )
$edge1: Edge( p1 == $basePoint, p2 == $p2 )
$edge2: Edge( p1 == $basePoint, p2 == $p1, label == Edge.NIL )
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( $label );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label arrow 2B");
end
@@ -351,8 +351,8 @@
then
$edge1.setLabel( Edge.MINUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label arrow 3A");
end
@@ -366,8 +366,8 @@
then
$edge1.setLabel( Edge.MINUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label arrow 3B");
end
@@ -381,8 +381,8 @@
then
$edge1.setLabel( Edge.MINUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label arrow 4A");
end
@@ -396,8 +396,8 @@
then
$edge1.setLabel( Edge.MINUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label arrow 4B");
end
@@ -411,8 +411,8 @@
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label arrow 5A");
end
@@ -426,8 +426,8 @@
then
$edge1.setLabel( Edge.PLUS );
$edge2.setLabel( Edge.PLUS );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
System.out.println("label arrow 5B");
end
@@ -440,7 +440,7 @@
$stage: Stage( value == Stage.LABELING )
then
$stage.setValue( Stage.PLOT_REMAINING_EDGES );
- modify( $stage );
+ update( $stage );
System.out.println("done labeling");
end
@@ -452,7 +452,7 @@
then
System.out.println("Plot "+$label+" "+$p1+" "+$p2);
$edge.setPlotted( true );
- modify( $edge );
+ update( $edge );
end
# If we have been un able to label an edge, assume that it is a boundary.
@@ -465,7 +465,7 @@
then
System.out.println("Plot B "+$p1+" "+$p2);
$edge.setPlotted( true );
- modify( $edge );
+ update( $edge );
end
# If there is no more work to do, then we are done and flag it.
@@ -474,6 +474,6 @@
$stage: Stage( value == Stage.PLOT_REMAINING_EDGES )
then
$stage.setValue( Stage.DONE );
- modify( $stage );
+ update( $stage );
System.out.println("Stage: done");
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/waltzdb/waltzdb.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/waltzdb/waltzdb.drl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/waltzdb/waltzdb.drl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -25,8 +25,8 @@
then
System.out.println( "Edge " + $p1 + " " + $p2 );
System.out.println( "Edge " + $p2 + " " + $p1 );
- assert( new Edge( $p1, $p2, false ) );
- assert( new Edge( $p2, $p1, false ) );
+ insert( new Edge( $p1, $p2, false ) );
+ insert( new Edge( $p2, $p1, false ) );
retract( $line );
end
# Reversing is done
@@ -41,7 +41,7 @@
not ( Line( ) )
then
$stage.setValue( Stage.DETECT_JUNCTIONS );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.DETECT_JUNCTIONS" );
end
@@ -69,7 +69,7 @@
$edge3 : Edge( p1 == $basePoint, $p3 : p2 != $p1, p2 != $p2, joined == false )
then
Junction junction = new Junction( $basePoint, "3j", "make_3_junction " + $basePoint + " " + $p1 + " " + " " + $p2 + " " + $p3, "no" );
- assert( junction );
+ insert( junction );
System.out.println( junction.toString( ) );
$edge1.setJoined( true );
$edge1.setType( "3j" );
@@ -77,9 +77,9 @@
$edge2.setType( "3j" );
$edge3.setJoined( true );
$edge3.setType( "3j" );
- modify( $edge1 );
- modify( $edge2 );
- modify( $edge3 );
+ update( $edge1 );
+ update( $edge2 );
+ update( $edge3 );
end
/*
(p make_L
@@ -107,14 +107,14 @@
not( Edge( p1 == $basePoint, p2 != $p2, p2 != $p3 ) )
then
Junction junction = new Junction( "2j", "L", $basePoint, $p2, $p3, "no" );
- assert( junction );
+ insert( junction );
System.out.println( junction.toString() );
$edge1.setJoined( true );
$edge1.setType( "2j" );
$edge2.setJoined( true );
$edge2.setType( "2j" );
- modify( $edge1 );
- modify( $edge2 );
+ update( $edge1 );
+ update( $edge2 );
end
/*
@@ -131,7 +131,7 @@
not( Edge ( joined == false ) )
then
$stage.setValue( Stage.FIND_INITIAL_BOUNDARY );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage: FIND_INITIAL_BOUNDARY" );
end
@@ -157,11 +157,11 @@
not Junction( type == "2j", basePoint > $basePoint )//type == "2j" not in original
then
$junction.setVisited( "yes" );
- modify( $junction );
- assert( new EdgeLabel( $basePoint, $p1, "B", "1" ) );
- assert( new EdgeLabel( $basePoint, $p2, "B", "1" ) );
+ update( $junction );
+ insert( new EdgeLabel( $basePoint, $p1, "B", "1" ) );
+ insert( new EdgeLabel( $basePoint, $p2, "B", "1" ) );
$stage.setValue( Stage.FIND_SECOND_BOUDARY );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.FIND_SECOND_BOUDARY" );
end
/*
@@ -191,12 +191,12 @@
not ( Junction( basePoint > $basePoint ) )
then
$junction.setVisited( "yes" );
- modify( $junction );
- assert( new EdgeLabel( $basePoint, $p1, "B", "14" ) );
- assert( new EdgeLabel( $basePoint, $p2, "+", "14" ) );
- assert( new EdgeLabel( $basePoint, $p3, "B", "14" ) );
+ update( $junction );
+ insert( new EdgeLabel( $basePoint, $p1, "B", "14" ) );
+ insert( new EdgeLabel( $basePoint, $p2, "+", "14" ) );
+ insert( new EdgeLabel( $basePoint, $p3, "B", "14" ) );
$stage.setValue( Stage.FIND_SECOND_BOUDARY );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.FIND_SECOND_BOUDARY" );
end
@@ -224,11 +224,11 @@
not (Junction ( basePoint < $basePoint ) )
then
$junction.setVisited( "yes" );
- modify( $junction );
- assert( new EdgeLabel( $basePoint, $p1, "B", "1" ) );
- assert( new EdgeLabel($basePoint, $p2, "B", "1" ) );
+ update( $junction );
+ insert( new EdgeLabel( $basePoint, $p1, "B", "1" ) );
+ insert( new EdgeLabel($basePoint, $p2, "B", "1" ) );
$stage.setValue( Stage.LABELING );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.LABELING" );
end
@@ -259,12 +259,12 @@
not ( Junction( basePoint < $basePoint ) )
then
$junction.setVisited( "yes" );
- modify( $junction );
- assert( new EdgeLabel( $basePoint, $p1, "B", "14" ) );
- assert( new EdgeLabel( $basePoint, $p2, "+", "14" ) );
- assert( new EdgeLabel( $basePoint, $p3, "B", "14" ) );
+ update( $junction );
+ insert( new EdgeLabel( $basePoint, $p1, "B", "14" ) );
+ insert( new EdgeLabel( $basePoint, $p2, "+", "14" ) );
+ insert( new EdgeLabel( $basePoint, $p3, "B", "14" ) );
$stage.setValue( Stage.LABELING );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.LABELING" );
end
@@ -283,9 +283,9 @@
$junction : Junction( type == "3j", $basePoint : basePoint, $p1 : p1, $p2 : p2, $p3 : p3, visited == "no" )
then
$stage.setValue( Stage.VISITING_3J );
- modify( $stage );
+ update( $stage );
$junction.setVisited( "now" );
- modify( $junction );
+ update( $junction );
System.out.println( "Stage.VISITING_3J" );
end
@@ -320,9 +320,9 @@
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p3 + " " + $n3 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
- assert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
end
/*
@@ -357,9 +357,9 @@
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p3 + " " + $n3 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
- assert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
end
/*
@@ -394,9 +394,9 @@
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p3 + " " + $n3 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
- assert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
end
/*
@@ -431,9 +431,9 @@
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p3 + " " + $n3 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
- assert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
end
/*
@@ -468,9 +468,9 @@
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p3 + " " + $n3 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
- assert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
end
/*
@@ -505,9 +505,9 @@
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p3 + " " + $n3 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
- assert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
end
/*
@@ -542,9 +542,9 @@
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p3 + " " + $n3 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
- assert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
end
/*
@@ -579,9 +579,9 @@
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p3 + " " + $n3 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
- assert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p3, $n3, $id ) );
end
/*
@@ -600,10 +600,10 @@
$junction : Junction( $basePoint : basePoint, type == "2j", $p1 : p1, $p2 : p2, visited == "no" )
then
$stage.setValue( Stage.VISITING_2J );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.VISITING_2J" );
$junction.setVisited( "now" );
- modify( $junction );
+ update( $junction );
end
/*
@@ -634,8 +634,8 @@
then
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
end
/*
@@ -665,8 +665,8 @@
then
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
end
/*
@@ -696,8 +696,8 @@
then
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
end
/*
@@ -728,8 +728,8 @@
then
System.out.println( "EdgeLabel " + $basePoint + " " + $p1 + " " + $n1 + " " + $id );
System.out.println( "EdgeLabel " + $basePoint + " " + $p2 + " " + $n2 + " " + $id );
- assert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
- assert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
+ insert( new EdgeLabel( $basePoint, $p1, $n1, $id ) );
+ insert( new EdgeLabel( $basePoint, $p2, $n2, $id ) );
end
/*
@@ -747,7 +747,7 @@
$junction : Junction( visited == "now" )
then
$stage.setValue( Stage.MARKING );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.MARKING" );
end
/*
@@ -768,7 +768,7 @@
$junction : Junction( basePoint == $p1, visited == "yes" )
then
$junction.setVisited( "check" );
- modify( $junction );
+ update( $junction );
end
/*
@@ -785,7 +785,7 @@
$junction : Junction( $basePoint : basePoint, visited == "now" )
then
$junction.setVisited( "yes" );
- modify( $junction );
+ update( $junction );
end
/*
@@ -799,7 +799,7 @@
$stage : Stage( value == Stage.MARKING )
then
$stage.setValue( Stage.CHECKING );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.CHECKING" );
end
@@ -823,9 +823,9 @@
not ( EdgeLabel( p1 == $p2, p2 == $basePoint, labelName == $labelName ) )
then
$stage.setValue( Stage.REMOVE_LABEL );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.REMOVE_LABEL" );
- assert ( new Illegal( $basePoint, $labelId ) );
+ insert ( new Illegal( $basePoint, $labelId ) );
end
/*
(p remove_label_3j
@@ -855,7 +855,7 @@
$edgeLabel3 : EdgeLabel( p1 == $basePoint, p2 == $p3, labelId == $labelId )
then
$stage.setValue( Stage.CHECKING );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.CHECKING" );
retract( $illegal );
retract( $edgeLabel1 );
@@ -887,7 +887,7 @@
$edgeLabel2 : EdgeLabel( p1 == $basePoint, p2 == $p2, labelId == $labelId )
then
$stage.setValue( Stage.CHECKING );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.CHECKING" );
retract( $illegal );
retract( $edgeLabel1 );
@@ -908,7 +908,7 @@
$junction : Junction( $basePoint : basePoint, visited == "check" )
then
$junction.setVisited( "yes" );
- modify( $junction );
+ update( $junction );
end
/*
@@ -922,7 +922,7 @@
$stage : Stage( value == Stage.CHECKING )
then
$stage.setValue( Stage.LABELING );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.LABELING" );
end
/*
@@ -936,7 +936,7 @@
$stage : Stage( value == Stage.LABELING )
then
$stage.setValue( Stage.PRINTING );
- modify( $stage );
+ update( $stage );
System.out.println( "Stage.PRINTING" );
end
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/Fibonacci.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/Fibonacci.drl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/Fibonacci.drl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -7,7 +7,7 @@
when
f : Fibonacci ( value == -1 )
then
- assert( new Fibonacci( f.getSequence() - 1 ) );
+ insert( new Fibonacci( f.getSequence() - 1 ) );
System.out.println( "recurse for " + f.getSequence() );
end
@@ -17,7 +17,7 @@
f : Fibonacci( sequence == 1, value == -1 )
then
f.setValue( 1 );
- modify( f );
+ update( f );
System.out.println( f.getSequence() + " == " + f.getValue() );
end
@@ -26,7 +26,7 @@
f : Fibonacci( sequence == 2, value == -1 )
then
f.setValue( 1 );
- modify( f );
+ update( f );
System.out.println( f.getSequence() + " == " + f.getValue() );
end
@@ -37,7 +37,7 @@
f3 : Fibonacci( sequence == (s2 + 1 ), value == -1 )
then
f3.setValue( f1.getValue() + f2.getValue() );
- modify( f3 );
+ update( f3 );
retract( f1 );
System.out.println( f3.getSequence() + " == " + f3.getValue() );
end
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/HelloWorld.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/HelloWorld.drl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/HelloWorld.drl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -9,7 +9,7 @@
System.out.println( message );
m.setMessage( "Goodbye cruel world" );
m.setStatus( Message.GOODBYE );
- modify( m );
+ update( m );
end
rule "GoodBye"
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/HonestPolitician.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/HonestPolitician.drl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/HonestPolitician.drl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -7,7 +7,7 @@
when
exists( Politician( honest == true ) )
then
- assertLogical( new Hope() );
+ insertLogical( new Hope() );
end
rule "Hope Lives"
@@ -33,6 +33,6 @@
then
System.out.println( "I'm an evil corporation and I have corrupted " + politician.getName() );
politician.setHonest( false );
- modify( politician );
+ update( politician );
end
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/LogicalAssertionsNotPingPong.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/LogicalAssertionsNotPingPong.drl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/LogicalAssertionsNotPingPong.drl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -15,7 +15,7 @@
if (l.size() < 10) {
l.add(new Integer(0));
System.out.println("Logical assert i");
- assertLogical(i);
+ insertLogical(i);
}
end
rule "i then s"
@@ -25,6 +25,6 @@
if (l.size() < 10) {
l.add(new Integer(0));
System.out.println("Logical assert s");
- assertLogical(s);
+ insertLogical(s);
}
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/TroubleTicket.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/TroubleTicket.drl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/TroubleTicket.drl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -19,7 +19,7 @@
ticket : Ticket( customer == customer, status == "New" )
then
ticket.setStatus( "Escalate" );
- modify( ticket );
+ update( ticket );
end
rule "Gold Priority"
@@ -29,7 +29,7 @@
ticket : Ticket( customer == customer, status == "New" )
then
ticket.setStatus( "Escalate" );
- modify( ticket );
+ update( ticket );
end
rule "Platinum Priority"
@@ -38,7 +38,7 @@
ticket : Ticket( customer == customer, status == "New" )
then;
ticket.setStatus( "Escalate" );
- modify( ticket );
+ update( ticket );
end
rule "Escalate"
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/conway/conway.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/conway/conway.drl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/conway/conway.drl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -18,8 +18,8 @@
$cell: Cell( $row : row > 0, $col : col < ( $numberOfColumns - 1 ) )
$northEast : Cell( row == ($row - 1), col == $col )
then
- assert( new Neighbor( $cell, $northEast ) );
- assert( new Neighbor( $northEast, $cell ) );
+ insert( new Neighbor( $cell, $northEast ) );
+ insert( new Neighbor( $northEast, $cell ) );
end
rule "register north"
@@ -28,8 +28,8 @@
$cell: Cell( $row : row > 0, $col : col )
$north : Cell( row == ($row - 1), col == $col )
then
- assert( new Neighbor( $cell, $north ) );
- assert( new Neighbor( $north, $cell ) );
+ insert( new Neighbor( $cell, $north ) );
+ insert( new Neighbor( $north, $cell ) );
end
rule "register north west"
@@ -38,8 +38,8 @@
$cell: Cell( $row : row > 0, $col : col > 0 )
$northWest : Cell( row == ($row - 1), col == ( $col - 1 ) )
then
- assert( new Neighbor( $cell, $northWest ) );
- assert( new Neighbor( $northWest, $cell ) );
+ insert( new Neighbor( $cell, $northWest ) );
+ insert( new Neighbor( $northWest, $cell ) );
end
rule "register west"
@@ -48,8 +48,8 @@
$cell: Cell( $row : row > 0, $col : col > 0 )
$west : Cell( row == $row, col == ( $col - 1 ) )
then
- assert( new Neighbor( $cell, $west ) );
- assert( new Neighbor( $west, $cell ) );
+ insert( new Neighbor( $cell, $west ) );
+ insert( new Neighbor( $west, $cell ) );
end
rule "Kill The Lonely"
@@ -60,7 +60,7 @@
theCell: Cell(liveNeighbors < 2, cellState == CellState.LIVE, phase == Phase.EVALUATE)
then
theCell.setPhase(Phase.KILL);
- modify( theCell );
+ update( theCell );
end
rule "Kill The Overcrowded"
@@ -71,7 +71,7 @@
theCell: Cell(liveNeighbors > 3, cellState == CellState.LIVE, phase == Phase.EVALUATE)
then
theCell.setPhase(Phase.KILL);
- modify( theCell );
+ update( theCell );
end
rule "Give Birth"
@@ -82,7 +82,7 @@
theCell: Cell(liveNeighbors == 3, cellState == CellState.DEAD, phase == Phase.EVALUATE)
then
theCell.setPhase(Phase.BIRTH);
- modify( theCell );
+ update( theCell );
end
rule "reset calculate"
@@ -98,12 +98,10 @@
no-loop
when
theCell: Cell(phase == Phase.KILL)
-
- Person(age == a.b[0].[key])
then
theCell.setCellState(CellState.DEAD);
theCell.setPhase(Phase.DONE);
- modify( theCell );
+ update( theCell );
end
rule "birth"
@@ -114,7 +112,7 @@
then
theCell.setCellState(CellState.LIVE);
theCell.setPhase(Phase.DONE);
- modify( theCell );
+ update( theCell );
end
rule "Calculate Live"
@@ -126,7 +124,7 @@
then
$neighbor.setLiveNeighbors( $neighbor.getLiveNeighbors() + 1 );
$neighbor.setPhase( Phase.EVALUATE );
- modify( $neighbor );
+ update( $neighbor );
end
rule "Calculate Dead"
@@ -138,7 +136,7 @@
then
$neighbor.setLiveNeighbors( $neighbor.getLiveNeighbors() - 1 );
$neighbor.setPhase( Phase.EVALUATE );
- modify( $neighbor );
+ update( $neighbor );
end
rule "Kill All"
@@ -148,5 +146,5 @@
theCell: Cell(cellState == CellState.LIVE)
then
theCell.setCellState(CellState.DEAD);
- modify( theCell );
+ update( theCell );
end
\ No newline at end of file
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/sudoku/sudoku.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/sudoku/sudoku.drl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/sudoku/sudoku.drl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -8,15 +8,15 @@
when
$field : Field( value == 0, $row : row, $column : column, $zone : zone )
then
- assert( new PossibleValue("1", $field ) );
- assert( new PossibleValue("2", $field ) );
- assert( new PossibleValue("3", $field ) );
- assert( new PossibleValue("4", $field ) );
- assert( new PossibleValue("5", $field ) );
- assert( new PossibleValue("6", $field ) );
- assert( new PossibleValue("7", $field ) );
- assert( new PossibleValue("8", $field ) );
- assert( new PossibleValue("9", $field ) );
+ insert( new PossibleValue("1", $field ) );
+ insert( new PossibleValue("2", $field ) );
+ insert( new PossibleValue("3", $field ) );
+ insert( new PossibleValue("4", $field ) );
+ insert( new PossibleValue("5", $field ) );
+ insert( new PossibleValue("6", $field ) );
+ insert( new PossibleValue("7", $field ) );
+ insert( new PossibleValue("8", $field ) );
+ insert( new PossibleValue("9", $field ) );
retract( $field );
#System.out.println("Rule 1 fired.");
end
@@ -27,7 +27,7 @@
$pv : PossibleValue ( $row : row, $zone : zone, $column : column, $value : value )
not ( PossibleValue ( row == $row, zone == $zone, column == $column, value != $value ) )
then
- assert( new Field( $value, $column, $row, $zone ) );
+ insert( new Field( $value, $column, $row, $zone ) );
retract( $pv );
#System.out.println("Rule 2 fired.");
end
@@ -82,7 +82,7 @@
not (Field( value == $value, row == $row) )
not (Field( value == $value, column == $col) )
then
- assert( new Field( $value, $col, $row, $zone ) );
+ insert( new Field( $value, $col, $row, $zone ) );
retract( $pv );
#System.out.println("Rule 7 fired.");
end
@@ -96,7 +96,7 @@
not (Field( value == $value, row == $row) )
not (Field( value == $value, column == $col) )
then
- assert( new Field( $value, $col, $row, $zone ) );
+ insert( new Field( $value, $col, $row, $zone ) );
retract( $pv1 );
#System.out.println("Rule 8 fired.");
end
@@ -110,7 +110,7 @@
not (Field( value == $value, row == $row) )
not (Field( value == $value, column == $col) )
then
- assert( new Field( $value, $col, $row, $zone ) );
+ insert( new Field( $value, $col, $row, $zone ) );
retract( $pv );
#System.out.println("Rule 9 fired.");
end
Modified: labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/ticketing.dsl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/ticketing.dsl 2007-07-11 12:15:16 UTC (rev 13355)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/examples/ticketing.dsl 2007-07-11 12:58:21 UTC (rev 13356)
@@ -1,6 +1,5 @@
-#place your comments here - this is just a description for your own purposes.
-[when]There is a customer ticket with status of "{status}"=customer : Customer( ) ticket : Ticket( customer == customer, status == "{status}" )
-[when]There is a "{subscription}" customer with a ticket status of "{status}"=customer : Customer(subscription == "{subscription}") ticket : Ticket( customer == customer, status == "{status}")
-[then]Log "{message}"=System.out.println("{message} " + ticket);
-[then]Escalate the ticket=ticket.setStatus("Escalate"); modify(ticket);
-[then]Send escalation email=sendEscalationEmail( customer, ticket );
+[condition][]There is a customer ticket with status of "{status}"=customer : Customer( ) ticket : Ticket( customer == customer, status == "{status}" )
+[condition][]There is a "{subscription}" customer with a ticket status of "{status}"=customer : Customer(subscription == "{subscription}") ticket : Ticket( customer == customer, status == "{status}")
+[consequence][]Log "{message}"=System.out.println("{message} ");
+[consequence][]Escalate the ticket=ticket.setStatus("Escalate"); update(ticket);
+[consequence][]Send escalation email=sendEscalationEmail( customer, ticket );
More information about the jboss-svn-commits
mailing list