[jboss-svn-commits] JBL Code SVN: r5285 - in labs/jbossrules/trunk/drools-examples/src/main: java/org/drools/benchmark/waltz resources/org/drools/benchmark rules/org/drools/benchmark/waltz

[jboss-svn-commits at lists.jboss.org]

Author: mark.proctor at jboss.com
Date: 2006-07-25 20:31:50 -0400 (Tue, 25 Jul 2006)
New Revision: 5285

Added:
   labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/benchmark/waltz/
Removed:
   labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/benchmark/watz/
Modified:
   labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltz/WaltzBenchmark.java
   labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/waltz/waltz.drl
Log:
-waltz fixes

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	2006-07-25 22:39:04 UTC (rev 5284)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/benchmark/waltz/WaltzBenchmark.java	2006-07-26 00:31:50 UTC (rev 5285)
@@ -46,18 +46,30 @@
             
             WorkingMemory workingMemory = ruleBase.newWorkingMemory();
             
-            //this.loadLines( workingMemory, "waltz12.dat" );
+            String filename;
+            if (  args.length != 0 ) {
+                String arg = args[0];                
+                filename  = arg;                
+            } else {
+                filename  = "waltz12.dat";
+            }
             
-            Stage stage = new Stage(Stage.START);
+            loadLines( workingMemory, "waltz50.dat" );
+            
+            Stage stage = new Stage(Stage.DUPLICATE);
             workingMemory.assertObject( stage );
-            workingMemory.fireAllRules();               
+            
+            long start = System.currentTimeMillis();
+            workingMemory.fireAllRules();
+            System.out.println( System.currentTimeMillis() - start );
+            
         } catch (Throwable t) {
             t.printStackTrace();
         }
     }
 
     
-    private void loadLines(WorkingMemory wm, String filename) throws IOException {
+    private static void loadLines(WorkingMemory wm, String filename) throws IOException {
         BufferedReader reader = new BufferedReader(new InputStreamReader( WaltzBenchmark.class.getResourceAsStream( filename ) ));
         Pattern pat = Pattern.compile( ".*make line \\^p1 ([0-9]*) \\^p2 ([0-9]*).*" );
         String line = reader.readLine();

Copied: labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/benchmark/waltz (from rev 5209, labs/jbossrules/trunk/drools-examples/src/main/resources/org/drools/benchmark/watz)

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	2006-07-25 22:39:04 UTC (rev 5284)
+++ labs/jbossrules/trunk/drools-examples/src/main/rules/org/drools/benchmark/waltz/waltz.drl	2006-07-26 00:31:50 UTC (rev 5285)
@@ -7,35 +7,6 @@
 import org.drools.benchmark.waltz.Junction
 import org.drools.benchmark.waltz.WaltzUtil
 
-# the starting rule
-rule "begin waltz"
-	when
-		$stage : Stage(value == Stage.START)
-	then 
-	    assert (new Line( 122,  107));
-	    assert (new Line( 107, 2207));
-    	assert (new Line(2207, 3204));
-    	assert (new Line(3204, 6404));
-    	assert (new Line(2216, 2207));
-    	assert (new Line(3213, 3204));
-    	assert (new Line(2216, 3213));
-    	assert (new Line( 107, 2601));
-    	assert (new Line(2601, 7401));
-    	assert (new Line(6404, 7401));
-    	assert (new Line(3213, 6413));
-    	assert (new Line(6413, 6404));
-    	assert (new Line(7416, 7401));
-    	assert (new Line(5216, 6413));
-    	assert (new Line(2216, 5216));
-    	assert (new Line( 122, 5222));
-    	assert (new Line(5222, 7416));
-    	assert (new Line(5222, 5216));
-    	$stage.setValue(Stage.DUPLICATE);
-    	modify ( $stage );
-    	System.out.println("Waltz started");
-    	System.out.println("Stage: duplicate");
-end
-
 #If the duplicate flag is set, and there is still a line in WM, delete the line
 #and add two edges. One edge runs from p1 to p2 and the other runs from p2 to
 #p1.  We then plot the edge.
@@ -114,7 +85,7 @@
 rule "initial boundary junction L"
 	when
 	    $stage : Stage ( value == Stage.FIND_INITIAL_BOUNDARY )
-	             Junction( type == Junction.L, $basePoint:basePoint, $p1:p1, $p2:p2 )
+	    Junction( type == Junction.L, $basePoint:basePoint, $p1:p1, $p2:p2 )
 	    $edge1 : Edge ( p1 == $basePoint, p2 == $p1 )
 	    $edge2 : Edge ( p1 == $basePoint, p2 == $p2 )
         not Junction( $bp:basePoint > $basePoint )
@@ -132,7 +103,7 @@
 rule "initial boundary junction arrow"
 	when
 	    $stage : Stage ( value == Stage.FIND_INITIAL_BOUNDARY )
-	             Junction( type == Junction.ARROW, $basePoint:basePoint, $p1:p1, $p2:p2, $p3:p3 )
+	    Junction( type == Junction.ARROW, $basePoint:basePoint, $p1:p1, $p2:p2, $p3:p3 )
 	    $edge1 : Edge ( p1 == $basePoint, p2 == $p1 )
 	    $edge2 : Edge ( p1 == $basePoint, p2 == $p2 )
 	    $edge3 : Edge ( p1 == $basePoint, p2 == $p3 )