[jboss-svn-commits] JBL Code SVN: r17412 - in labs/jbossrules/trunk/drools-analytics/src: main/resources/org/drools/analytics/incoherence and 6 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Thu Dec 27 10:55:22 EST 2007


Author: Rikkola
Date: 2007-12-27 10:55:22 -0500 (Thu, 27 Dec 2007)
New Revision: 17412

Modified:
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/equivalence/Rules.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Patterns.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Restrictions.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/missingEquality/MissingEquality.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/PatternOrder.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/RestrictionOrder.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Clean.drl
   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/Doubles.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Integers.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Patterns.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Consequence.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Notes.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Patterns.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Possibilities.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Restrictions.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Rules.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Warnings.drl
   labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/reports/RangeCheckReports.drl
   labs/jbossrules/trunk/drools-analytics/src/test/java/org/drools/analytics/redundancy/RedundantConsequencesTest.java
Log:
Commented dependencies for rules.

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/equivalence/Rules.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/equivalence/Rules.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/equivalence/Rules.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -1,5 +1,5 @@
 #created on: 7.9.2007
-package org.drools.analytics.redundancy.rules
+package org.drools.analytics.equivalency.rules
 
 import org.drools.analytics.components.AnalyticsRule;
 import org.drools.analytics.report.components.Redundancy;
@@ -8,6 +8,8 @@
 # Only checks for redundant rule specifications where consequences are not redundant, 
 # does not include actual pattern and restriction checks.
 #
+# Depandencies: None
+#
 rule "Find equivalent Rules"
 	when
 		# Check that AnalyticsRule $left and $right have redundant fields.
@@ -27,10 +29,6 @@
 			left == $left, 
 			right == $right 
 		)
-		#not Redundancy( 
-		#	left == $right, 
-		#	right == $left 
-		#)
 	then
 		insert( new Redundancy( Redundancy.RedundancyType.WEAK, $left, $right ) );
 end

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Patterns.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Patterns.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Patterns.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -25,6 +25,7 @@
 # If two Patterns are in conflict.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: 
 #		IncorencePattern( a == 1 ) 
 #		not IncorencePattern( a == 1 ) 
@@ -60,7 +61,6 @@
 			 items contains $pp2
 		)
 		
-		
 		$p1 :Pattern(
 			id == $r1.patternId 
 		)
@@ -91,6 +91,7 @@
 # If two Patterns are in conflict.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: 
 #		$var :Object()
 #		IncorencePattern( a == $var ) 
@@ -156,6 +157,7 @@
 # If two Patterns are in conflict.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: 
 #		IncorencePattern8( a > 11 ) 
 #		not IncorencePattern8( a > 1 ) 
@@ -220,6 +222,7 @@
 # If two Patterns are in conflict.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: 
 #		IncorencePattern( a < 1 ) 
 #		not IncorencePattern( a < 11 ) 
@@ -284,6 +287,7 @@
 # If two Patterns are in conflict.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: 
 #		IncoherencePattern( a >= 1 ) 
 #		not IncoherencePattern( a != 1 )  
@@ -349,6 +353,7 @@
 # If two Patterns are in conflict.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: 
 #		IncoherencePattern15( a >= $var ) 
 #		not IncoherencePattern15( a != $var )  
@@ -414,6 +419,7 @@
 # If two Patterns are in conflict.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: 
 #		IncoherencePattern13( a == $var ) 
 #		not IncoherencePattern13( a >= $var )  
@@ -478,6 +484,7 @@
 # If two Patterns are in conflict.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: 
 #		IncoherencePattern13( a == $var ) 
 #		not IncoherencePattern13( a >= $var )  

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Restrictions.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Restrictions.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/incoherence/Restrictions.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -23,6 +23,7 @@
 # If two LiteralRestrictions are in conflict.
 # 
 # Type: Error
+# Depandencies: None
 # Example: IncorencePattern1( a == "b", a != "b" )
 #
 rule "Incoherent LiteralRestrictions in pattern possibility"
@@ -71,6 +72,7 @@
 # If two LiteralRestrictions are in conflict.
 # 
 # Type: Error
