[jboss-svn-commits] JBL Code SVN: r18540 - in labs/jbossrules/trunk/drools-analytics/src: main/resources/org/drools/analytics/rangeChecks and 3 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Thu Feb 21 02:38:51 EST 2008
Author: Rikkola
Date: 2008-02-21 02:38:51 -0500 (Thu, 21 Feb 2008)
New Revision: 18540
Added:
labs/jbossrules/trunk/drools-analytics/src/test/resources/org/drools/analytics/Overlap.drl
Modified:
labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/MessageType.java
labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Dates.drl
labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/subsumption/Possibilities.drl
labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/subsumption/Restrictions.drl
labs/jbossrules/trunk/drools-analytics/src/test/java/org/drools/analytics/AnalyzerTest.java
Log:
Added overlaps and new rules to subsumption.
Modified: labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/MessageType.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/MessageType.java 2008-02-21 05:02:52 UTC (rev 18539)
+++ labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/analytics/report/components/MessageType.java 2008-02-21 07:38:51 UTC (rev 18540)
@@ -10,6 +10,7 @@
public static final MessageType MISSING_COMPONENT = new MessageType(5);
public static final MessageType OPTIMISATION = new MessageType(6);
public static final MessageType INCOHERENCE = new MessageType(7);
+ public static final MessageType OVERLAP = new MessageType(8);
public final int index;
Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Dates.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Dates.drl 2008-02-21 05:02:52 UTC (rev 18539)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Dates.drl 2008-02-21 07:38:51 UTC (rev 18540)
@@ -28,6 +28,10 @@
return ( 0 == c1.compareTo( c2 ) );
}
+function String hello(String name) {
+ return "Hello "+name+"!";
+}
+
# If all ranges are not checked for a field.
#
# Type: Warning
Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/subsumption/Possibilities.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/subsumption/Possibilities.drl 2008-02-21 05:02:52 UTC (rev 18539)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/subsumption/Possibilities.drl 2008-02-21 07:38:51 UTC (rev 18540)
@@ -13,6 +13,18 @@
#declare any global variables here
+#
+# Fires when two pattern possibilities are subsumptant.
+# Creates a Subsumption object.
+#
+# Depandencies: Needs at least one rule.
+#
+# package org.drools.analytics.redundancy.patterns
+# rule "Find redundant Patterns with restrictions"
+# rule "Find redundant Patterns without restrictions"
+#
+# Example 1: P( x == 10 ) and P( x == 10 && y == 20 )
+#
rule "Find subsumptant pattern possibilities"
when
@@ -67,12 +79,19 @@
insert( new Subsumption( $pp1, $pp2 ) );
end
-
#
-# Finds subsumptant rule possibilities
+# Fires when two pattern possibilities are subsumptant.
+# Creates a Subsumption object.
#
-# Depandencies: TODO: Dependencies
+# Depandencies: Needs at least one rule from either one of the following packages.
#
+# package org.drools.analytics.subsumption.patterns
+# rule "Find subsumptant pattern possibilities"
+#
+# package org.drools.analytics.redundancy.patterns
+# rule "Find redundant Patterns with restrictions"
+# rule "Find redundant Patterns without restrictions"
+#
rule "Find subsumptant rule possibilities"
when
@@ -126,31 +145,4 @@
insert( new Subsumption( $rp1, $rp2 ) );
end
-rule "XXX: test rule"
- when
- $redundancy :Redundancy(
- left.causeType == CauseType.RULE
- )
- # Find two RulePossibilities.
- $rp1 :RulePossibility(
- eval( ruleId == $redundancy.getLeft().getId() )
- )
- $rp2 :RulePossibility(
- eval( ruleId == $redundancy.getRight().getId() )
- )
-
- forall(
- $pp :PatternPossibility(
- this memberOf $rp1.items
- )
-
- Redundancy(
- left == $pp,
- right memberOf $rp2.items
- )
- )
- then
- System.out.println( "pim" );
-end
-
Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/subsumption/Restrictions.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/subsumption/Restrictions.drl 2008-02-21 05:02:52 UTC (rev 18539)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/subsumption/Restrictions.drl 2008-02-21 07:38:51 UTC (rev 18540)
@@ -8,9 +8,15 @@
import org.drools.analytics.report.components.Subsumption;
+
#
-# TODO:
+# Fires when two restrictions are subsumptant.
+# Creates a Subsumption object.
#
+# Depandencies: None
+#
+# Example 1: P( x > 10 ) and P( x > 100 )
+#
rule "Find subsumptant restrictions, greater than"
when
# Covered x > 10
@@ -31,8 +37,13 @@
end
#
-# TODO:
+# Fires when two restrictions are subsumptant.
+# Creates a Subsumption object.
#
+# Depandencies: None
+#
+# Example 1: P( x < 10 ) and P( x < 100 )
+#
rule "Find subsumptant restrictions, less than"
when
# Covered x < 10
Modified: labs/jbossrules/trunk/drools-analytics/src/test/java/org/drools/analytics/AnalyzerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/test/java/org/drools/analytics/AnalyzerTest.java 2008-02-21 05:02:52 UTC (rev 18539)
+++ labs/jbossrules/trunk/drools-analytics/src/test/java/org/drools/analytics/AnalyzerTest.java 2008-02-21 07:38:51 UTC (rev 18540)
@@ -2,15 +2,14 @@
import java.io.InputStreamReader;
+import junit.framework.TestCase;
+
import org.drools.RuleBase;
import org.drools.analytics.dao.AnalyticsResult;
-import org.drools.analytics.report.components.AnalyticsMessageBase;
import org.drools.analytics.report.components.Severity;
import org.drools.compiler.DrlParser;
import org.drools.lang.descr.PackageDescr;
-import junit.framework.TestCase;
-
public class AnalyzerTest extends TestCase {
public void testAnalyzer() throws Exception {
Added: labs/jbossrules/trunk/drools-analytics/src/test/resources/org/drools/analytics/Overlap.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/test/resources/org/drools/analytics/Overlap.drl (rev 0)
+++ labs/jbossrules/trunk/drools-analytics/src/test/resources/org/drools/analytics/Overlap.drl 2008-02-21 07:38:51 UTC (rev 18540)
@@ -0,0 +1,27 @@
+package com.sample
+
+import com.sample.DroolsTest.Message;
+
+/*
+rule "Overlap 1a"
+ when
+ $s :Something( )
+ Foo1w( value > $s )
+ then
+ System.out.println( "Test" );
+end
+
+rule "Overlap 1b"
+ when
+ $s :Something( )
+ Foo1w( value < $s )
+ then
+ System.out.println( "Test" );
+end
+*/
+rule "new rule"
+ when
+ Something( a == "1" )
+ then
+ System.out.println( "Test" );
+end
\ No newline at end of file
More information about the jboss-svn-commits
mailing list