[jboss-svn-commits] JBL Code SVN: r26546 - in labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools: degrees and 1 other directories.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Fri May 15 05:35:58 EDT 2009


Author: dsotty
Date: 2009-05-15 05:35:58 -0400 (Fri, 15 May 2009)
New Revision: 26546

Added:
   labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/InitialFact.java
Modified:
   labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/KnowledgeBaseConfiguration.java
   labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/degrees/SimpleDegree.java
   labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/ArgList.java
   labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/ConstraintKey.java
   labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/DynamicConstraintKey.java
Log:
Major bugfix and extension

Added: labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/InitialFact.java
===================================================================
--- labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/InitialFact.java	                        (rev 0)
+++ labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/InitialFact.java	2009-05-15 09:35:58 UTC (rev 26546)
@@ -0,0 +1,29 @@
+package org.drools;
+
+import java.io.Serializable;
+
+/*
+ * Copyright 2005 JBoss Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+/**
+ * Initial fact, automatically put into the network. This fact is needed by 'not' CEs
+ * when they are the CEs in the rule.
+ */
+public interface InitialFact
+    extends
+    Serializable {
+
+}

Modified: labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/KnowledgeBaseConfiguration.java
===================================================================
--- labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/KnowledgeBaseConfiguration.java	2009-05-15 08:45:45 UTC (rev 26545)
+++ labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/KnowledgeBaseConfiguration.java	2009-05-15 09:35:58 UTC (rev 26546)
@@ -58,5 +58,7 @@
     extends
     PropertiesConfiguration,
     KnowledgeBaseOptionsConfiguration {
+	
+	public boolean isImperfect();
 
 }

Modified: labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/degrees/SimpleDegree.java
===================================================================
--- labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/degrees/SimpleDegree.java	2009-05-15 08:45:45 UTC (rev 26545)
+++ labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/degrees/SimpleDegree.java	2009-05-15 09:35:58 UTC (rev 26546)
@@ -50,7 +50,7 @@
 	
 	
 	public boolean toBoolean() {		
-		return value > 0.5;
+		return value > 0;
 	}
 
 	public SimpleDegree getDegree() {

Modified: labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/ArgList.java
===================================================================
--- labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/ArgList.java	2009-05-15 08:45:45 UTC (rev 26545)
+++ labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/ArgList.java	2009-05-15 09:35:58 UTC (rev 26546)
@@ -39,6 +39,9 @@
 		
 	}
 	
+	public boolean delete(ArgList args) {
+		return this.args.removeAll(args.args);
+	}
 	
 	
 	

Modified: labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/ConstraintKey.java
===================================================================
--- labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/ConstraintKey.java	2009-05-15 08:45:45 UTC (rev 26545)
+++ labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/ConstraintKey.java	2009-05-15 09:35:58 UTC (rev 26546)
@@ -6,8 +6,14 @@
 public class ConstraintKey {
 	
 	protected String key;
+	
+	protected String alias = "";
 
 	
+	public ConstraintKey() {
+		key = "";
+	}
+	
 	public ConstraintKey(String field, String op, String value) {
 		this.key = op+"("+field+","+value+")";	
 	}
@@ -41,6 +47,10 @@
 	public ConstraintKey cloneReplace(String oldK, String newK) {
 		return new ConstraintKey(key.replaceFirst(oldK, newK));
 	}
+	
+	public ConstraintKey clone() {
+		return new ConstraintKey(new String(key));
+	}
 
 	/**
 	 * @return the key
@@ -55,13 +65,17 @@
 		if (other == null) return false;
 		if (other instanceof ConstraintKey) {
 			ConstraintKey otherK = (ConstraintKey) other;
-			return this.key.equals(otherK.key);
+			return this.key.equals(otherK.key) || this.alias.equals(otherK.alias);
 		}
 		else 
 			return false;		
 	}
 	
 	public int hashCode() {
+		if (key != null && ! key.equals(""))
+			return key.hashCode();
+		if (alias != null)
+			return alias.hashCode();
 		return key.hashCode();
 	}
 
@@ -72,6 +86,17 @@
 //		this.constr = constr;
 //	}
 
+	
+	public void setAlias(String aka) {
+		this.alias = aka;
+	}
+	
+	public String getAlias() {
+		if (alias != null)
+			return alias;
+		else 
+			return key;
+	}
 
 
 }

Modified: labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/DynamicConstraintKey.java
===================================================================
--- labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/DynamicConstraintKey.java	2009-05-15 08:45:45 UTC (rev 26545)
+++ labs/jbossrules/branches/DroolsChance/drools-api/src/main/java/org/drools/reteoo/DynamicConstraintKey.java	2009-05-15 09:35:58 UTC (rev 26546)
@@ -4,6 +4,11 @@
 
 	private String op;
 	
+	
+	private DynamicConstraintKey() {		
+		op = "";
+	}
+	
 	public DynamicConstraintKey(String op) {
 		super(op, "");
 		this.op = op;
@@ -18,6 +23,13 @@
 		this.key = buildKey(op, "");
 	}
 	
+	public ConstraintKey clone() {
+		DynamicConstraintKey ans = new DynamicConstraintKey();
+		ans.op = new String(this.op);
+		ans.key = new String(this.key);
+		return ans;
+	}
+	
 	public void addArg(ConstraintKey arg) {
 		
 		




More information about the jboss-svn-commits mailing list