[jboss-svn-commits] JBL Code SVN: r35825 - in labs/jbossrules/branches/DRLv6/src: main/resources and 1 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Mon Nov 1 21:05:03 EDT 2010
Author: dsotty
Date: 2010-11-01 21:05:02 -0400 (Mon, 01 Nov 2010)
New Revision: 35825
Removed:
labs/jbossrules/branches/DRLv6/src/main/resources/DLTreeBuilder.g
Modified:
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DLDescrFactory.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ClassDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_DatatypeDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_DefinitionDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_EnumTypeDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_FactDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ForallDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_IndividualDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_IriDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ObjectPropertyDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_RelationDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_RestrictedTypeDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aBaseDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aCompositeDescr.java
labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aConceptDescr.java
labs/jbossrules/branches/DRLv6/src/main/resources/ManchesterTreeBuilder.g
labs/jbossrules/branches/DRLv6/src/test/java/org/drools/lang/Manchester_Test.java
Log:
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DLDescrFactory.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DLDescrFactory.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DLDescrFactory.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -6,6 +6,16 @@
public class DLDescrFactory {
+ private static DLDescrFactory instance = new DLDescrFactory();
+
+ public static DLDescrFactory instance() {
+ return instance;
+ }
+
+ private DLDescrFactory() {
+
+ }
+
private static int N = 0;
public DL_OntologyDescr buildOntologyDescr() {
@@ -14,59 +24,90 @@
public DL_IriDescr buildIriDescr(String nameSpace, String localName, Map<String,String> nsMap) {
- return new DL_IriDescr(nameSpace,localName,nsMap);
+ DL_IriDescr descr = new DL_IriDescr(nameSpace,localName,nsMap);
+ descr.setId(nextId());
+ return descr;
}
public DL_IriDescr buildIriDescr(String iri) {
- return new DL_IriDescr(iri);
+ DL_IriDescr descr = new DL_IriDescr(iri);
+ descr.setId(nextId());
+ return descr;
}
public DL_AnnotationDescr buildAnnotationDescr() {
- return new DL_AnnotationDescr();
+ DL_AnnotationDescr descr = new DL_AnnotationDescr();
+ descr.setId(nextId());
+ return descr;
}
public DL_ClassDescr buildClassDescr() {
- return new DL_ClassDescr();
+ DL_ClassDescr descr = new DL_ClassDescr();
+ descr.setId(nextId());
+ return descr;
}
public DL_DatatypeDescr buildDatatypeDescr() {
- return new DL_DatatypeDescr();
+ DL_DatatypeDescr descr = new DL_DatatypeDescr();
+ descr.setId(nextId());
+ return descr;
}
public DL_ObjectPropertyDescr buildObjectPropertyDescr() {
- return new DL_ObjectPropertyDescr();
+ DL_ObjectPropertyDescr descr = new DL_ObjectPropertyDescr();
+ descr.setId(nextId());
+ return descr;
}
public DL_DataPropertyDescr buildDataPropertyDescr() {
- return new DL_DataPropertyDescr();
+ DL_DataPropertyDescr descr = new DL_DataPropertyDescr();
+ descr.setId(nextId());
+ return descr;
}
public DL_AnnotationPropertyDescr buildAnnotationPropertyDescr() {
- return new DL_AnnotationPropertyDescr();
+ DL_AnnotationPropertyDescr descr = new DL_AnnotationPropertyDescr();
+ descr.setId(nextId());
+ return descr;
}
public DL_IndividualDescr buildIndividualDescr() {
- return new DL_IndividualDescr();
+ DL_IndividualDescr descr = new DL_IndividualDescr();
+ descr.setId(nextId());
+ return descr;
}
public DL_RelationDescr buildGenericRelationDescr(DL_IriDescr iri, boolean inverse) {
DL_RelationDescr descr = new DL_RelationDescr();
descr.setIri(iri);
descr.setInverse(inverse);
+ descr.setId(nextId());
return descr;
}
public DL_DefinitionDescr buildDefinitionDescr(DL_aBaseDescr root) {
- return new DL_DefinitionDescr(root);
+ DL_DefinitionDescr descr = new DL_DefinitionDescr(root);
+ descr.setId(nextId());
+ return descr;
}
+
+
+ public DL_DefinitionDescr buildDefinitionDescr() {
+ DL_DefinitionDescr descr = new DL_DefinitionDescr();
+ descr.setId(nextId());
+ return descr;
+ }
+
+
public Object buildFactDescr(DL_RelationDescr rel, Object tgt, boolean negated) {
DL_FactDescr descr = new DL_FactDescr();
descr.setRel(rel);
descr.setObject(tgt);
descr.setNegated(negated);
+ descr.setId(nextId());
return descr;
}
@@ -171,6 +212,7 @@
public DL_aBaseDescr buildEnumTypeDescr(Collection<Object> values) {
DL_EnumTypeDescr descr = new DL_EnumTypeDescr();
descr.addAll(values);
+ descr.setId(nextId());
return descr;
}
@@ -180,6 +222,7 @@
descr.setType(((DL_TypeDescr) type).getType());
if (facets instanceof DL_AndDescr)
descr.addChildren(((DL_AndDescr) facets).getChildren());
+ descr.setId(nextId());
return descr;
}
@@ -187,6 +230,7 @@
DL_FacetDescr facet = new DL_FacetDescr();
facet.setOp(op);
facet.setVal(val);
+ facet.setId(nextId());
return facet;
}
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ClassDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ClassDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ClassDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -1,17 +1,18 @@
package org.drools.lang.dl.descr;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Set;
public class DL_ClassDescr extends DL_aConceptDescr {
- private Set<DL_DefinitionDescr> subClassOf;
+ private Set<DL_DefinitionDescr> subClassOf = new HashSet<DL_DefinitionDescr>();
- private Set<DL_DefinitionDescr> disjointWith;
+ private Set<DL_DefinitionDescr> disjointWith = new HashSet<DL_DefinitionDescr>();
- private Set<DL_DefinitionDescr> disjointUnion;
+ private Set<DL_DefinitionDescr> disjointUnion = new HashSet<DL_DefinitionDescr>();
- private Set<DL_RelationDescr> hasKey;
+ private Set<DL_RelationDescr> hasKey = new HashSet<DL_RelationDescr>();
@@ -85,5 +86,32 @@
public void addAllHasKey(Collection<DL_RelationDescr> descr) {
this.hasKey.addAll(descr);
}
+
+
+
+
+ public String toFullDownwardString(int n) {
+ String s = super.toFullDownwardString(n);
+ String tabs = "";
+ for (int j = 0; j < n; j++)
+ tabs += "\t";
+
+ for (DL_aBaseDescr descr : getEquivalentTo())
+ s += tabs + " <==> \t" + descr.toFullDownwardString(n+1);
+
+ for (DL_aBaseDescr descr : getSubClassOf())
+ s += tabs + " ===> \t" + descr.toFullDownwardString(n+1);
+
+ for (DL_aBaseDescr descr : getDisjointWith())
+ s += tabs + " =//= \t" + descr.toFullDownwardString(n+1);
+
+ for (DL_aBaseDescr descr : getDisjointUnion())
+ s += tabs + " |==| \t" + descr.toFullDownwardString(n+1);
+
+ for (DL_RelationDescr key : getHasKey())
+ s += tabs + "#### \t" + key.toFullDownwardString(n+1);
+
+ return s;
+ }
}
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_DatatypeDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_DatatypeDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_DatatypeDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -2,6 +2,17 @@
public class DL_DatatypeDescr extends DL_aConceptDescr {
-
+ public String toFullDownwardString(int n) {
+ String s = super.toFullDownwardString(n);
+ String tabs = "";
+ for (int j = 0; j < n; j++)
+ tabs += "\t";
+
+ for (DL_aBaseDescr descr : getEquivalentTo())
+ s += tabs + " <==> \t" + descr.toFullDownwardString(n+1);
+
+
+ return s;
+ }
}
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_DefinitionDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_DefinitionDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_DefinitionDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -6,9 +6,20 @@
@Override
public String getType() {
- return root.getType();
+ return root != null ? ("DL_Def : " + root.getType()) : "WARN : NULL Definition";
}
+
+ public String toFullDownwardString(int n) {
+ return root.toFullDownwardString(n+1);
+ }
+
+
+ public DL_DefinitionDescr() {
+ super();
+ }
+
+
public DL_DefinitionDescr(DL_aBaseDescr root) {
super();
this.root = root;
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_EnumTypeDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_EnumTypeDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_EnumTypeDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -1,13 +1,14 @@
package org.drools.lang.dl.descr;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Iterator;
public class DL_EnumTypeDescr extends DL_aLeafDescr {
- private Collection<Object> elements;
+ private Collection<Object> elements = new HashSet<Object>();
@Override
public String getType() {
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_FactDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_FactDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_FactDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -32,4 +32,13 @@
this.object = object;
}
+
+
+ public String toFullDownwardString(int n) {
+ String s = "";
+ for (int j = 0; j < n; j++)
+ s += "\t";
+ s += getRel().toString() + getObject().toString();
+ return s;
+ }
}
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ForallDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ForallDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ForallDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -4,7 +4,6 @@
public class DL_ForallDescr extends DL_aCompositeDescr {
- private boolean negated = false;
@Override
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_IndividualDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_IndividualDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_IndividualDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -1,17 +1,18 @@
package org.drools.lang.dl.descr;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Set;
public class DL_IndividualDescr extends DL_aDeclarationDescr {
- private Set<DL_aConceptDescr> types;
+ private Set<DL_aConceptDescr> types = new HashSet<DL_aConceptDescr>();
- private Set<DL_FactDescr> facts;
+ private Set<DL_FactDescr> facts = new HashSet<DL_FactDescr>();
- private Set<Object> sameAs;
+ private Set<Object> sameAs = new HashSet<Object>();
- private Set<Object> differentFrom;
+ private Set<Object> differentFrom = new HashSet<Object>();
@@ -73,5 +74,32 @@
}
+
+
+
+
+
+ public String toFullDownwardString(int n) {
+ String s = super.toFullDownwardString(n);
+ String tabs = "";
+ for (int j = 0; j < n; j++)
+ tabs += "\t";
+
+ for (DL_aBaseDescr descr : getTypes())
+ s += tabs + " **** \t" + descr.toFullDownwardString(n+1);
+
+ for (DL_aBaseDescr descr : getFacts())
+ s += tabs + " :::: \t" + descr.toFullDownwardString(n+1);
+
+
+ for (Object descr : getSameAs())
+ s += tabs + " ==== \t" + descr.toString();
+
+ for (Object descr : getDifferentFrom())
+ s += tabs + " !!== \t" + descr.toString();
+
+ return s;
+ }
+
}
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_IriDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_IriDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_IriDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -2,8 +2,6 @@
import java.util.Map;
-import sun.security.action.GetLongAction;
-
public class DL_IriDescr extends DL_aLeafDescr {
private String namespace;
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ObjectPropertyDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ObjectPropertyDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_ObjectPropertyDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -1,6 +1,7 @@
package org.drools.lang.dl.descr;
import java.util.Collection;
+import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -8,9 +9,9 @@
- private Set<DL_DefinitionDescr> inverseOf;
+ private Set<DL_DefinitionDescr> inverseOf = new HashSet<DL_DefinitionDescr>();
- private Set<List<DL_RelationDescr>> subPropertyChains;
+ private Set<List<DL_RelationDescr>> subPropertyChains = new HashSet<List<DL_RelationDescr>>();
@@ -43,7 +44,37 @@
+ public String toFullDownwardString(int n) {
+ String s = super.toFullDownwardString(n);
+ String tabs = "";
+ for (int j = 0; j < n; j++)
+ tabs += "\t";
+
+ for (DL_aBaseDescr descr : getInverseOf())
+ s += tabs + "<<>> \t" + descr.toFullDownwardString(n+1);
+
+ for (List<DL_RelationDescr> list : getSubPropertyChains()) {
+ s += tabs + " oooo \t" ;
+ for (DL_RelationDescr descr : list)
+ s += descr.toString() + "\t o \t";
+ }
+
+
+ for (DL_aBaseDescr descr : getDisjointWith())
+ s += tabs + " =//= \t" + descr.toFullDownwardString(n+1);
+
+ for (DL_aBaseDescr descr : getDomain())
+ s += tabs + " |--- \t" + descr.toFullDownwardString(n+1);
+
+ for (DL_aBaseDescr descr : getRange())
+ s += tabs + " ---> \t" + descr.toFullDownwardString(n+1);
+
+
+
+
+
+ return s;
+ }
-
}
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_RelationDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_RelationDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_RelationDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -1,19 +1,20 @@
package org.drools.lang.dl.descr;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Set;
public class DL_RelationDescr extends DL_aDeclarationDescr {
- private Set<DL_DefinitionDescr> equivalentTo;
+ private Set<DL_DefinitionDescr> equivalentTo = new HashSet<DL_DefinitionDescr>();
- private Set<DL_DefinitionDescr> disjointWith;
+ private Set<DL_DefinitionDescr> disjointWith = new HashSet<DL_DefinitionDescr>();
- private Set<DL_DefinitionDescr> domain;
+ private Set<DL_DefinitionDescr> domain = new HashSet<DL_DefinitionDescr>();
- private Set<DL_DefinitionDescr> range;
+ private Set<DL_DefinitionDescr> range = new HashSet<DL_DefinitionDescr>();
- private Set<DL_DefinitionDescr> subPropertyOf;
+ private Set<DL_DefinitionDescr> subPropertyOf = new HashSet<DL_DefinitionDescr>();
private boolean functional;
@@ -170,5 +171,36 @@
+
+
+ public String toFullDownwardString(int n) {
+ String s = super.toFullDownwardString(n);
+ String tabs = "";
+ for (int j = 0; j < n; j++)
+ tabs += "\t";
+
+ for (DL_aBaseDescr descr : getEquivalentTo())
+ s += tabs + " <==> \t" + descr.toFullDownwardString(n+1);
+
+ for (DL_aBaseDescr descr : getSubPropertyOf())
+ s += tabs + " ===> \t" + descr.toFullDownwardString(n+1);
+
+
+ for (DL_aBaseDescr descr : getDisjointWith())
+ s += tabs + " =//= \t" + descr.toFullDownwardString(n+1);
+
+ for (DL_aBaseDescr descr : getDomain())
+ s += tabs + " |--- \t" + descr.toFullDownwardString(n+1);
+
+ for (DL_aBaseDescr descr : getRange())
+ s += tabs + " ---> \t" + descr.toFullDownwardString(n+1);
+
+
+
+
+
+ return s;
+ }
+
}
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_RestrictedTypeDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_RestrictedTypeDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_RestrictedTypeDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -1,7 +1,5 @@
package org.drools.lang.dl.descr;
-import java.util.Collection;
-import java.util.Iterator;
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aBaseDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aBaseDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aBaseDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -34,7 +34,7 @@
}
public String toFullDownwardString(int n) {
- return toString() + formatAnnotations(1);
+ return toString() + formatAnnotations(n+1);
}
public String toString() {
@@ -44,7 +44,7 @@
protected String formatAnnotations(int lev) {
- String meta = "\n";
+ String meta = "";
String tab = "";
for (int j = 0; j < lev; j++) tab += "\t";
for (String key : annotations.keySet()) {
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aCompositeDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aCompositeDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aCompositeDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -64,7 +64,7 @@
public String toFullDownwardString(int n) {
StringBuilder sb = new StringBuilder();
- sb.append(this.toString() + formatAnnotations(1));
+ sb.append(this.toString() + formatAnnotations(n));
for (DL_aBaseDescr child : children) {
for (int j = 0; j < n; j++)
sb.append("\t");
Modified: labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aConceptDescr.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aConceptDescr.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/java/org/drools/lang/dl/descr/DL_aConceptDescr.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -1,11 +1,12 @@
package org.drools.lang.dl.descr;
import java.util.Collection;
+import java.util.HashSet;
import java.util.Set;
public abstract class DL_aConceptDescr extends DL_aDeclarationDescr {
- private Set<DL_DefinitionDescr> equivalentTo;
+ private Set<DL_DefinitionDescr> equivalentTo = new HashSet<DL_DefinitionDescr>();
public Set<DL_DefinitionDescr> getEquivalentTo() {
return equivalentTo;
Deleted: labs/jbossrules/branches/DRLv6/src/main/resources/DLTreeBuilder.g
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/resources/DLTreeBuilder.g 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/resources/DLTreeBuilder.g 2010-11-02 01:05:02 UTC (rev 35825)
@@ -1,82 +0,0 @@
-tree grammar DLTreeBuilder;
-
-options {
- language = Java;
- tokenVocab = DRLv6Parser;
- ASTLabelType = CommonTree;
-}
-
-
- at header {
-
- package org.drools.lang.dl;
-
- import org.drools.lang.dl.descr.DLDescrFactory;
- import org.drools.lang.dl.descr.DL_aBaseDescr;
- import java.util.List;
- import java.util.LinkedList;
-
-}
-
-
- at members {
- DLDescrFactory factory = new DLDescrFactory();
-}
-
-
-drl_source returns [List<DL_BaseDescr> types]
- at init{
- List<DL_BaseDescr> typeList = new LinkedList<DL_BaseDescr>();
-}
- : ^(VT_COMPILATION_UNIT package_header?
- ( klass=declaration { typeList.add($klass.typeDescr); } )*
- )
- {types = typeList;}
- ;
-
-package_header
- : ^(VT_PACKAGE ^(VT_PACKAGE_ID ID+) )
- ;
-
-declaration returns [DL_BaseDescr typeDescr]
- : ^(VT_TYPE_DECLARE klass=VT_TYPE_DECLARE_ID type=dl_root)
- { typeDescr=factory.buildRootType($klass.getText(),$type.dlDescr); }
- ;
-
-
-
-dl_root returns [DL_BaseDescr dlDescr]
- : ^(VT_DL_DEFINITION ans=dl_tree)
- { $dlDescr = $ans.dlDescr; }
- ;
-
-dl_tree returns [DL_BaseDescr dlDescr]
- at init{
- List<DL_BaseDescr> descrList = new LinkedList<DL_BaseDescr>();
-}
- : ^(VT_IMPLIES left=dl_tree right=dl_tree)
- { descrList.add($left.dlDescr);
- descrList.add($right.dlDescr);
- $dlDescr = factory.createImplies(descrList);
- }
- | ^(VT_OR
- (child=dl_tree { descrList.add($child.dlDescr); })+
- )
- { $dlDescr = factory.createOr(descrList); }
- | ^(VT_AND
- (child=dl_tree { descrList.add($child.dlDescr); })+
- )
- { $dlDescr = factory.createAnd(descrList); }
- | ^(VT_NEG child=dl_tree)
- { $dlDescr = factory.createNeg($child.dlDescr); }
- | ^(VT_DL_TYPE klass=ID)
- { $dlDescr = factory.createType($klass.getText()); }
- | ^(SOME rel=ID tgt=dl_tree)
- { $dlDescr = factory.createExists(
- factory.createProperty($rel.getText()),
- $tgt.dlDescr); }
- | ^(ALL rel=ID tgt=dl_tree)
- { $dlDescr = factory.createForall(
- factory.createProperty($rel.getText()),
- $tgt.dlDescr); }
- ;
Modified: labs/jbossrules/branches/DRLv6/src/main/resources/ManchesterTreeBuilder.g
===================================================================
--- labs/jbossrules/branches/DRLv6/src/main/resources/ManchesterTreeBuilder.g 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/main/resources/ManchesterTreeBuilder.g 2010-11-02 01:05:02 UTC (rev 35825)
@@ -19,7 +19,7 @@
@members {
- DLDescrFactory factory = new DLDescrFactory();
+ DLDescrFactory factory = DLDescrFactory.instance();
DL_OntologyDescr ontoDescr = null;
}
@@ -174,7 +174,7 @@
disjointUnions returns [LinkedList diuList]
@init {$diuList = new LinkedList();}
- : ^( VT_DISJOINTUNIONOF
+ : ^( VT_DISJOINTUNIONOF annotations?
( d=definition {$diuList.add($d.defDescr);} )*
)
;
@@ -182,21 +182,21 @@
disjointWiths returns [LinkedList diwList]
@init {$diwList = new LinkedList();}
- : ^( VT_DISJOINTWITH
+ : ^( VT_DISJOINTWITH annotations?
( d=definition {$diwList.add($d.defDescr);} )*
)
;
equivalentTos returns [LinkedList eqsList]
@init {$eqsList = new LinkedList();}
- : ^( VT_EQUIVALENTTO
+ : ^( VT_EQUIVALENTTO annotations?
( e=definition {$eqsList.add($e.defDescr);} )*
)
;
subClassOfs returns [LinkedList subList]
@init {$subList = new LinkedList();}
- : ^( VT_SUBCLASSOF
+ : ^( VT_SUBCLASSOF annotations?
( s=definition {$subList.add($s.defDescr);} )*
)
;
@@ -204,7 +204,7 @@
hasKeys returns [LinkedList keyList]
@init {$keyList = new LinkedList();}
- : ^( VT_KEYS
+ : ^( VT_KEYS annotations?
( k=relation {$keyList.add($k.relDescr);} )*
)
;
@@ -220,28 +220,28 @@
ranges returns [LinkedList rngList]
@init {$rngList = new LinkedList();}
- : ^( VT_RANGE
+ : ^( VT_RANGE annotations?
( d=definition {$rngList.add($d.defDescr);} )*
)
;
subPropertyOfs returns [LinkedList subList]
@init {$subList = new LinkedList();}
- : ^( VT_SUBPROPERTYOF
+ : ^( VT_SUBPROPERTYOF annotations?
( r=relation {$subList.add($r.relDescr);} )*
)
;
inverseOfs returns [LinkedList invList]
@init {$invList = new LinkedList();}
- : ^( VT_INVERSEOF
+ : ^( VT_INVERSEOF annotations?
( r=relation {$invList.add($r.relDescr);} )*
)
;
subPropertyChain returns [LinkedList chnList]
@init {$chnList = new LinkedList();}
- : ^( VT_SUBPROPERTYCHAIN
+ : ^( VT_SUBPROPERTYCHAIN annotations?
( r=relation {$chnList.add($r.relDescr);} )*
)
;
@@ -249,14 +249,14 @@
types returns [LinkedList typList]
@init {$typList = new LinkedList();}
- : ^( VT_TYPES
+ : ^( VT_TYPES annotations?
( d=definition {$typList.add($d.defDescr);} )*
)
;
facts returns [LinkedList facList]
@init {$facList = new LinkedList();}
- : ^( VT_FACTS
+ : ^( VT_FACTS annotations?
(
^(VT_FACT r=relation e=entity )
{ $facList.add(factory.buildFactDescr($r.relDescr,$e.val,false)); }
@@ -269,15 +269,19 @@
sames returns [LinkedList eqsList]
@init {$eqsList = new LinkedList();}
- : ^( VT_SAMEAS
- ( annotations? x=individual {$eqsList.add($x.val);} )*
+ : ^( VT_SAMEAS annotations?
+ ^(VT_LIST
+ ( x=individual {$eqsList.add($x.val);} )*
+ )
)
;
differs returns [LinkedList difList]
@init {$difList = new LinkedList();}
- : ^( VT_DIFFERENTFROM
- ( annotations? x=individual {$difList.add($x.val);} )*
+ : ^( VT_DIFFERENTFROM annotations?
+ ^(VT_LIST
+ ( x=individual {$difList.add($x.val);} )*
+ )
)
;
@@ -303,7 +307,13 @@
definition returns [DL_DefinitionDescr defDescr]
- : root=dl_tree { $defDescr = factory.buildDefinitionDescr($root.descr); }
+ : ^(VT_DL_DEFINITION
+ { $defDescr = factory.buildDefinitionDescr(); }
+ ( ann=annotations
+ { $defDescr.addAnnotations($ann.annList); }
+ )?
+ root=dl_tree { $defDescr.setRoot($root.descr); }
+ )
;
Modified: labs/jbossrules/branches/DRLv6/src/test/java/org/drools/lang/Manchester_Test.java
===================================================================
--- labs/jbossrules/branches/DRLv6/src/test/java/org/drools/lang/Manchester_Test.java 2010-11-01 19:26:21 UTC (rev 35824)
+++ labs/jbossrules/branches/DRLv6/src/test/java/org/drools/lang/Manchester_Test.java 2010-11-02 01:05:02 UTC (rev 35825)
@@ -54,10 +54,9 @@
*/
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertTrue;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
+
import java.awt.event.MouseEvent;
import java.awt.event.MouseListener;
import java.io.ByteArrayInputStream;
@@ -484,20 +483,35 @@
-// "Namespace: dc <http://purl.org/dc/elements/1.1/>"+ "\n " +
-// " Ontology : pass" + "\n " +
-// " Import: <http://ontology.dumontierlab.com/atom-common> " + "\n " +
-// " " + "\n " +
-// "Annotations: " + "\n" +
-// "dc:publisher \"Dumontier Lab\"^^string,"+ "\n " +
-// "dc:publisher \"Dumontier Lab\"^^xsd:string,"+ "\n " +
-// "dc:title \"Organic Functional Group Ontology (complex)\"^^xsd:string,"+ "\n " +
-// "dc:creator \"Michel Dumontier\"^^xsd:string,"+ "\n " +
-// "dc:language \"en\"^^xsd:string,"+ "\n " +
-// "owl:versionInfo \"2.0\"^^xsd:string,"+ "\n " +
-// "dc:date \"2007-10-01\"^^xsd:date,"+ "\n " +
-// "dc:description \"Complex class descriptions for the realization of organic functional groups.\"^^xsd:string,"+ "\n " +
-// "dc:format \"application/rdf+xml\"^^xsd:string"
+ "Namespace: dc <http://purl.org/dc/elements/1.1/>"+ "\n " +
+ " Ontology : pass" + "\n " +
+ " Import: <http://ontology.dumontierlab.com/atom-common> " + "\n " +
+ " " + "\n " +
+ "Annotations: " + "\n" +
+ "dc:publisher \"Dumontier Lab\"^^string,"+ "\n " +
+ "dc:publisher \"Dumontier Lab\"^^xsd:string,"+ "\n " +
+ "dc:title \"Organic Functional Group Ontology (complex)\"^^xsd:string,"+ "\n " +
+ "dc:creator \"Michel Dumontier\"^^xsd:string,"+ "\n " +
+ "dc:language \"en\"^^xsd:string,"+ "\n " +
+ "owl:versionInfo \"2.0\"^^xsd:string,"+ "\n " +
+ "dc:date \"2007-10-01\"^^xsd:date,"+ "\n " +
+ "dc:description \"Complex class descriptions for the realization of organic functional groups.\"^^xsd:string,"+ "\n " +
+ "dc:format \"application/rdf+xml\"^^xsd:string",
+
+
+
+
+ " Prefix: g: <sk:someIRI#> " +"\n" +
+ " Ontology : owl:myOnto g:v1 " +"\n" +
+ " " + "\n" +
+ " Class : Foo " + "\n" +
+ " Annotations: creatory sotty " + "\n" +
+ " DisjointUnionOf: Annotations: guess what Child, Adult" + "\n" +
+ " SubClassOf: Person and Worker" + "\n" +
+ " EquivalentTo: Annotations: guess again Person, Slave" + "\n" +
+ " DisjointWith: Person" + "\n" +
+ " HasKey: Annotations: annkey targt hasSSN" + "\n" +
+ "\n",
};
check(rule,testDRL);
@@ -629,6 +643,8 @@
}
+
+
}
@@ -682,8 +698,10 @@
if (rulekey.equals("manDL_ontology")) {
ManchesterTreeBuilder builder = new ManchesterTreeBuilder(new CommonTreeNodeStream(resultTree));
DL_OntologyDescr od = builder.ontology();
+
System.out.println(od.toFullDownwardString(2));
+ res.setNumErrors(res.getNumErrors()+builder.getNumberOfSyntaxErrors());
}
More information about the jboss-svn-commits
mailing list