Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner: [540] trunk/src/dl-learner/org/dllearner
|
From: <jen...@us...> - 2008-02-11 15:24:08
|
Revision: 540
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=540&view=rev
Author: jenslehmann
Date: 2008-02-11 07:24:02 -0800 (Mon, 11 Feb 2008)
Log Message:
-----------
small fixes
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java
trunk/src/dl-learner/org/dllearner/parser/ConfParser.java
trunk/src/dl-learner/org/dllearner/parser/KBParser.java
trunk/src/dl-learner/org/dllearner/parser/conf.jj
trunk/src/dl-learner/org/dllearner/parser/kb.jj
Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-11 15:03:50 UTC (rev 539)
+++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-11 15:24:02 UTC (rev 540)
@@ -43,8 +43,8 @@
import org.dllearner.core.config.StringSetConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.dl.AtomicConcept;
-import org.dllearner.core.dl.AtomicRole;
import org.dllearner.core.dl.Individual;
+import org.dllearner.core.dl.ObjectProperty;
/**
* WidgetPanelStringSet
@@ -244,11 +244,11 @@
|| configOption.getName().equalsIgnoreCase(
"ignoredRoles")) {
// fill lists
- Set<AtomicRole> atomicsSet = config
+ Set<ObjectProperty> atomicsSet = config
.getReasoningService().getAtomicRoles();
- LinkedList<AtomicRole> atomicRoles = new LinkedList<AtomicRole>(
+ LinkedList<ObjectProperty> atomicRoles = new LinkedList<ObjectProperty>(
atomicsSet);
- for (AtomicRole ind : atomicRoles)
+ for (ObjectProperty ind : atomicRoles)
cBL.add(ind.getName());
}
}
Modified: trunk/src/dl-learner/org/dllearner/parser/ConfParser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/ConfParser.java 2008-02-11 15:03:50 UTC (rev 539)
+++ trunk/src/dl-learner/org/dllearner/parser/ConfParser.java 2008-02-11 15:24:02 UTC (rev 540)
@@ -203,11 +203,6 @@
}
final public void Start() throws ParseException {
- ConceptAssertion conceptAssertion;
- RoleAssertion roleAssertion;
- RBoxAxiom rBoxAxiom;
- Equality equality;
- Inclusion inclusion;
ConfFileOption confOption;
label_1:
while (true) {
@@ -588,6 +583,42 @@
finally { jj_save(7, xla); }
}
+ final private boolean jj_3_7() {
+ if (jj_scan_token(26)) return true;
+ if (jj_scan_token(31)) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_12() {
+ if (jj_scan_token(29)) return true;
+ if (jj_3R_11()) return true;
+ return false;
+ }
+
+ final private boolean jj_3R_17() {
+ if (jj_3R_11()) return true;
+ return false;
+ }
+
+ final private boolean jj_3_6() {
+ if (jj_scan_token(28)) return true;
+ Token xsp;
+ xsp = jj_scanpos;
+ if (jj_3R_15()) {
+ jj_scanpos = xsp;
+ if (jj_3R_16()) return true;
+ }
+ if (jj_scan_token(29)) return true;
+ xsp = jj_scanpos;
+ if (jj_3R_17()) {
+ jj_scanpos = xsp;
+ if (jj_3R_18()) return true;
+ }
+ if (jj_scan_token(30)) return true;
+ if (jj_scan_token(29)) return true;
+ return false;
+ }
+
final private boolean jj_3_5() {
Token xsp;
xsp = jj_scanpos;
@@ -726,42 +757,6 @@
return false;
}
- final private boolean jj_3_7() {
- if (jj_scan_token(26)) return true;
- if (jj_scan_token(31)) return true;
- return false;
- }
-
- final private boolean jj_3R_12() {
- if (jj_scan_token(29)) return true;
- if (jj_3R_11()) return true;
- return false;
- }
-
- final private boolean jj_3R_17() {
- if (jj_3R_11()) return true;
- return false;
- }
-
- final private boolean jj_3_6() {
- if (jj_scan_token(28)) return true;
- Token xsp;
- xsp = jj_scanpos;
- if (jj_3R_15()) {
- jj_scanpos = xsp;
- if (jj_3R_16()) return true;
- }
- if (jj_scan_token(29)) return true;
- xsp = jj_scanpos;
- if (jj_3R_17()) {
- jj_scanpos = xsp;
- if (jj_3R_18()) return true;
- }
- if (jj_scan_token(30)) return true;
- if (jj_scan_token(29)) return true;
- return false;
- }
-
public ConfParserTokenManager token_source;
SimpleCharStream jj_input_stream;
public Token token, jj_nt;
Modified: trunk/src/dl-learner/org/dllearner/parser/KBParser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/KBParser.java 2008-02-11 15:03:50 UTC (rev 539)
+++ trunk/src/dl-learner/org/dllearner/parser/KBParser.java 2008-02-11 15:24:02 UTC (rev 540)
@@ -35,7 +35,7 @@
final public KB KB() throws ParseException {
ConceptAssertion conceptAssertion;
- RoleAssertion roleAssertion;
+ ObjectPropertyAssertion roleAssertion;
RBoxAxiom rBoxAxiom;
Equality equality;
Inclusion inclusion;
@@ -123,9 +123,9 @@
throw new Error("Missing return statement in function");
}
- final public RoleAssertion ABoxRole() throws ParseException {
+ final public ObjectPropertyAssertion ABoxRole() throws ParseException {
boolean isNegated=false;
- AtomicRole ar;
+ ObjectProperty ar;
Individual i1,i2;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case NOT:
@@ -136,7 +136,7 @@
jj_la1[2] = jj_gen;
;
}
- ar = AtomicRole();
+ ar = ObjectProperty();
jj_consume_token(22);
i1 = Individual();
jj_consume_token(24);
@@ -146,15 +146,15 @@
if(isNegated)
{if (true) throw new Error("negated role assertions not supported yet");}
else
- {if (true) return new RoleAssertion(ar,i1,i2);}
+ {if (true) return new ObjectPropertyAssertion(ar,i1,i2);}
throw new Error("Missing return statement in function");
}
final public TransitiveRoleAxiom Transitive() throws ParseException {
- AtomicRole ar;
+ ObjectProperty ar;
jj_consume_token(28);
jj_consume_token(22);
- ar = AtomicRole();
+ ar = ObjectProperty();
jj_consume_token(23);
jj_consume_token(COMMAND_END);
{if (true) return new TransitiveRoleAxiom(ar);}
@@ -162,10 +162,10 @@
}
final public FunctionalRoleAxiom Functional() throws ParseException {
- AtomicRole ar;
+ ObjectProperty ar;
jj_consume_token(29);
jj_consume_token(22);
- ar = AtomicRole();
+ ar = ObjectProperty();
jj_consume_token(23);
jj_consume_token(COMMAND_END);
{if (true) return new FunctionalRoleAxiom(ar);}
@@ -173,10 +173,10 @@
}
final public SymmetricRoleAxiom Symmetric() throws ParseException {
- AtomicRole ar;
+ ObjectProperty ar;
jj_consume_token(30);
jj_consume_token(22);
- ar = AtomicRole();
+ ar = ObjectProperty();
jj_consume_token(23);
jj_consume_token(COMMAND_END);
{if (true) return new SymmetricRoleAxiom(ar);}
@@ -184,12 +184,12 @@
}
final public InverseRoleAxiom Inverse() throws ParseException {
- AtomicRole ar1,ar2;
+ ObjectProperty ar1,ar2;
jj_consume_token(31);
jj_consume_token(22);
- ar1 = AtomicRole();
+ ar1 = ObjectProperty();
jj_consume_token(24);
- ar2 = AtomicRole();
+ ar2 = ObjectProperty();
jj_consume_token(23);
jj_consume_token(COMMAND_END);
{if (true) return new InverseRoleAxiom(ar1,ar2);}
@@ -197,12 +197,12 @@
}
final public SubRoleAxiom Subrole() throws ParseException {
- AtomicRole ar1,ar2;
+ ObjectProperty ar1,ar2;
jj_consume_token(32);
jj_consume_token(22);
- ar1 = AtomicRole();
+ ar1 = ObjectProperty();
jj_consume_token(24);
- ar2 = AtomicRole();
+ ar2 = ObjectProperty();
jj_consume_token(23);
jj_consume_token(COMMAND_END);
{if (true) return new SubRoleAxiom(ar1,ar2);}
@@ -246,7 +246,7 @@
final public Concept Concept() throws ParseException {
Concept c,c1,c2;
AtomicConcept ac;
- AtomicRole ar;
+ ObjectProperty ar;
String s;
int i;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
@@ -283,14 +283,14 @@
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case EXISTS:
Exists();
- ar = AtomicRole();
+ ar = ObjectProperty();
jj_consume_token(COMMAND_END);
c = Concept();
{if (true) return new Exists(ar,c);}
break;
case ALL:
All();
- ar = AtomicRole();
+ ar = ObjectProperty();
jj_consume_token(COMMAND_END);
c = Concept();
{if (true) return new All(ar,c);}
@@ -303,7 +303,7 @@
case GE:
GE();
i = Integer();
- ar = AtomicRole();
+ ar = ObjectProperty();
jj_consume_token(COMMAND_END);
c = Concept();
{if (true) return new GreaterEqual(i,ar,c);}
@@ -311,7 +311,7 @@
case LE:
LE();
i = Integer();
- ar = AtomicRole();
+ ar = ObjectProperty();
jj_consume_token(COMMAND_END);
c = Concept();
{if (true) return new LessEqual(i,ar,c);}
@@ -380,7 +380,7 @@
throw new Error("Missing return statement in function");
}
- final public AtomicRole AtomicRole() throws ParseException {
+ final public ObjectProperty ObjectProperty() throws ParseException {
String name;
switch ((jj_ntk==-1)?jj_ntk():jj_ntk) {
case ID:
@@ -394,7 +394,7 @@
jj_consume_token(-1);
throw new ParseException();
}
- {if (true) return new AtomicRole(getInternalURI(name));}
+ {if (true) return new ObjectProperty(getInternalURI(name));}
throw new Error("Missing return statement in function");
}
Modified: trunk/src/dl-learner/org/dllearner/parser/conf.jj
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/conf.jj 2008-02-11 15:03:50 UTC (rev 539)
+++ trunk/src/dl-learner/org/dllearner/parser/conf.jj 2008-02-11 15:24:02 UTC (rev 540)
@@ -267,11 +267,6 @@
void Start() :
{
- ConceptAssertion conceptAssertion;
- RoleAssertion roleAssertion;
- RBoxAxiom rBoxAxiom;
- Equality equality;
- Inclusion inclusion;
ConfFileOption confOption;
}
{
Modified: trunk/src/dl-learner/org/dllearner/parser/kb.jj
===================================================================
--- trunk/src/dl-learner/org/dllearner/parser/kb.jj 2008-02-11 15:03:50 UTC (rev 539)
+++ trunk/src/dl-learner/org/dllearner/parser/kb.jj 2008-02-11 15:24:02 UTC (rev 540)
@@ -97,7 +97,7 @@
KB KB() :
{
ConceptAssertion conceptAssertion;
- RoleAssertion roleAssertion;
+ ObjectPropertyAssertion roleAssertion;
RBoxAxiom rBoxAxiom;
Equality equality;
Inclusion inclusion;
@@ -106,7 +106,7 @@
{
( LOOKAHEAD(Concept() "(" Individual() ")" <COMMAND_END>) conceptAssertion=ABoxConcept()
{ kb.addABoxAxiom(conceptAssertion); }
- | LOOKAHEAD([Not()] AtomicRole() "(" Individual() ",") roleAssertion = ABoxRole()
+ | LOOKAHEAD([Not()] ObjectProperty() "(" Individual() ",") roleAssertion = ABoxRole()
{ kb.addABoxAxiom(roleAssertion); }
| rBoxAxiom = Transitive()
{ kb.addRBoxAxiom(rBoxAxiom); }
@@ -134,50 +134,50 @@
{ return new ConceptAssertion(c,i); }
}
-RoleAssertion ABoxRole() :
+ObjectPropertyAssertion ABoxRole() :
{
boolean isNegated=false;
- AtomicRole ar;
+ ObjectProperty ar;
Individual i1,i2;
}
{
- [Not() {isNegated=true;}] ar=AtomicRole() "(" i1=Individual() "," i2=Individual() ")" <COMMAND_END>
+ [Not() {isNegated=true;}] ar=ObjectProperty() "(" i1=Individual() "," i2=Individual() ")" <COMMAND_END>
{
if(isNegated)
throw new Error("negated role assertions not supported yet");
else
- return new RoleAssertion(ar,i1,i2);
+ return new ObjectPropertyAssertion(ar,i1,i2);
}
}
-TransitiveRoleAxiom Transitive() : {AtomicRole ar;}
+TransitiveRoleAxiom Transitive() : {ObjectProperty ar;}
{
- "Transitive" "(" ar=AtomicRole() ")" <COMMAND_END>
+ "Transitive" "(" ar=ObjectProperty() ")" <COMMAND_END>
{ return new TransitiveRoleAxiom(ar); }
}
-FunctionalRoleAxiom Functional() : {AtomicRole ar;}
+FunctionalRoleAxiom Functional() : {ObjectProperty ar;}
{
- "Functional" "(" ar=AtomicRole() ")" <COMMAND_END>
+ "Functional" "(" ar=ObjectProperty() ")" <COMMAND_END>
{ return new FunctionalRoleAxiom(ar); }
}
-SymmetricRoleAxiom Symmetric() : {AtomicRole ar;}
+SymmetricRoleAxiom Symmetric() : {ObjectProperty ar;}
{
- "Symmetric" "(" ar=AtomicRole() ")" <COMMAND_END>
+ "Symmetric" "(" ar=ObjectProperty() ")" <COMMAND_END>
{ return new SymmetricRoleAxiom(ar); }
}
-InverseRoleAxiom Inverse() : {AtomicRole ar1,ar2;}
+InverseRoleAxiom Inverse() : {ObjectProperty ar1,ar2;}
{
- "Inverse" "(" ar1=AtomicRole() "," ar2=AtomicRole() ")" <COMMAND_END>
+ "Inverse" "(" ar1=ObjectProperty() "," ar2=ObjectProperty() ")" <COMMAND_END>
{ return new InverseRoleAxiom(ar1,ar2); }
}
-SubRoleAxiom Subrole() : {AtomicRole ar1,ar2;}
+SubRoleAxiom Subrole() : {ObjectProperty ar1,ar2;}
{
- "Subrole" "(" ar1=AtomicRole() "," ar2=AtomicRole() ")" <COMMAND_END>
+ "Subrole" "(" ar1=ObjectProperty() "," ar2=ObjectProperty() ")" <COMMAND_END>
{ return new SubRoleAxiom(ar1,ar2);}
}
@@ -197,7 +197,7 @@
{
Concept c,c1,c2;
AtomicConcept ac;
- AtomicRole ar;
+ ObjectProperty ar;
String s;
int i;
}
@@ -215,21 +215,21 @@
// EXISTS oder ALL reicht aus um richtigen Zweig zu w�hlen
// | Exists() s=Id() "." c=Concept()
// {return new Exists(new AtomicRole(s),c); }
- | Exists() ar=AtomicRole() "." c=Concept()
+ | Exists() ar=ObjectProperty() "." c=Concept()
{return new Exists(ar,c); }
// | All() s=Id() "." c=Concept()
// {return new All(new AtomicRole(s),c); }
- | All() ar=AtomicRole() "." c=Concept()
+ | All() ar=ObjectProperty() "." c=Concept()
{return new All(ar,c); }
| Not() c=Concept()
{return new Negation(c); }
// | GE() i=Integer() s=Id() "." c=Concept()
// {return new GreaterEqual(i,new AtomicRole(s),c);}
- | GE() i=Integer() ar=AtomicRole() "." c=Concept()
+ | GE() i=Integer() ar=ObjectProperty() "." c=Concept()
{return new GreaterEqual(i,ar,c);}
// | LE() i=Integer() s=Id() "." c=Concept()
// {return new LessEqual(i,new AtomicRole(s),c);}
- | LE() i=Integer() ar=AtomicRole() "." c=Concept()
+ | LE() i=Integer() ar=ObjectProperty() "." c=Concept()
{return new LessEqual(i,ar,c);}
}
@@ -254,14 +254,14 @@
}
}
-AtomicRole AtomicRole() :
+ObjectProperty ObjectProperty() :
{
String name;
}
{
(name=Id() | name=String())
{
- return new AtomicRole(getInternalURI(name));
+ return new ObjectProperty(getInternalURI(name));
}
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