+# Depandencies: None
 # Example: IncorencePattern( a > 10 && a < -10 )
 #
 rule "Incoherent LiteralRestrictions with ranges in pattern possibility, impossible ranges"
@@ -116,6 +118,7 @@
 # If two LiteralRestrictions are in conflict.
 # 
 # Type: Error
+# Depandencies: None
 # Example: IncorencePattern( a < 1 && a == 10 )
 #
 rule "Incoherent LiteralRestrictions with ranges in pattern possibility, impossible equality less or equal"
@@ -161,6 +164,7 @@
 # If two LiteralRestrictions are in conflict.
 # 
 # Type: Error
+# Depandencies: None
 # Example: IncorencePattern( a > 10 && a == 1 )
 #
 rule "Incoherent LiteralRestrictions with ranges in pattern possibility, impossible equality greater"
@@ -206,6 +210,7 @@
 # If two LiteralRestrictions are in conflict.
 # 
 # Type: Error
+# Depandencies: None
 # Example: IncorencePattern( a < "12-Dec-2007", a > "12-Dec-2007" ) 
 #
 rule "Incoherent LiteralRestrictions with ranges in pattern possibility, impossible range"
@@ -251,6 +256,7 @@
 # If two VariableRestrictions are in conflict.
 # 
 # Type: Error
+# Depandencies: None
 # Example: IncorencePattern( a contains $o, a not contains $o ) 
 #
 rule "Incoherent VariableRestrictions in pattern possibility"
@@ -297,6 +303,7 @@
 # If two VariableRestrictions are in conflict.
 # 
 # Type: Error
+# Depandencies: None
 # Example: IncorencePattern( a > $var, a < $var ) 
 #
 rule "Incoherent VariableRestrictions in pattern possibility, impossible range"

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/missingEquality/MissingEquality.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/missingEquality/MissingEquality.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/missingEquality/MissingEquality.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -21,6 +21,7 @@
 # Informs that there are inequalities, but not equality being catered for.
 # 
 # Type: Warning
+# Dependencies: None
 # Example: val != 10 when val == 10 is missing. 
 #
 rule "Missing restriction in LiteralRestrictions"
@@ -94,6 +95,7 @@
 # Informs that there are inequalities, but not equality being catered for.
 # 
 # Type: Warning
+# Dependencies: None
 # Example: val != $var when val == $var is missing. 
 #
 rule "Missing restriction in VariableRestrictions"

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/PatternOrder.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/PatternOrder.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/PatternOrder.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -25,6 +25,7 @@
 # was after fact patterns.
 # 
 # Type: Note
+# Dependencies: None
 # Example: eval(function( $something )) Pattern() 
 #
 rule "Optimise evals inside pattern"

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/RestrictionOrder.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/RestrictionOrder.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/optimisation/RestrictionOrder.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -26,6 +26,7 @@
 # component was on the left side.
 # 
 # Type: Note
+# Dependencies: None
 # Example: { a:bar } < { baz == 1 } < { baz > 1 || < 1 } < { baz != 1 }
 #
 rule "Optimise restrictions inside operator"
@@ -129,6 +130,7 @@
 # component was on the left side.
 # 
 # Type: Note
+# Dependencies: None
 # Example: { a:bar } < { baz == 1 } < { baz > 1 || < 1 } < { baz != 1 }
 #
 rule "Optimise restrictions inside constraint"
@@ -187,6 +189,7 @@
 # AnalyticsPredicateDescr should be last.
 # 
 # Type: Note
+# Dependencies: None
 # Example: Foo( eval( bar == 1), bar == 1 ) 
 #
 rule "Optimise predicates inside operator"

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Clean.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Clean.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Clean.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -13,6 +13,30 @@
 global AnalyticsResult result;
 
 #
