[jboss-svn-commits] JBL Code SVN: r20394 - in labs/jbossrules/trunk: drools-verifier/src/main/java/org/drools/verifier and 6 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Jun 10 05:45:04 EDT 2008


Author: Rikkola
Date: 2008-06-10 05:45:04 -0400 (Tue, 10 Jun 2008)
New Revision: 20394

Added:
   labs/jbossrules/trunk/drools-verifier/
Removed:
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Analyzer.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsAccessorDescr.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsAccumulateDescr.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsClass.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsCollectDescr.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsComponent.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsComponentType.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsEvalDescr.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsFieldAccessDescr.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsFromDescr.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsFunctionCallDescr.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsMethodAccessDescr.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsPredicateDescr.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsRule.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsData.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsDataMaps.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsResult.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsResultFactory.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsResultNormal.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/components/AnalyticsMessage.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/components/AnalyticsMessageBase.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/components/AnalyticsRangeCheckMessage.java
   labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/AnalyticsMessagesVisitor.java
   labs/jbossrules/trunk/drools-verifier/src/main/resources/org/drools/verifier/rangeChecks/Patterns.drl
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/AnalyticsTestStandalone.java
   labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/AnalyzerTest.java
Log:
JBRULES-1555: Change project name from analytics to verifier

Copied: labs/jbossrules/trunk/drools-verifier (from rev 20250, labs/jbossrules/trunk/drools-analytics)

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Analyzer.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/Analyzer.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/Analyzer.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,132 +0,0 @@
-package org.drools.verifier;
-
-import java.util.Collection;
-
-import org.drools.RuleBase;
-import org.drools.RuleBaseFactory;
-import org.drools.WorkingMemory;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.rule.Package;
-import org.drools.verifier.dao.AnalyticsResult;
-import org.drools.verifier.dao.AnalyticsResultFactory;
-import org.drools.verifier.report.ReportModeller;
-import org.drools.verifier.report.html.ComponentsReportModeller;
-
-/**
- * This is the main user class for verifier.
- * This will use rules to validate rules, caching the "knowledge base" of verifier rules.
- *
- * @author Toni Rikkola
- */
-public class Analyzer {
-
-	static RuleBase verifierKnowledgeBase;
-
-
-	private AnalyticsResult result = AnalyticsResultFactory
-			.createAnalyticsResult();
-
-	public void addPackageDescr(PackageDescr descr) {
-		try {
-
-			PackageDescrFlattener ruleFlattener = new PackageDescrFlattener();
-
-			ruleFlattener.addPackageDescrToData(descr, result
-					.getAnalyticsData());
-
-		} catch (Throwable t) {
-			t.printStackTrace();
-		}
-	}
-
-
-	/**
-	 * As the analyzer uses rules itself, this will reload the knowledge base.
-	 * @throws Exception
-	 */
-	public synchronized void reloadAnalysisKnowledgeBase() throws Exception {
-		verifierKnowledgeBase = createRuleBase();
-	}
-
-	/**
-	 * This will run the verifier.
-	 */
-	public void fireAnalysis() {
-		try {
-
-			if (this.verifierKnowledgeBase == null) {
-				synchronized (this.getClass()) {
-					verifierKnowledgeBase = createRuleBase();
-				}
-			}
-
-			WorkingMemory workingMemory = verifierKnowledgeBase.newStatefulSession();
-
-			Collection<? extends Object> c = result.getAnalyticsData().getAll();
-
-			for (Object o : c) {
-				workingMemory.insert(o);
-			}
-
-			// Object that returns the results.
-			workingMemory.setGlobal("result", result);
-			workingMemory.fireAllRules();
-
-		} catch (Throwable t) {
-			t.printStackTrace();
-		}
-	}
-
-	/**
-	 * Returns the verifier results as plain text.
-	 *
-	 * @return Analysis results as plain text.
-	 */
-	public String getResultAsPlainText() {
-		return ReportModeller.writePlainText(result);
-	}
-
-	/**
-	 * Returns the verifier results as XML.
-	 *
-	 * @return Analysis results as XML
-	 */
-	public String getResultAsXML() {
-		return ReportModeller.writeXML(result);
-	}
-
-	/**
-	 * Returns the verifier results as HTML.
-	 *
-	 * @return Analysis results as HTML
-	 */
-	public void writeComponentsHTML(String path) {
-		ComponentsReportModeller.writeHTML(path, result);
-	}
-
-	/**
-	 * Returns the verifier results as <code>AnalysisResult</code> object.
-	 *
-	 * @return Analysis result
-	 */
-	public AnalyticsResult getResult() {
-		return result;
-	}
-
-	private static RuleBase createRuleBase() throws Exception {
-
-		RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-
-		Collection<Package> packages = RuleLoader.loadPackages();
-		for (Package pkg : packages) {
-			try {
-				ruleBase.addPackage(pkg);
-			} catch (Exception e) {
-				throw new Exception("Adding package " + pkg.getName()
-						+ " caused an error.", e);
-			}
-		}
-
-		return ruleBase;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsAccessorDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsAccessorDescr.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsAccessorDescr.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,19 +0,0 @@
-package org.drools.verifier.components;
-
-/**
- * 
- * @author Toni Rikkola
- */
-public class AnalyticsAccessorDescr extends AnalyticsComponent {
-
-	private static int index = 0;
-
-	public AnalyticsAccessorDescr() {
-		super(index++);
-	}
-
-	@Override
-	public AnalyticsComponentType getComponentType() {
-		return AnalyticsComponentType.ACCESSOR;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsAccumulateDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsAccumulateDescr.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsAccumulateDescr.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,111 +0,0 @@
-package org.drools.verifier.components;
-
-
-/**
- * 
- * @author Toni Rikkola
- */
-public class AnalyticsAccumulateDescr extends AnalyticsComponent {
-
-	private static int index = 0;
-
-	private int inputPatternId;
-	private String initCode;
-	private String actionCode;
-	private String reverseCode;
-	private String resultCode;
-	private String[] declarations;
-	private String className;
-	private boolean externalFunction = false;
-	private String functionIdentifier;
-	private String expression;
-
-	public AnalyticsAccumulateDescr() {
-		super(index++);
-	}
-
-	@Override
-	public AnalyticsComponentType getComponentType() {
-		return AnalyticsComponentType.ACCUMULATE;
-	}
-
-	public String getActionCode() {
-		return actionCode;
-	}
-
-	public void setActionCode(String actionCode) {
-		this.actionCode = actionCode;
-	}
-
-	public String getClassName() {
-		return className;
-	}
-
-	public void setClassName(String className) {
-		this.className = className;
-	}
-
-	public String[] getDeclarations() {
-		return declarations;
-	}
-
-	public void setDeclarations(String[] declarations) {
-		this.declarations = declarations;
-	}
-
-	public String getExpression() {
-		return expression;
-	}
-
-	public void setExpression(String expression) {
-		this.expression = expression;
-	}
-
-	public boolean isExternalFunction() {
-		return externalFunction;
-	}
-
-	public void setExternalFunction(boolean externalFunction) {
-		this.externalFunction = externalFunction;
-	}
-
-	public String getFunctionIdentifier() {
-		return functionIdentifier;
-	}
-
-	public void setFunctionIdentifier(String functionIdentifier) {
-		this.functionIdentifier = functionIdentifier;
-	}
-
-	public String getInitCode() {
-		return initCode;
-	}
-
-	public void setInitCode(String initCode) {
-		this.initCode = initCode;
-	}
-
-	public int getInputPatternId() {
-		return inputPatternId;
-	}
-
-	public void setInputPatternId(int inputPatternId) {
-		this.inputPatternId = inputPatternId;
-	}
-
-	public String getResultCode() {
-		return resultCode;
-	}
-
-	public void setResultCode(String resultCode) {
-		this.resultCode = resultCode;
-	}
-
-	public String getReverseCode() {
-		return reverseCode;
-	}
-
-	public void setReverseCode(String reverseCode) {
-		this.reverseCode = reverseCode;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsClass.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsClass.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsClass.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,50 +0,0 @@
-package org.drools.verifier.components;
-
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Set;
-
-/**
- * @author Toni Rikkola
- * 
- */
-public class AnalyticsClass implements Serializable {
-	private static final long serialVersionUID = -783733402566313623L;
-
-	private static int index = 0;
-
-	private int id = index++;
-	private int offset =0;
-	
-	private String name;
-
-	private Set<Field> fields = new HashSet<Field>();
-
-	public String getName() {
-		return name;
-	}
-	
-	public int getOffset(){ 
-	    return offset + id % 2;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public Set<Field> getFields() {
-		return fields;
-	}
-
-	public void setFields(Set<Field> fields) {
-		this.fields = fields;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsCollectDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsCollectDescr.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsCollectDescr.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,38 +0,0 @@
-package org.drools.verifier.components;
-
-/**
- * 
- * @author Toni Rikkola
- */
-public class AnalyticsCollectDescr extends AnalyticsComponent {
-
-	private static int index = 0;
-
-	private int insidePatternId;
-	private String classMethodName;
-
-	@Override
-	public AnalyticsComponentType getComponentType() {
-		return AnalyticsComponentType.COLLECT;
-	}
-
-	public int getInsidePatternId() {
-		return insidePatternId;
-	}
-
-	public void setInsidePatternId(int insidePatternId) {
-		this.insidePatternId = insidePatternId;
-	}
-
-	public String getClassMethodName() {
-		return classMethodName;
-	}
-
-	public void setClassMethodName(String classMethodName) {
-		this.classMethodName = classMethodName;
-	}
-
-	public AnalyticsCollectDescr() {
-		super(index++);
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsComponent.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsComponent.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsComponent.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,68 +0,0 @@
-package org.drools.verifier.components;
-
-/**
- * 
- * @author Toni Rikkola
- */
-public abstract class AnalyticsComponent implements
-		Comparable<AnalyticsComponent> {
-
-	protected String ruleName;
-	protected int ruleId;
-	protected int id;
-
-	protected AnalyticsComponent parent;
-	
-	// Order number of this instance under parent.
-	protected int orderNumber = 0; 
-
-	public abstract AnalyticsComponentType getComponentType();
-
-	public int compareTo(AnalyticsComponent o) {
-		if (id == o.getId()) {
-			return 0;
-		}
-
-		return (id > o.getId() ? 1 : -1);
-	}
-
-	public AnalyticsComponent(int id) {
-		this.id = id;
-	}
-
-	public int getId() {
-		return id;
-	}
-
-	public String getRuleName() {
-		return ruleName;
-	}
-
-	public void setRuleName(String ruleName) {
-		this.ruleName = ruleName;
-	}
-
-	public AnalyticsComponent getParent() {
-		return parent;
-	}
-
-	public void setParent(AnalyticsComponent parent) {
-		this.parent = parent;
-	}
-
-	public int getOrderNumber() {
-		return orderNumber;
-	}
-
-	public void setOrderNumber(int orderNumber) {
-		this.orderNumber = orderNumber;
-	}
-
-	public int getRuleId() {
-		return ruleId;
-	}
-
-	public void setRuleId(int ruleId) {
-		this.ruleId = ruleId;
-	}
-}
\ No newline at end of file

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsComponentType.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsComponentType.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsComponentType.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,37 +0,0 @@
-package org.drools.verifier.components;
-
-/**
- * 
- * @author Toni Rikkola
- */
-public class AnalyticsComponentType{
-	public static final AnalyticsComponentType NOTHING = new AnalyticsComponentType(0);
-	public static final AnalyticsComponentType CLASS = new AnalyticsComponentType(1);
-	public static final AnalyticsComponentType FIELD = new AnalyticsComponentType(2);
-	public static final AnalyticsComponentType RULE = new AnalyticsComponentType(3);
-	public static final AnalyticsComponentType CONSTRAINT = new AnalyticsComponentType(4);
-	public static final AnalyticsComponentType VARIABLE = new AnalyticsComponentType(5);
-	public static final AnalyticsComponentType PATTERN = new AnalyticsComponentType(6);
-	public static final AnalyticsComponentType PATTERN_POSSIBILITY = new AnalyticsComponentType(7);
-	public static final AnalyticsComponentType RULE_POSSIBILITY = new AnalyticsComponentType(8);
-	public static final AnalyticsComponentType RESTRICTION =new AnalyticsComponentType(9);
-	public static final AnalyticsComponentType OPERATOR = new AnalyticsComponentType(10);
-	public static final AnalyticsComponentType FIELD_CLASS_LINK = new AnalyticsComponentType(11);
-	public static final AnalyticsComponentType COLLECT = new AnalyticsComponentType(12);
-	public static final AnalyticsComponentType ACCUMULATE = new AnalyticsComponentType(13);
-	public static final AnalyticsComponentType FROM = new AnalyticsComponentType(14);
-	public static final AnalyticsComponentType EVAL = new AnalyticsComponentType(15);
-	public static final AnalyticsComponentType PREDICATE = new AnalyticsComponentType(16);
-	public static final AnalyticsComponentType METHOD_ACCESSOR = new AnalyticsComponentType(17);
-	public static final AnalyticsComponentType FIELD_ACCESSOR = new AnalyticsComponentType(18);
-	public static final AnalyticsComponentType FUNCTION_CALL = new AnalyticsComponentType(19);
-	public static final AnalyticsComponentType ACCESSOR = new AnalyticsComponentType(20);
-	public static final AnalyticsComponentType RULE_PACKAGE = new AnalyticsComponentType(21);
-	public static final AnalyticsComponentType CONSEQUENCE = new AnalyticsComponentType(22);
-
-	private final int index;
-
-	private AnalyticsComponentType(int i) {
-		index = i;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsEvalDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsEvalDescr.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsEvalDescr.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,50 +0,0 @@
-package org.drools.verifier.components;
-
-import org.drools.verifier.report.components.Cause;
-import org.drools.verifier.report.components.CauseType;
-
-/**
- *
- * @author Toni Rikkola
- */
-public class AnalyticsEvalDescr extends AnalyticsComponent implements Cause {
-
-	private static int index = 0;
-
-	private String content;
-	private String classMethodName;
-
-	public AnalyticsEvalDescr() {
-		super(index++);
-	}
-
-	@Override
-	public AnalyticsComponentType getComponentType() {
-		return AnalyticsComponentType.EVAL;
-	}
-
-	public CauseType getCauseType() {
-		return CauseType.EVAL;
-	}
-
-	public String getClassMethodName() {
-		return classMethodName;
-	}
-
-	public void setClassMethodName(String classMethodName) {
-		this.classMethodName = classMethodName;
-	}
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	@Override
-	public String toString() {
-		return "Eval, content: " + content;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsFieldAccessDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsFieldAccessDescr.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsFieldAccessDescr.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,38 +0,0 @@
-package org.drools.verifier.components;
-
-/**
- * 
- * @author Toni Rikkola
- */
-public class AnalyticsFieldAccessDescr extends AnalyticsComponent {
-
-	private static int index = 0;
-
-	private String fieldName;
-	private String argument;
-
-	public AnalyticsFieldAccessDescr() {
-		super(index++);
-	}
-
-	@Override
-	public AnalyticsComponentType getComponentType() {
-		return AnalyticsComponentType.FIELD_ACCESSOR;
-	}
-
-	public String getArgument() {
-		return argument;
-	}
-
-	public void setArgument(String argument) {
-		this.argument = argument;
-	}
-
-	public String getFieldName() {
-		return fieldName;
-	}
-
-	public void setFieldName(String fieldName) {
-		this.fieldName = fieldName;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsFromDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsFromDescr.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsFromDescr.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,38 +0,0 @@
-package org.drools.verifier.components;
-
-/**
- * 
- * @author Toni Rikkola
- */
-public class AnalyticsFromDescr extends AnalyticsComponent {
-
-	private static int index = 0;
-
-	private AnalyticsComponentType dataSourceType;
-	private int dataSourceId;
-
-	public AnalyticsFromDescr() {
-		super(index++);
-	}
-
-	@Override
-	public AnalyticsComponentType getComponentType() {
-		return AnalyticsComponentType.FROM;
-	}
-
-	public int getDataSourceId() {
-		return dataSourceId;
-	}
-
-	public void setDataSourceId(int dataSourceId) {
-		this.dataSourceId = dataSourceId;
-	}
-
-	public AnalyticsComponentType getDataSourceType() {
-		return dataSourceType;
-	}
-
-	public void setDataSourceType(AnalyticsComponentType dataSourceType) {
-		this.dataSourceType = dataSourceType;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsFunctionCallDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsFunctionCallDescr.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsFunctionCallDescr.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,38 +0,0 @@
-package org.drools.verifier.components;
-
-/**
- * 
- * @author Toni Rikkola
- */
-public class AnalyticsFunctionCallDescr extends AnalyticsComponent {
-
-	private static int index = 0;
-
-	private String name;
-	private String arguments;
-
-	public AnalyticsFunctionCallDescr() {
-		super(index++);
-	}
-
-	@Override
-	public AnalyticsComponentType getComponentType() {
-		return AnalyticsComponentType.FUNCTION_CALL;
-	}
-
-	public String getArguments() {
-		return arguments;
-	}
-
-	public void setArguments(String arguments) {
-		this.arguments = arguments;
-	}
-
-	public String getName() {
-		return name;
-	}
-
-	public void setName(String name) {
-		this.name = name;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsMethodAccessDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsMethodAccessDescr.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsMethodAccessDescr.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,38 +0,0 @@
-package org.drools.verifier.components;
-
-/**
- * 
- * @author Toni Rikkola
- */
-public class AnalyticsMethodAccessDescr extends AnalyticsComponent {
-
-	private static int index = 0;
-
-	private String methodName;
-	private String arguments;
-
-	public AnalyticsMethodAccessDescr() {
-		super(index++);
-	}
-
-	@Override
-	public AnalyticsComponentType getComponentType() {
-		return AnalyticsComponentType.METHOD_ACCESSOR;
-	}
-
-	public String getArguments() {
-		return arguments;
-	}
-
-	public void setArguments(String arguments) {
-		this.arguments = arguments;
-	}
-
-	public String getMethodName() {
-		return methodName;
-	}
-
-	public void setMethodName(String methodName) {
-		this.methodName = methodName;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsPredicateDescr.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsPredicateDescr.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsPredicateDescr.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,51 +0,0 @@
-package org.drools.verifier.components;
-
-import org.drools.verifier.report.components.Cause;
-import org.drools.verifier.report.components.CauseType;
-
-/**
- *
- * @author Toni Rikkola
- */
-public class AnalyticsPredicateDescr extends AnalyticsComponent implements
-		Cause {
-
-	private static int index = 0;
-
-	private String content;
-	private String classMethodName;
-
-	public AnalyticsPredicateDescr() {
-		super(index++);
-	}
-
-	@Override
-	public AnalyticsComponentType getComponentType() {
-		return AnalyticsComponentType.PREDICATE;
-	}
-
-	public CauseType getCauseType() {
-		return CauseType.PREDICATE;
-	}
-
-	public String getClassMethodName() {
-		return classMethodName;
-	}
-
-	public void setClassMethodName(String classMethodName) {
-		this.classMethodName = classMethodName;
-	}
-
-	public String getContent() {
-		return content;
-	}
-
-	public void setContent(String content) {
-		this.content = content;
-	}
-
-	@Override
-	public String toString() {
-		return "Predicate id: " + id + " content: " + content;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsRule.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/components/AnalyticsRule.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/components/AnalyticsRule.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,79 +0,0 @@
-package org.drools.verifier.components;
-
-import org.drools.verifier.report.components.Cause;
-import org.drools.verifier.report.components.CauseType;
-
-/**
- *
- * @author Toni Rikkola
- */
-public class AnalyticsRule extends AnalyticsComponent implements Cause {
-
-	private static int index = 0;
-
-	private String ruleSalience;
-	private String ruleAgendaGroup;
-	private Consequence consequence;
-	private int lineNumber;
-
-	private int packageId;
-
-	public AnalyticsRule() {
-		super(index++);
-		ruleId = index;
-	}
-
-	@Override
-	public AnalyticsComponentType getComponentType() {
-		return AnalyticsComponentType.RULE;
-	}
-
-	public CauseType getCauseType() {
-		return CauseType.RULE;
-	}
-
-	public String getRuleAgendaGroup() {
-		return ruleAgendaGroup;
-	}
-
-	public void setRuleAgendaGroup(String agendaGroup) {
-		this.ruleAgendaGroup = agendaGroup;
-	}
-
-	public String getRuleSalience() {
-		return ruleSalience;
-	}
-
-	public void setRuleSalience(String salience) {
-		this.ruleSalience = salience;
-	}
-
-	public Consequence getConsequence() {
-		return consequence;
-	}
-
-	public void setConsequence(Consequence consequence) {
-		this.consequence = consequence;
-	}
-
-	public int getLineNumber() {
-		return lineNumber;
-	}
-
-	public void setLineNumber(int lineNumber) {
-		this.lineNumber = lineNumber;
-	}
-
-	@Override
-	public String toString() {
-		return "Rule '" + ruleName + "'";
-	}
-
-	public int getPackageId() {
-		return packageId;
-	}
-
-	public void setPackageId(int packageId) {
-		this.packageId = packageId;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsData.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/dao/AnalyticsData.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsData.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,89 +0,0 @@
-package org.drools.verifier.dao;
-
-import java.util.Collection;
-
-import org.drools.verifier.components.AnalyticsClass;
-import org.drools.verifier.components.AnalyticsEvalDescr;
-import org.drools.verifier.components.AnalyticsPredicateDescr;
-import org.drools.verifier.components.AnalyticsRule;
-import org.drools.verifier.components.Consequence;
-import org.drools.verifier.components.Constraint;
-import org.drools.verifier.components.Field;
-import org.drools.verifier.components.FieldClassLink;
-import org.drools.verifier.components.OperatorDescr;
-import org.drools.verifier.components.Pattern;
-import org.drools.verifier.components.PatternPossibility;
-import org.drools.verifier.components.Restriction;
-import org.drools.verifier.components.RulePackage;
-import org.drools.verifier.components.RulePossibility;
-import org.drools.verifier.components.Variable;
-
-/**
- * 
- * @author Toni Rikkola
- */
-public interface AnalyticsData {
-
-	public void add(Consequence consequence);
-
-	public void add(AnalyticsClass clazz);
-
-	public void add(Field field);
-
-	public void add(Variable variable);
-
-	public void add(AnalyticsRule rule);
-
-	public void add(Pattern pattern);
-
-	public void add(Constraint constraint);
-
-	public void add(Restriction restriction);
-
-	public void add(FieldClassLink link);
-
-	public void add(PatternPossibility possibility);
-
-	public void add(RulePossibility possibility);
-
-	public void add(RulePackage rulePackage);
-
-	public AnalyticsClass getClassByPackageAndName(String name);
-
-	public AnalyticsClass getClassById(int id);
-
-	public Field getFieldByClassAndFieldName(String className, String fieldName);
-
-	public Variable getVariableByRuleAndVariableName(String ruleName,
-			String variableName);
-
-	public Collection<? extends Object> getAll();
-
-	public FieldClassLink getFieldClassLink(int id, int id2);
-
-	public Collection<AnalyticsRule> getAllRules();
-
-	public Collection<AnalyticsClass> getClassesByRuleName(String ruleName);
-
-	public Collection<AnalyticsClass> getAllClasses();
-
-	public Collection<RulePackage> getAllRulePackages();
-
-	public Collection<Field> getFieldsByClassId(int id);
-
-	public Collection<AnalyticsRule> getRulesByClassId(int id);
-
-	public Collection<Field> getAllFields();
-
-	public Collection<AnalyticsRule> getRulesByFieldId(int id);
-
-	public RulePackage getRulePackageByName(String name);
-
-	public Collection<Restriction> getRestrictionsByFieldId(int id);
-
-	public void add(OperatorDescr operatorDescr);
-
-	public void add(AnalyticsEvalDescr eval);
-
-	public void add(AnalyticsPredicateDescr predicate);
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsDataMaps.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/dao/AnalyticsDataMaps.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsDataMaps.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,241 +0,0 @@
-package org.drools.verifier.dao;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
-import java.util.TreeMap;
-
-import org.drools.verifier.components.AnalyticsClass;
-import org.drools.verifier.components.AnalyticsEvalDescr;
-import org.drools.verifier.components.AnalyticsPredicateDescr;
-import org.drools.verifier.components.AnalyticsRule;
-import org.drools.verifier.components.Consequence;
-import org.drools.verifier.components.Constraint;
-import org.drools.verifier.components.Field;
-import org.drools.verifier.components.FieldClassLink;
-import org.drools.verifier.components.OperatorDescr;
-import org.drools.verifier.components.Pattern;
-import org.drools.verifier.components.PatternPossibility;
-import org.drools.verifier.components.Restriction;
-import org.drools.verifier.components.RulePackage;
-import org.drools.verifier.components.RulePossibility;
-import org.drools.verifier.components.Variable;
-
-/**
- * 
- * @author Toni Rikkola
- */
-class AnalyticsDataMaps implements AnalyticsData {
-
-	private Map<Integer, RulePackage> packagesById = new TreeMap<Integer, RulePackage>();
-	private Map<String, RulePackage> packagesByName = new TreeMap<String, RulePackage>();
-
-	private Map<Integer, AnalyticsClass> classesById = new TreeMap<Integer, AnalyticsClass>();
-	private Map<String, AnalyticsClass> classesByName = new TreeMap<String, AnalyticsClass>();
-	private Map<String, Field> fieldsByClassAndFieldName = new TreeMap<String, Field>();
-	private Map<Integer, Field> fieldsById = new TreeMap<Integer, Field>();
-	private DataTree<Integer, Field> fieldsByClassId = new DataTree<Integer, Field>();
-	private Map<String, FieldClassLink> fieldClassLinkByIds = new TreeMap<String, FieldClassLink>();
-
-	private Map<Integer, AnalyticsRule> rulesById = new TreeMap<Integer, AnalyticsRule>();
-	private Map<Integer, Pattern> patternsById = new TreeMap<Integer, Pattern>();
-	private DataTree<Integer, Pattern> patternsByClassId = new DataTree<Integer, Pattern>();
-	private DataTree<String, Pattern> patternsByRuleName = new DataTree<String, Pattern>();
-	private Map<Integer, Constraint> constraintsById = new TreeMap<Integer, Constraint>();
-	private Map<Integer, Restriction> restrictionsById = new TreeMap<Integer, Restriction>();
-	private DataTree<Integer, Restriction> restrictionsByFieldId = new DataTree<Integer, Restriction>();
-	private Map<Integer, OperatorDescr> operatorsById = new TreeMap<Integer, OperatorDescr>();
-	private Map<Integer, AnalyticsEvalDescr> evalsById = new TreeMap<Integer, AnalyticsEvalDescr>();
-	private Map<Integer, AnalyticsPredicateDescr> predicatesById = new TreeMap<Integer, AnalyticsPredicateDescr>();
-	private Map<Integer, Consequence> consiquencesById = new TreeMap<Integer, Consequence>();
-
-	private Map<String, Variable> variablesByRuleAndVariableName = new TreeMap<String, Variable>();
-
-	private Map<Integer, PatternPossibility> patternPossibilitiesById = new TreeMap<Integer, PatternPossibility>();
-	private Map<Integer, RulePossibility> rulePossibilitiesById = new TreeMap<Integer, RulePossibility>();
-
-	public void add(AnalyticsClass clazz) {
-		classesById.put(Integer.valueOf(clazz.getId()), clazz);
-		classesByName.put(clazz.getName(), clazz);
-	}
-
-	public void add(Field field) {
-		AnalyticsClass clazz = classesById.get(Integer.valueOf(field
-				.getClassId()));
-		fieldsByClassAndFieldName.put(clazz.getName() + "." + field.getName(),
-				field);
-
-		fieldsById.put(field.getId(), field);
-
-		fieldsByClassId.put(field.getClassId(), field);
-	}
-
-	public void add(Variable variable) {
-		variablesByRuleAndVariableName.put(variable.getRuleName() + "."
-				+ variable.getName(), variable);
-	}
-
-	public void add(AnalyticsRule rule) {
-		rulesById.put(Integer.valueOf(rule.getId()), rule);
-	}
-
-	public void add(Pattern pattern) {
-		patternsById.put(Integer.valueOf(pattern.getId()), pattern);
-
-		patternsByClassId.put(pattern.getClassId(), pattern);
-		patternsByRuleName.put(pattern.getRuleName(), pattern);
-	}
-
-	public void add(Constraint constraint) {
-		constraintsById.put(Integer.valueOf(constraint.getId()), constraint);
-	}
-
-	public void add(Restriction restriction) {
-		restrictionsById.put(restriction.getId(), restriction);
-
-		restrictionsByFieldId.put(restriction.getFieldId(), restriction);
-	}
-
-	public void add(FieldClassLink link) {
-		fieldClassLinkByIds.put(link.getFieldId() + "." + link.getClassId(),
-				link);
-	}
-
-	public AnalyticsClass getClassByPackageAndName(String name) {
-		return classesByName.get(name);
-	}
-
-	public Field getFieldByClassAndFieldName(String className, String fieldName) {
-		return fieldsByClassAndFieldName.get(className + "." + fieldName);
-	}
-
-	public Variable getVariableByRuleAndVariableName(String ruleName,
-			String variableName) {
-		return variablesByRuleAndVariableName
-				.get(ruleName + "." + variableName);
-	}
-
-	public FieldClassLink getFieldClassLink(int id, int id2) {
-		return fieldClassLinkByIds.get(id + "." + id2);
-	}
-
-	public Collection<AnalyticsRule> getAllRules() {
-		return rulesById.values();
-	}
-
-	public void add(PatternPossibility possibility) {
-		patternPossibilitiesById.put(possibility.getId(), possibility);
-	}
-
-	public void add(RulePossibility possibility) {
-		rulePossibilitiesById.put(possibility.getId(), possibility);
-	}
-
-	public Collection<AnalyticsClass> getClassesByRuleName(String ruleName) {
-		Set<AnalyticsClass> set = new HashSet<AnalyticsClass>();
-
-		for (Pattern pattern : patternsByRuleName.getBranch(ruleName)) {
-			AnalyticsClass clazz = getClassById(pattern.getClassId());
-			set.add(clazz);
-		}
-
-		return set;
-	}
-
-	public AnalyticsClass getClassById(int id) {
-		return classesById.get(id);
-	}
-
-	public Collection<? extends Object> getAll() {
-		List<Object> objects = new ArrayList<Object>();
-
-		objects.addAll(packagesById.values());
-
-		objects.addAll(rulesById.values());
-		objects.addAll(patternsById.values());
-		objects.addAll(constraintsById.values());
-		objects.addAll(restrictionsById.values());
-		objects.addAll(operatorsById.values());
-		objects.addAll(evalsById.values());
-		objects.addAll(predicatesById.values());
-		objects.addAll(consiquencesById.values());
-
-		objects.addAll(patternPossibilitiesById.values());
-		objects.addAll(rulePossibilitiesById.values());
-
-		objects.addAll(classesByName.values());
-		objects.addAll(fieldsByClassAndFieldName.values());
-		objects.addAll(variablesByRuleAndVariableName.values());
-
-		return objects;
-	}
-
-	public Collection<AnalyticsClass> getAllClasses() {
-		return classesById.values();
-	}
-
-	public Collection<Field> getFieldsByClassId(int id) {
-		return fieldsByClassId.getBranch(id);
-	}
-
-	public Collection<AnalyticsRule> getRulesByClassId(int id) {
-		Set<AnalyticsRule> rules = new HashSet<AnalyticsRule>();
-
-		for (Pattern pattern : patternsByClassId.getBranch(id)) {
-			rules.add(rulesById.get(pattern.getRuleId()));
-		}
-
-		return rules;
-	}
-
-	public Collection<Field> getAllFields() {
-		return fieldsById.values();
-	}
-
-	public Collection<AnalyticsRule> getRulesByFieldId(int id) {
-
-		Set<AnalyticsRule> rules = new HashSet<AnalyticsRule>();
-
-		for (Restriction restriction : restrictionsByFieldId.getBranch(id)) {
-			rules.add(rulesById.get(restriction.getRuleId()));
-		}
-
-		return rules;
-	}
-
-	public Collection<RulePackage> getAllRulePackages() {
-		return packagesById.values();
-	}
-
-	public void add(RulePackage rulePackage) {
-		packagesById.put(rulePackage.getId(), rulePackage);
-		packagesByName.put(rulePackage.getName(), rulePackage);
-	}
-
-	public RulePackage getRulePackageByName(String name) {
-		return packagesByName.get(name);
-	}
-
-	public Collection<Restriction> getRestrictionsByFieldId(int id) {
-		return restrictionsByFieldId.getBranch(id);
-	}
-
-	public void add(OperatorDescr operatorDescr) {
-		operatorsById.put(operatorDescr.getId(), operatorDescr);
-	}
-
-	public void add(AnalyticsEvalDescr eval) {
-		evalsById.put(eval.getId(), eval);
-	}
-
-	public void add(AnalyticsPredicateDescr predicate) {
-		predicatesById.put(predicate.getId(), predicate);
-	}
-
-	public void add(Consequence consequence) {
-		consiquencesById.put(consequence.getId(), consequence);
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsResult.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/dao/AnalyticsResult.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsResult.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,42 +0,0 @@
-package org.drools.verifier.dao;
-
-import java.util.Collection;
-
-import org.drools.verifier.report.components.AnalyticsMessageBase;
-import org.drools.verifier.report.components.Gap;
-import org.drools.verifier.report.components.MissingNumberPattern;
-import org.drools.verifier.report.components.RangeCheckCause;
-import org.drools.verifier.report.components.Severity;
-
-/**
- *
- * @author Toni Rikkola
- */
-public interface AnalyticsResult {
-
-	public void add(Gap gap);
-
-	public void remove(Gap gap);
-
-	public void add(MissingNumberPattern missingNumberPattern);
-
-	public AnalyticsData getAnalyticsData();
-
-	public Collection<RangeCheckCause> getRangeCheckCauses();
-
-	public Collection<RangeCheckCause> getRangeCheckCausesByFieldId(int id);
-
-	public Collection<Gap> getGapsByFieldId(int fieldId);
-
-	public void add(AnalyticsMessageBase note);
-
-	/**
-	 * Return all the items that have given severity value.
-	 *
-	 * @param severity
-	 *            Severity level of item.
-	 * @return Collection of items or an empty list if none was found.
-	 */
-	public Collection<AnalyticsMessageBase> getBySeverity(Severity severity);
-
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsResultFactory.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/dao/AnalyticsResultFactory.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsResultFactory.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,9 +0,0 @@
-package org.drools.verifier.dao;
-
-public class AnalyticsResultFactory {
-
-	public static AnalyticsResult createAnalyticsResult() {
-
-		return new AnalyticsResultNormal();
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsResultNormal.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/dao/AnalyticsResultNormal.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/dao/AnalyticsResultNormal.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,98 +0,0 @@
-package org.drools.verifier.dao;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Map;
-import java.util.TreeMap;
-
-import org.drools.verifier.report.components.AnalyticsMessageBase;
-import org.drools.verifier.report.components.Gap;
-import org.drools.verifier.report.components.MissingNumberPattern;
-import org.drools.verifier.report.components.RangeCheckCause;
-import org.drools.verifier.report.components.Severity;
-
-/**
- *
- * @author Toni Rikkola
- */
-class AnalyticsResultNormal implements AnalyticsResult {
-	private static final long serialVersionUID = -6207688526236713721L;
-
-	private Map<Integer, Gap> gapsById = new TreeMap<Integer, Gap>();
-	private DataTree<Integer, Gap> gapsByFieldId = new DataTree<Integer, Gap>();
-	private Map<Integer, MissingNumberPattern> missingNumberPatternsById = new TreeMap<Integer, MissingNumberPattern>();
-	private DataTree<Integer, MissingNumberPattern> missingNumberPatternsByFieldId = new DataTree<Integer, MissingNumberPattern>();
-
-	private List<AnalyticsMessageBase> messages = new ArrayList<AnalyticsMessageBase>();
-	private DataTree<Severity, AnalyticsMessageBase> messagesBySeverity = new DataTree<Severity, AnalyticsMessageBase>();
-
-	private AnalyticsData data = new AnalyticsDataMaps();
-
-	public void add(AnalyticsMessageBase message) {
-		messages.add(message);
-		messagesBySeverity.put(message.getSeverity(), message);
-	}
-
-	public Collection<AnalyticsMessageBase> getBySeverity(
-			Severity severity) {
-		Collection<AnalyticsMessageBase> result = messagesBySeverity
-				.getBranch(severity);
-
-		if (result == null) {
-			return Collections.emptyList();
-		} else {
-			return result;
-		}
-	}
-
-	public void add(Gap gap) {
-		gapsById.put(gap.getId(), gap);
-
-		// Put by field id.
-		gapsByFieldId.put(gap.getField().getId(), gap);
-	}
-
-	public void remove(Gap gap) {
-		gapsById.remove(gap.getId());
-
-		gapsByFieldId.remove(gap.getField().getId(), gap);
-	}
-
-	public Collection<Gap> getGapsByFieldId(int fieldId) {
-		return gapsByFieldId.getBranch(fieldId);
-	}
-
-	public Collection<RangeCheckCause> getRangeCheckCauses() {
-		Collection<RangeCheckCause> result = new ArrayList<RangeCheckCause>();
-
-		result.addAll(gapsById.values());
-		result.addAll(missingNumberPatternsById.values());
-
-		return result;
-	}
-
-	public void add(MissingNumberPattern missingNumberPattern) {
-		missingNumberPatternsById.put(missingNumberPattern.getId(),
-				missingNumberPattern);
-
-		// Put by field id.
-		missingNumberPatternsByFieldId.put(missingNumberPattern.getField()
-				.getId(), missingNumberPattern);
-	}
-
-	public Collection<RangeCheckCause> getRangeCheckCausesByFieldId(int id) {
-		Collection<RangeCheckCause> result = new ArrayList<RangeCheckCause>();
-
-		result.addAll(gapsByFieldId.getBranch(id));
-
-		result.addAll(missingNumberPatternsByFieldId.getBranch(id));
-
-		return result;
-	}
-
-	public AnalyticsData getAnalyticsData() {
-		return data;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/components/AnalyticsMessage.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/report/components/AnalyticsMessage.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/components/AnalyticsMessage.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,63 +0,0 @@
-package org.drools.verifier.report.components;
-
-import java.util.Collection;
-import java.util.Collections;
-
-/**
- * 
- * @author Toni Rikkola
- */
-public class AnalyticsMessage extends AnalyticsMessageBase {
-	private static final long serialVersionUID = 9190003495068712452L;
-
-	protected Collection<Cause> causes;
-
-	public AnalyticsMessage(Severity severity, MessageType messageType,
-			Cause faulty, String message, Collection<Cause> causes) {
-		super(severity, messageType, faulty, message);
-
-		this.causes = causes;
-	}
-
-	public AnalyticsMessage(Severity severity, MessageType messageType,
-			Cause faulty, String message) {
-		super(severity, messageType, faulty, message);
-
-		this.causes = Collections.emptyList();
-	}
-
-	public Collection<Cause> getCauses() {
-		return causes;
-	}
-
-	public void setCauses(Collection<Cause> reasons) {
-		this.causes = reasons;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer str = new StringBuffer(severity.getSingular());
-
-		str.append(" id = ");
-		str.append(id);
-		str.append(":\n");
-
-		if (faulty != null) {
-			str.append("faulty : ");
-			str.append(faulty);
-			str.append(", ");
-		}
-
-		str.append(message);
-		str.append(" \n\tCauses are [ \n");
-
-		for (Cause cause : causes) {
-			str.append("\t\t");
-			str.append(cause);
-			str.append("\n");
-		}
-		str.append("\t]");
-
-		return str.toString();
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/components/AnalyticsMessageBase.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/report/components/AnalyticsMessageBase.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/components/AnalyticsMessageBase.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,102 +0,0 @@
-package org.drools.verifier.report.components;
-
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Collection;
-
-/**
- *
- * @author Toni Rikkola
- */
-abstract public class AnalyticsMessageBase implements Serializable,
-		Comparable<AnalyticsMessageBase> {
-	private static final long serialVersionUID = 9190003495068712452L;
-
-	private static int index = 0;
-
-	protected Severity severity;
-	protected MessageType messageType;
-
-	protected int id = index++;
-	protected Cause faulty;
-	protected String message;
-
-	public int compareTo(AnalyticsMessageBase o) {
-		if (id == o.getId()) {
-			return 0;
-		}
-
-		return (id > o.getId() ? 1 : -1);
-	}
-
-	protected AnalyticsMessageBase(Severity severity, MessageType messageType,
-			Cause faulty, String message) {
-		this.severity = severity;
-		this.messageType = messageType;
-		this.faulty = faulty;
-		this.message = message;
-	}
-
-	public int getId() {
-		return id;
-	}
-
-	public void setId(int id) {
-		this.id = id;
-	}
-
-	public String getMessage() {
-		return message;
-	}
-
-	public void setMessage(String message) {
-		this.message = message;
-	}
-
-	public Cause getFaulty() {
-		return faulty;
-	}
-
-	public void setFaulty(Cause faulty) {
-		this.faulty = faulty;
-	}
-
-	public MessageType getMessageType() {
-		return messageType;
-	}
-
-	public void setMessageType(MessageType messageType) {
-		this.messageType = messageType;
-	}
-
-	public Severity getSeverity() {
-		return severity;
-	}
-
-	public void setSeverity(Severity severity) {
-		this.severity = severity;
-	}
-
-	@Override
-	public String toString() {
-		StringBuffer str = new StringBuffer(severity.singular);
-
-		str.append(" id = ");
-		str.append(id);
-		str.append(":\n");
-
-		if (faulty != null) {
-			str.append("faulty : ");
-			str.append(faulty);
-			str.append(", ");
-		}
-
-		str.append(message);
-
-		str.append("\t]");
-
-		return str.toString();
-	}
-
-	public abstract Collection<? extends Cause> getCauses();
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/components/AnalyticsRangeCheckMessage.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/report/components/AnalyticsRangeCheckMessage.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/components/AnalyticsRangeCheckMessage.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,24 +0,0 @@
-package org.drools.verifier.report.components;
-
-import java.util.Collection;
-
-public class AnalyticsRangeCheckMessage extends AnalyticsMessageBase {
-	private static final long serialVersionUID = -2403507929285633672L;
-
-	private Collection<RangeCheckCause> causes;
-
-	public AnalyticsRangeCheckMessage(Severity severity, Cause faulty,
-			String message, Collection<RangeCheckCause> causes) {
-		super(severity, MessageType.RANGE_CHECK, faulty, message);
-
-		this.causes = causes;
-	}
-
-	public Collection<RangeCheckCause> getCauses() {
-		return causes;
-	}
-
-	public void setCauses(Collection<RangeCheckCause> reasons) {
-		this.causes = reasons;
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/AnalyticsMessagesVisitor.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/java/org/drools/verifier/report/html/AnalyticsMessagesVisitor.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/java/org/drools/verifier/report/html/AnalyticsMessagesVisitor.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,81 +0,0 @@
-package org.drools.verifier.report.html;
-
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.HashMap;
-import java.util.Map;
-
-import org.drools.verifier.dao.AnalyticsData;
-import org.drools.verifier.report.components.AnalyticsMessage;
-import org.drools.verifier.report.components.AnalyticsMessageBase;
-import org.drools.verifier.report.components.AnalyticsRangeCheckMessage;
-import org.drools.verifier.report.components.Cause;
-import org.mvel.templates.TemplateRuntime;
-
-/**
- * 
- * @author Toni Rikkola
- */
-class AnalyticsMessagesVisitor extends ReportVisitor {
-
-	private static String VERIFIER_MESSAGES_TEMPLATE = "verifierMessages.htm";
-	private static String VERIFIER_MESSAGE_TEMPLATE = "verifierMessage.htm";
-
-	public static String NOTES = "Notes";
-	public static String WARNINGS = "Warnings";
-	public static String ERRORS = "Errors";
-
-	public static String visitAnalyticsMessagesCollection(String title,
-			Collection<AnalyticsMessageBase> messages, AnalyticsData data) {
-		Map<String, Object> map = new HashMap<String, Object>();
-		Collection<String> messageTemplates = new ArrayList<String>();
-		String myTemplate = readFile(VERIFIER_MESSAGES_TEMPLATE);
-
-		for (AnalyticsMessageBase message : messages) {
-			messageTemplates.add(visitAnalyticsMessage(message, data));
-		}
-
-		map.put("title", title);
-		map.put("messages", messageTemplates);
-
-		return String.valueOf(TemplateRuntime.eval(myTemplate, map));
-	}
-
-	public static String visitAnalyticsMessage(AnalyticsMessageBase message,
-			AnalyticsData data) {
-		if (message instanceof AnalyticsRangeCheckMessage) {
-			return visitAnalyticsMessage((AnalyticsRangeCheckMessage) message,
-					data);
-		} else if (message instanceof AnalyticsMessage) {
-			return visitAnalyticsMessage((AnalyticsMessage) message);
-		}
-
-		return null;
-	}
-
-	public static String visitAnalyticsMessage(
-			AnalyticsRangeCheckMessage message, AnalyticsData data) {
-
-		return MissingRangesReportVisitor.visitRangeCheckMessage(
-				UrlFactory.THIS_FOLDER, message, data);
-	}
-
-	public static String visitAnalyticsMessage(AnalyticsMessage message) {
-
-		Map<String, Object> map = new HashMap<String, Object>();
-		Collection<String> causeUrls = new ArrayList<String>();
-		String myTemplate = readFile(VERIFIER_MESSAGE_TEMPLATE);
-
-		// Solve the url's to causes if there is any.
-		for (Cause cause : message.getCauses()) {
-			causeUrls.add(UrlFactory.getUrl(cause));
-		}
-
-		map.put("title", message.getSeverity());
-		map.put("reason", message.getFaulty());
-		map.put("message", message.getMessage());
-		map.put("causes", causeUrls);
-
-		return String.valueOf(TemplateRuntime.eval(myTemplate, map));
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/main/resources/org/drools/verifier/rangeChecks/Patterns.drl
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/main/resources/org/drools/verifier/rangeChecks/Patterns.drl	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/main/resources/org/drools/verifier/rangeChecks/Patterns.drl	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,101 +0,0 @@
-#created on: 7.6.2007
-package org.drools.verifier.rangeChecks.patterns;
-
-#list any import classes here.
-import org.drools.base.evaluators.Operator;
-
-import org.drools.verifier.components.*;
-import org.drools.verifier.dao.AnalyticsResult;
-import org.drools.verifier.report.components.MissingNumberPattern;
-import org.drools.verifier.report.components.Cause;
-import org.drools.verifier.FindMissingNumber;
-
-import java.util.ArrayList;
-import java.util.List;
-
-import org.drools.verifier.dao.AnalyticsResult;
-
-#declare any global variables here
-global AnalyticsResult result;
-
-#
-# 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"
-	when
-		$f :Field(
-			( fieldType == Field.FieldType.INT || == Field.FieldType.DOUBLE )
-		)
-		(
-			# Where pattern is false.
-			$list :ArrayList( size > FindMissingNumber.MIN_NUMBER_OF_RESTRICTIONS )
-				from collect(
-					LiteralRestriction( 
-						fieldId == $f.id, 
-						patternIsNot == false, 
-						operator == Operator.EQUAL
-					)
-				)
-		) or (
-			# Where pattern is true.
-			$list :ArrayList( size > FindMissingNumber.MIN_NUMBER_OF_RESTRICTIONS )
-				from collect(
-					LiteralRestriction( 
-						fieldId == $f.id, 
-						patternIsNot == true, 
-						operator == Operator.EQUAL
-					)
-				)
-		)
-	then
-		Number number = FindMissingNumber.testForPattern( $list );
-		if( number != null ){
-			MissingNumberPattern mnp = new MissingNumberPattern( $f, Operator.EQUAL, $f.getFieldType(), number.toString() );
-			result.add( mnp );
-		}
-end
-
-#
-# 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, !="
-	when
-		$f :Field( 
-			( fieldType == Field.FieldType.INT || == Field.FieldType.DOUBLE ) 
-		)
-		(
-			# Where pattern is false.
-			$list :ArrayList( size > FindMissingNumber.MIN_NUMBER_OF_RESTRICTIONS )
-				from collect(
-					LiteralRestriction( 
-						fieldId == $f.id, 
-						patternIsNot == false, 
-						operator == Operator.NOT_EQUAL
-					)
-				)
-		) or (
-			# Where pattern is false.
-			$list :ArrayList( size > FindMissingNumber.MIN_NUMBER_OF_RESTRICTIONS )
-				from collect(
-					LiteralRestriction( 
-						fieldId == $f.id, 
-						patternIsNot == true, 
-						operator == Operator.NOT_EQUAL
-					)
-				)
-		)
-	then
-		Number number = FindMissingNumber.testForPattern( $list );
-		if( number != null ){
-			MissingNumberPattern mnp = new MissingNumberPattern( $f, Operator.NOT_EQUAL, $f.getFieldType(), number.toString() );
-			result.add( mnp );
-		}
-end

Deleted: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/AnalyticsTestStandalone.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/test/java/org/drools/verifier/AnalyticsTestStandalone.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/AnalyticsTestStandalone.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,148 +0,0 @@
-package org.drools.verifier;
-
-import java.io.BufferedWriter;
-import java.io.FileWriter;
-import java.io.InputStreamReader;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.Set;
-
-import org.drools.compiler.DrlParser;
-import org.drools.compiler.Dialect.AnalysisResult;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.verifier.Analyzer;
-import org.drools.verifier.components.AnalyticsClass;
-import org.drools.verifier.components.AnalyticsRule;
-import org.drools.verifier.components.Field;
-import org.drools.verifier.dao.AnalyticsResult;
-import org.drools.verifier.report.components.AnalyticsMessage;
-import org.drools.verifier.report.components.AnalyticsMessageBase;
-import org.drools.verifier.report.components.AnalyticsRangeCheckMessage;
-import org.drools.verifier.report.components.Cause;
-import org.drools.verifier.report.components.Severity;
-
-/**
- * This is a sample file to launch a rule package from a rule source file.
- */
-class AnalyticsTestStandalone {
-
-	public static final void main(String[] args) {
-		try {
-
-			Collection<String> fileNames = new ArrayList<String>();
-
-			// Test data
-			// fileNames.add("MissingRangesForDates.drl");
-			// fileNames.add("MissingRangesForDoubles.drl");
-			// fileNames.add("MissingRangesForInts.drl");
-			// fileNames.add("MissingRangesForVariables.drl");
-			// fileNames.add("Misc.drl");
-			// fileNames.add("Misc2.drl");
-			fileNames.add("Misc3.drl");
-			// fileNames.add("ConsequenceTest.drl");
-			// fileNames.add("optimisation/OptimisationRestrictionOrderTest.drl");
-			// fileNames.add("optimisation/OptimisationPatternOrderTest.drl");
-
-			DrlParser parser = new DrlParser();
-			Analyzer a = new Analyzer();
-
-			for (String s : fileNames) {
-				PackageDescr descr = parser.parse(new InputStreamReader(
-						Analyzer.class.getResourceAsStream(s)));
-				a.addPackageDescr(descr);
-			}
-
-			a.fireAnalysis();
-			// System.out.print(a.getResultAsPlainText());
-			// System.out.print(a.getResultAsXML());
-			// a.writeComponentsHTML("/stash/");
-			// a.writeComponentsHTML("/Users/michaelneale/foo.html");
-			a.writeComponentsHTML("c:/");
-
-			AnalyticsResult result = a.getResult();
-			Collection<AnalyticsMessageBase> msgs = result
-					.getBySeverity(Severity.ERROR);
-
-			for (Iterator iterator = msgs.iterator(); iterator.hasNext();) {
-				AnalyticsMessageBase msg = (AnalyticsMessageBase) iterator
-						.next();
-				System.out.println("ERR: " + msg.getMessage());
-			}
-
-			msgs = result.getBySeverity(Severity.WARNING);
-			for (Iterator iterator = msgs.iterator(); iterator.hasNext();) {
-				AnalyticsMessageBase msg = (AnalyticsMessageBase) iterator
-						.next();
-				System.out.println("WARN (" + msg.getClass().getSimpleName()
-						+ "): " + msg.getMessage());
-				System.out.println("\t FAULT: ["
-						+ msg.getClass().getSimpleName() + "] "
-						+ msg.getFaulty());
-				if (msg instanceof AnalyticsMessage) {
-					System.out.println("\t CAUSES (message):");
-					AnalyticsMessage amsg = (AnalyticsMessage) msg;
-					for (Iterator iterator2 = amsg.getCauses().iterator(); iterator2
-							.hasNext();) {
-						Cause c = (Cause) iterator2.next();
-						System.out.println("\t\t ["
-								+ c.getClass().getSimpleName() + "]" + c);
-
-					}
-
-				} else if (msg instanceof AnalyticsRangeCheckMessage) {
-					System.out.println("\t CAUSES (range):");
-					AnalyticsRangeCheckMessage amsg = (AnalyticsRangeCheckMessage) msg;
-					for (Iterator iterator2 = amsg.getCauses().iterator(); iterator2
-							.hasNext();) {
-						Cause c = (Cause) iterator2.next();
-						System.out.println("\t\t" + c);
-
-					}
-
-				}
-			}
-
-			msgs = result.getBySeverity(Severity.NOTE);
-			for (Iterator iterator = msgs.iterator(); iterator.hasNext();) {
-				AnalyticsMessageBase msg = (AnalyticsMessageBase) iterator
-						.next();
-				System.out.println("NOTE: " + msg.getMessage());
-				System.out.println("\t" + msg.getFaulty());
-			}
-
-			Collection<AnalyticsClass> classes = result.getAnalyticsData()
-					.getAllClasses();
-			for (Iterator iterator = classes.iterator(); iterator.hasNext();) {
-				AnalyticsClass c = (AnalyticsClass) iterator.next();
-
-				Collection<AnalyticsRule> cr = result.getAnalyticsData()
-						.getRulesByClassId(c.getId());
-				System.err.println("Class rules:" + cr);
-				Set<Field> flds = c.getFields();
-				for (Iterator iterator2 = flds.iterator(); iterator2.hasNext();) {
-					Field f = (Field) iterator2.next();
-					cr = result.getAnalyticsData().getRulesByFieldId(f.getId());
-					System.err.println("Field rules: " + cr);
-
-				}
-			}
-
-			// System.err.println(a.getResultAsPlainText());
-			// System.out.println(result.toString());
-		} catch (Throwable t) {
-			t.printStackTrace();
-		}
-	}
-
-	private static void writeToFile(String fileName, String text) {
-		try {
-			FileWriter fstream = new FileWriter(fileName);
-			BufferedWriter out = new BufferedWriter(fstream);
-			out.write(text);
-			out.close();
-		} catch (Exception e) {
-			System.err.println(e.getMessage());
-		}
-	}
-}

Deleted: labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/AnalyzerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-analytics/src/test/java/org/drools/verifier/AnalyzerTest.java	2008-06-02 02:44:41 UTC (rev 20250)
+++ labs/jbossrules/trunk/drools-verifier/src/test/java/org/drools/verifier/AnalyzerTest.java	2008-06-10 09:45:04 UTC (rev 20394)
@@ -1,78 +0,0 @@
-package org.drools.verifier;
-
-import java.io.InputStreamReader;
-
-import junit.framework.TestCase;
-
-import org.drools.RuleBase;
-import org.drools.compiler.DrlParser;
-import org.drools.lang.descr.PackageDescr;
-import org.drools.verifier.Analyzer;
-import org.drools.verifier.dao.AnalyticsResult;
-import org.drools.verifier.report.components.Severity;
-
-public class AnalyzerTest extends TestCase {
-
-	public void testAnalyzer() throws Exception {
-		Analyzer anal = new Analyzer();
-
-		DrlParser p = new DrlParser();
-		InputStreamReader reader = new InputStreamReader(this.getClass().getResourceAsStream("Misc3.drl"));
-		PackageDescr pkg = p.parse(reader);
-		assertFalse(p.hasErrors());
-
-		anal.addPackageDescr(pkg);
-		anal.fireAnalysis();
-
-		AnalyticsResult result = anal.getResult();
-		assertNotNull(result);
-		assertEquals(0, result.getBySeverity(Severity.ERROR).size());
-		assertEquals(10, result.getBySeverity(Severity.WARNING).size());
-		assertEquals(1, result.getBySeverity(Severity.NOTE).size());
-
-
-		//check it again
-		anal = new Analyzer();
-
-		p = new DrlParser();
-		reader = new InputStreamReader(this.getClass().getResourceAsStream("Misc3.drl"));
-		pkg = p.parse(reader);
-		assertFalse(p.hasErrors());
-
-		anal.addPackageDescr(pkg);
-		anal.fireAnalysis();
-
-		result = anal.getResult();
-		assertNotNull(result);
-		assertEquals(0, result.getBySeverity(Severity.ERROR).size());
-		assertEquals(10, result.getBySeverity(Severity.WARNING).size());
-		assertEquals(1, result.getBySeverity(Severity.NOTE).size());
-
-
-
-
-	}
-
-	public void testCacheKnowledgeBase() throws Exception {
-		Analyzer anal = new Analyzer();
-		DrlParser p = new DrlParser();
-		InputStreamReader reader = new InputStreamReader(this.getClass().getResourceAsStream("Misc3.drl"));
-		PackageDescr pkg = p.parse(reader);
-		assertFalse(p.hasErrors());
-
-		anal.addPackageDescr(pkg);
-		anal.fireAnalysis();
-
-		RuleBase original = Analyzer.verifierKnowledgeBase;
-
-		Analyzer anal2 = new Analyzer();
-
-		assertSame(original, Analyzer.verifierKnowledgeBase);
-
-		anal2.reloadAnalysisKnowledgeBase();
-		assertNotSame(original, Analyzer.verifierKnowledgeBase);
-
-
-	}
-
-}




More information about the jboss-svn-commits mailing list