+# Merges existing gaps from working memory. Cleans out the data for actual reporting.
+#
+# Type: None
+# Depandencies: Needs at least one of the following packages or rules to fire.
+#
+# 		package org.drools.analytics.rangeChecks.patterns;
+#			rule "Range check for number patterns"
+#			rule "Range check for number patterns, !="
+#		package org.drools.analytics.rangeChecks.integers
+#			rule "Range check for integers, if smaller than or equal is missing"
+#			rule "Range check for integers, if greater than or equal is missing"
+#			rule "Range check for integers, equal and greater than"
+#			rule "Range check for integers, equal and smaller than"
+#		package org.drools.analytics.rangeChecks.doubles
+#			rule "Range check for doubles, if smaller than or equal is missing"
+#			rule "Range check for doubles, if greater than or equal is missing"
+#			rule "Range check for doubles, equal and greater than"
+#			rule "Range check for doubles, equal and smaller than"
+#		package org.drools.analytics.rangeChecks.dates
+#			rule "Range check for dates, if smaller than or equal is missing"
+#			rule "Range check for dates, if greater than or equal is missing"
+#			rule "Range check for dates, equal and greater than"
+#			rule "Range check for dates, equal and smaller than"
+#
 # Example: missing ( x >= 10 ) and ( x <= 10 ). This is the same as ( x == 10 )
 #
 rule "Merge gaps"
@@ -43,8 +67,19 @@
 end
 
 #
+# Removes existing gaps from working memory. Cleans out the data for actual reporting.
+#
+# Type: None
+# Depandencies: Needs at least one of the following packages or rules to fire.
+#
+#		package org.drools.analytics.rangeChecks.integers
+#			rule "Range check for integers, if smaller than or equal is missing"
+#			rule "Range check for integers, if greater than or equal is missing"
+#			rule "Range check for integers, equal and greater than"
+#			rule "Range check for integers, equal and smaller than"
+#
 # Example: covered ( x > 10 ), ( x > 70 ) ( x < 100 )and ( x == 50 )
-# reports that ( x < 50 ), ( x > 50 ) and ( x <= 70 ) is missing.
+# 			reports that ( x < 50 ), ( x > 50 ) and ( x <= 70 ) is missing.
 #
 rule "Remove useless integer gaps lesser or lesser and equal"
 	when
@@ -84,8 +119,19 @@
 end
 
 #
+# Removes existing gaps from working memory. Cleans out the data for actual reporting.
+#
+# Type: None
+# Depandencies: Needs at least one of the following packages or rules to fire.
+#
+#		package org.drools.analytics.rangeChecks.integers
+#			rule "Range check for integers, if smaller than or equal is missing"
+#			rule "Range check for integers, if greater than or equal is missing"
+#			rule "Range check for integers, equal and greater than"
+#			rule "Range check for integers, equal and smaller than"
+#
 # Example: covered ( x > 10 ), ( x < 70 ) ( x < 100 )and ( x == 50 )
-# reports that ( x < 50 ), ( x > 50 ) and ( x >= 70 ) is missing.
+#			reports that ( x < 50 ), ( x > 50 ) and ( x >= 70 ) is missing.
 #
 rule "Remove useless integer gaps greater or greater and equal"
 	when
@@ -125,8 +171,19 @@
 end
 
 #
+# Removes existing gaps from working memory. Cleans out the data for actual reporting.
+#
+# Type: None
+# Depandencies: Needs at least one of the following packages or rules to fire.
+#
+#		package org.drools.analytics.rangeChecks.doubles
+#			rule "Range check for doubles, if smaller than or equal is missing"
+#			rule "Range check for doubles, if greater than or equal is missing"
+#			rule "Range check for doubles, equal and greater than"
+#			rule "Range check for doubles, equal and smaller than"
+#
 # Example: covered ( x > 10.0 ), ( x > 70.0 ) ( x < 100.0 )and ( x == 50.0 )
-# reports that ( x < 50.0 ), ( x > 50.0 ) and ( x <= 70.0 ) is missing.
+# 			reports that ( x < 50.0 ), ( x > 50.0 ) and ( x <= 70.0 ) is missing.
 #
 rule "Remove useless double gaps lesser or lesser and equal"
 	when
@@ -166,6 +223,17 @@
 end
 
 #
+# Removes existing gaps from working memory. Cleans out the data for actual reporting.
+#
+# Type: None
+# Depandencies: Needs at least one of the following packages or rules to fire.
+#
+#		package org.drools.analytics.rangeChecks.doubles
+#			rule "Range check for doubles, if smaller than or equal is missing"
+#			rule "Range check for doubles, if greater than or equal is missing"
+#			rule "Range check for doubles, equal and greater than"
+#			rule "Range check for doubles, equal and smaller than"
+#
 # Example: covered ( x > 10.0 ), ( x < 70.0 ) ( x < 100.0 )and ( x == 50.0 )
 # reports that ( x < 50.0 ), ( x > 50.0 ) and ( x >= 70.0 ) is missing.
 #
@@ -207,6 +275,17 @@
 end
 
 #
+# Removes existing gaps from working memory. Cleans out the data for actual reporting.
+#
+# Type: None
+# Depandencies: Needs at least one of the following packages or rules to fire.
+#
+#		package org.drools.analytics.rangeChecks.dates
+#			rule "Range check for dates, if smaller than or equal is missing"
+#			rule "Range check for dates, if greater than or equal is missing"
+#			rule "Range check for dates, equal and greater than"
+#			rule "Range check for dates, equal and smaller than"
+#
 # Example: covered ( x > "01-Oct-2007" ), ( x > "15-Oct-2007" ) ( x < "20-Oct-2007" )and ( x == "10-Oct-2007" )
 # reports that ( x < "10-Oct-2007" ), ( x > "10-Oct-2007" ) and ( x <= "15-Oct-2007" ) is missing.
 #
@@ -248,6 +327,17 @@
 end
 
 #
+# Removes existing gaps from working memory. Cleans out the data for actual reporting.
+#
+# Type: None
+# Depandencies: Needs at least one of the following packages or rules to fire.
+#
+#		package org.drools.analytics.rangeChecks.dates
+#			rule "Range check for dates, if smaller than or equal is missing"
+#			rule "Range check for dates, if greater than or equal is missing"
+#			rule "Range check for dates, equal and greater than"
+#			rule "Range check for dates, equal and smaller than"
+#
 # Example: covered ( x > "01-Oct-2007" ), ( x < "15-Oct-2007" ) ( x < "20-Oct-2007" )and ( x == "10-Oct-2007" )
 # reports that ( x < "10-Oct-2007" ), ( x > "10-Oct-2007" ) and ( x >= "15-Oct-2007" ) is missing.
 #

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	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Dates.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -31,6 +31,7 @@
 # If all ranges are not checked for a field.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar > "27-Oct-2007" ) 
 #						and in Foo( <= "27-Oct-2007" || == "27-Oct-2007" ) is missing.
 #
@@ -63,6 +64,7 @@
 # If all ranges are not checked for a field.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar < "27-Oct-2007" ) 
 #						and in Foo( >= "27-Oct-2007" || == "27-Oct-2007" ) is missing.
 #
@@ -95,6 +97,7 @@
 # If all ranges are not checked for a field.
 #
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar == "27-Oct-2007" || bar <= "27-Oct-2007" ) 
 # 					and no Foo( bar > "27-Oct-2007" || >= "27-Oct-2007" || >= "28-Oct-2007" || == "28-Oct-2007" ) 
 #						then Foo( bar > "27-Oct-2007" ) is missing.
@@ -136,6 +139,7 @@
 # If all ranges are not checked for a field.
 #
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar == "27-Oct-2007" || bar >= "27-Oct-2007" ) 
 # 					and no Foo( bar < "27-Oct-2007" || <= "27-Oct-2007" || <= "26-Oct-2007" || == "26-Oct-2007" ) 
 #						then Foo( bar < "27-Oct-2007" ) is missing.

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Doubles.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Doubles.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Doubles.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -17,6 +17,7 @@
 # If all ranges are not checked for a field.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar > 42 ) 
 #						and in Foo( <= 42 || == 42 ) is missing.
 #
@@ -49,6 +50,7 @@
 # If all ranges are not checked for a field.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar < 42 ) 
 #						and in Foo( >= 42 || == 42 ) is missing.
 #
@@ -81,6 +83,7 @@
 # If all ranges are not checked for a field.
 #
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar == 42 || bar <= 42 ) 
 # 					and no Foo( bar > 42 || >= 42 || >= 43 || == 43 ) 
 #						then Foo( bar > 42 ) is missing.
@@ -114,6 +117,7 @@
 # If all ranges are not checked for a field.
 #
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar == 42 || bar >= 42 ) 
 # 					and no Foo( bar < 42 || <= 42 || <= 41 || == 41 ) 
 #						then Foo( bar < 42 ) is missing.

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Integers.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Integers.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Integers.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -14,6 +14,7 @@
 # If all ranges are not checked for a field.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar > 42 ) 
 #						and in Foo( <= 42 || == 42 ) is missing.
 #
@@ -46,6 +47,7 @@
 # If all ranges are not checked for a field.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar < 42 ) 
 #						and in Foo( >= 42 || == 42 ) is missing.
 #
@@ -78,6 +80,7 @@
 # If all ranges are not checked for a field.
 #
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar == 42 || bar <= 42 ) 
 # 					and no Foo( bar > 42 || >= 42 || >= 43 || == 43 ) 
 #						then Foo( bar > 42 ) is missing.
@@ -119,6 +122,7 @@
 # If all ranges are not checked for a field.
 #
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar == 42 || bar >= 42 ) 
 # 					and no Foo( bar < 42 || <= 42 || <= 41 || == 41 ) 
 #						then Foo( bar < 42 ) is missing.

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Patterns.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Patterns.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/rangeChecks/Patterns.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -22,6 +22,7 @@
 # If all pattern ranges are not checked for a field.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar == 10 ) and in "Rule 2" Foo( bar == 20 ) and in "Rule 3" Foo( bar == 40 )
 # 					then Foo( bar == 30 ) is missing.
 rule "Range check for number patterns"
@@ -62,6 +63,7 @@
 # If all pattern ranges are not checked for a field.
 # 
 # Type: Warning
+# Depandencies: None
 # Example: in "Rule 1" Foo( bar == 10 ) and in "Rule 2" Foo( bar == 20 ) and in "Rule 3" Foo( bar == 40 )
 # 					then Foo( bar == 30 ) is missing.
 rule "Range check for number patterns, !="

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Consequence.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Consequence.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Consequence.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -9,6 +9,9 @@
 
 
 
+#
+# Dependencies: None
+#
 rule "Find redundant TextConsequences"
 	when
 		# Check that AnalyticsRule $left and $right have redundant fields.
@@ -23,10 +26,6 @@
 			left == $left, 
 			right == $right 
 		)
-		not Redundancy( 
-			left == $right, 
-			right == $left 
-		)
 	then
 		insert( new Redundancy( Redundancy.RedundancyType.STRONG, $left, $right ) );
 end

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Notes.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Notes.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Notes.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -19,7 +19,14 @@
 import org.drools.analytics.report.components.Cause.CauseType;
 
 
-
+#
+# Dependencies: 
+#
+#	Needs at least one rule from following rules:
+#		package org.drools.analytics.redundancy.restrictions
+#			rule "Find redundant VariableRestriction"
+#			rule "Find redundant LiteralRestriction"
+#
 rule "Find redundant restrictions from pattern possibilities"
 	salience -100
 	when
@@ -41,6 +48,12 @@
 						$r, "Same restriction exists twice.", causes ) );
 end
 
+#
+# Dependencies: 
+#
+#		package org.drools.analytics.redundancy.possibilities
+#			rule "Find pattern possibility redundancy"
+#
 rule "Find redundant pattern possibilities from rule possibilities"
 	salience -100
 	when

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Patterns.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Patterns.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Patterns.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -8,6 +8,8 @@
 # Only checks for redundant pattern specifications, 
 # does not include actual restriction checks.
 #
+# Depandencies: None
+#
 rule "Find redundant Patterns with restrictions"
 	when
 		# Check that Patterns $left and $right have redundant fields.
@@ -45,6 +47,8 @@
 #
 # Checks for redundant pattern specifications when the patterns have no possibilities.
 #
+# Depandencies: None
+#
 rule "Find redundant Patterns without restrictions"
 	when
 		# Check that Patterns $left and $right have redundant fields.

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Possibilities.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Possibilities.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Possibilities.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -15,8 +15,18 @@
 # Fires when two PatternPossibilities are redundant.
 # Marks these possibilities as redundant.
 # 
+# Depandencies: Needs at least one rule from both packages.
+# 
+#		package org.drools.analytics.redundancy.patterns
+#			rule "Find redundant Patterns with restrictions"
+#			rule "Find redundant Patterns without restrictions"
+#		package org.drools.analytics.redundancy.restrictions
+#			rule "Find redundant VariableRestriction"
+#			rule "Find redundant LiteralRestriction"
+#
 # Example 1: Pattern1( a == b ) and Pattern1( a == b )
 # Example 2: Pattern1( a == b || a == c ) and Pattern1( a == b )
+#
 rule "Find pattern possibility redundancy"
 	when
 		$redundancy :Redundancy( 
@@ -90,8 +100,21 @@
 # Fires when two PatternPossibilities are redundant.
 # Marks these possibilities as redundant.
 # 
+# Depandencies: 
+#
+#	Needs at least one rule from these packages:
+#		package org.drools.analytics.equivalency.rules
+#			rule "Find equivalent Rules"
+#		package org.drools.analytics.redundancy.rules
+#			rule "Find redundant Rules, strong redundancy"
+#
+#	And this rule:
+#		package org.drools.analytics.redundancy.possibilities
+#			rule "Find pattern possibility redundancy"
+#
 # Example: rule "1" Pattern( a == b) end
 #		   rule "2" Pattern( a == b) end
+#
 rule "Find rule possibility redundancy"
 	when
 		$redundancy :Redundancy( 

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Restrictions.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Restrictions.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Restrictions.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -4,6 +4,9 @@
 import org.drools.analytics.components.*;
 import org.drools.analytics.report.components.Redundancy;
 
+#
+# Depandencies: None
+#
 rule "Find redundant VariableRestriction"
 	when
 		# Check that Restrictions $left and $right have redundant fields.
@@ -27,7 +30,9 @@
 		insert( new Redundancy( Redundancy.RedundancyType.STRONG, $left, $right ) );
 end
 
-
+#
+# Depandencies: None
+#
 rule "Find redundant LiteralRestriction"
 	when
 		# Check that Restrictions $left and $right have redundant fields.

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Rules.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Rules.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Rules.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -8,6 +8,11 @@
 # Only checks for redundant rule specifications, 
 # does not include actual pattern and restriction checks.
 #
+# Depandencies:
+#
+#		package org.drools.analytics.redundancy.consequences
+#			rule "Find redundant TextConsequences"
+#
 rule "Find redundant Rules, strong redundancy"
 	when
 		# Check that AnalyticsRule $left and $right have redundant fields.
@@ -27,10 +32,6 @@
 			left == $left, 
 			right == $right 
 		)
-		#not Redundancy( 
-		#	left == $right, 
-		#	right == $left 
-		#)
 	then
 		insert( new Redundancy( Redundancy.RedundancyType.STRONG, $left, $right ) );
 end

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Warnings.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Warnings.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/redundancy/Warnings.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -17,7 +17,19 @@
 import org.drools.analytics.report.components.Cause;
 import org.drools.analytics.report.components.Cause.CauseType;
 
-
+#
+# Dependencies: 
+#
+#	Needs at least one rule from these packages:
+#		package org.drools.analytics.equivalency.rules
+#			rule "Find equivalent Rules"
+#		package org.drools.analytics.redundancy.rules
+#			rule "Find redundant Rules, strong redundancy"
+#
+#	And this rule:
+#		package org.drools.analytics.redundancy.possibilities
+#			rule "Find rule possibility redundancy"
+#
 rule "Find redundant rule possibilities from different rules"
 	salience -100
 	when
@@ -64,6 +76,19 @@
 						$rulePossibilityRedundancy, message, causes ) );
 end
 
+#
+# Dependencies: 
+#
+#	Needs at least one rule from these packages:
+#		package org.drools.analytics.equivalency.rules
+#			rule "Find equivalent Rules"
+#		package org.drools.analytics.redundancy.rules
+#			rule "Find redundant Rules, strong redundancy"
+#
+#	And this rule:
+#		package org.drools.analytics.redundancy.possibilities
+#			rule "Find rule possibility redundancy"
+#
 rule "Find subsumptant rule possibilities from different rules"
 	salience -100
 	when

Modified: labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/reports/RangeCheckReports.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/reports/RangeCheckReports.drl	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/analytics/reports/RangeCheckReports.drl	2007-12-27 15:55:22 UTC (rev 17412)
@@ -12,6 +12,41 @@
 #declare any global variables here
 global AnalyticsResult result
 
+
+#
+# Dependencies: 
+#
+#	Needs at least one of the following packages or rules to fire:
+# 		package org.drools.analytics.rangeChecks.patterns;
+#			rule "Range check for number patterns"
+#			rule "Range check for number patterns, !="
+#		package org.drools.analytics.rangeChecks.integers
+#			rule "Range check for integers, if smaller than or equal is missing"
+#			rule "Range check for integers, if greater than or equal is missing"
+#			rule "Range check for integers, equal and greater than"
+#			rule "Range check for integers, equal and smaller than"
+#		package org.drools.analytics.rangeChecks.doubles
+#			rule "Range check for doubles, if smaller than or equal is missing"
+#			rule "Range check for doubles, if greater than or equal is missing"
+#			rule "Range check for doubles, equal and greater than"
+#			rule "Range check for doubles, equal and smaller than"
+#		package org.drools.analytics.rangeChecks.dates
+#			rule "Range check for dates, if smaller than or equal is missing"
+#			rule "Range check for dates, if greater than or equal is missing"
+#			rule "Range check for dates, equal and greater than"
+#			rule "Range check for dates, equal and smaller than"
+#
+#	The following rules are used to clean up the data that this rule uses, 
+#	but they are not always necessary:
+#		package org.drools.analytics.rangeChecks.cleanUp
+#			rule "Merge gaps"
+#			rule "Remove useless integer gaps lesser or lesser and equal"
+#			rule "Remove useless integer gaps greater or greater and equal"
+#			rule "Remove useless double gaps lesser or lesser and equal"
+#			rule "Remove useless double gaps greater or greater and equal"
+#			rule "Remove useless date gaps lesser or lesser and equal"
+#			rule "Remove useless date gaps greater or greater and equal"
+#
 rule "Collect gaps"
 	salience -100
 	when

Modified: labs/jbossrules/trunk/drools-analytics/src/test/java/org/drools/analytics/redundancy/RedundantConsequencesTest.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/test/java/org/drools/analytics/redundancy/RedundantConsequencesTest.java	2007-12-27 12:14:05 UTC (rev 17411)
+++ labs/jbossrules/trunk/drools-analytics/src/test/java/org/drools/analytics/redundancy/RedundantConsequencesTest.java	2007-12-27 15:55:22 UTC (rev 17412)
@@ -33,19 +33,19 @@
 				.iterateObjects());
 
 		assertTrue(TestBase.mapContains(map, "Redundant consiquence 1a",
-				"Redundant consiquence 1b")
-				^ TestBase.mapContains(map, "Redundant consiquence 1b",
-						"Redundant consiquence 1a"));
+				"Redundant consiquence 1b"));
+		assertTrue(TestBase.mapContains(map, "Redundant consiquence 1b",
+				"Redundant consiquence 1a"));
 
 		assertTrue(TestBase.mapContains(map, "Redundant consiquence 2a",
-				"Redundant consiquence 2b")
-				^ TestBase.mapContains(map, "Redundant consiquence 2b",
-						"Redundant consiquence 2a"));
+				"Redundant consiquence 2b"));
+		assertTrue(TestBase.mapContains(map, "Redundant consiquence 2b",
+				"Redundant consiquence 2a"));
 
 		assertTrue(TestBase.mapContains(map, "Redundant consiquence 3a",
-				"Redundant consiquence 3b")
-				^ TestBase.mapContains(map, "Redundant consiquence 3b",
-						"Redundant consiquence 3a"));
+				"Redundant consiquence 3b"));
+		assertTrue(TestBase.mapContains(map, "Redundant consiquence 3b",
+				"Redundant consiquence 3a"));
 
 		if (!map.isEmpty()) {
 			fail("More redundancies than was expected.");




More information about the jboss-svn-commits mailing list