You can subscribe to this list here.
2007 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
(120) |
Sep
(36) |
Oct
(116) |
Nov
(17) |
Dec
(44) |
---|---|---|---|---|---|---|---|---|---|---|---|---|
2008 |
Jan
(143) |
Feb
(192) |
Mar
(74) |
Apr
(84) |
May
(105) |
Jun
(64) |
Jul
(49) |
Aug
(120) |
Sep
(159) |
Oct
(156) |
Nov
(51) |
Dec
(28) |
2009 |
Jan
(17) |
Feb
(55) |
Mar
(33) |
Apr
(57) |
May
(54) |
Jun
(28) |
Jul
(6) |
Aug
(16) |
Sep
(38) |
Oct
(30) |
Nov
(26) |
Dec
(52) |
2010 |
Jan
(7) |
Feb
(91) |
Mar
(65) |
Apr
(2) |
May
(14) |
Jun
(25) |
Jul
(38) |
Aug
(48) |
Sep
(80) |
Oct
(70) |
Nov
(75) |
Dec
(77) |
2011 |
Jan
(68) |
Feb
(53) |
Mar
(51) |
Apr
(35) |
May
(65) |
Jun
(101) |
Jul
(29) |
Aug
(230) |
Sep
(95) |
Oct
(49) |
Nov
(110) |
Dec
(63) |
2012 |
Jan
(41) |
Feb
(42) |
Mar
(25) |
Apr
(46) |
May
(51) |
Jun
(44) |
Jul
(45) |
Aug
(29) |
Sep
(12) |
Oct
(9) |
Nov
(17) |
Dec
(2) |
2013 |
Jan
(12) |
Feb
(14) |
Mar
(7) |
Apr
(16) |
May
(54) |
Jun
(27) |
Jul
(11) |
Aug
(5) |
Sep
(85) |
Oct
(27) |
Nov
(37) |
Dec
(32) |
2014 |
Jan
(8) |
Feb
(29) |
Mar
(5) |
Apr
(3) |
May
(22) |
Jun
(3) |
Jul
(4) |
Aug
(3) |
Sep
|
Oct
|
Nov
|
Dec
|
From: <ku...@us...> - 2008-02-13 10:09:55
|
Revision: 552 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=552&view=rev Author: kurzum Date: 2008-02-13 02:09:50 -0800 (Wed, 13 Feb 2008) Log Message: ----------- deleted daimler Removed Paths: ------------- trunk/examples/daimler/ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ku...@us...> - 2008-02-13 10:08:21
|
Revision: 551 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=551&view=rev Author: kurzum Date: 2008-02-13 02:08:17 -0800 (Wed, 13 Feb 2008) Log Message: ----------- arch Modified Paths: -------------- trunk/examples/arch/arch.conf Added Paths: ----------- trunk/examples/arch/arch_owl.conf Modified: trunk/examples/arch/arch.conf =================================================================== --- trunk/examples/arch/arch.conf 2008-02-12 20:08:48 UTC (rev 550) +++ trunk/examples/arch/arch.conf 2008-02-13 10:08:17 UTC (rev 551) @@ -16,15 +16,13 @@ * Copyright (C) 2007, Sebastian Hellmann */ -// search tree protocol -refinement.writeSearchTree = false; -refinement.searchTreeFile = "log/archSearchTree.txt"; + //export("arch.owl"); /** background knowledge **/ import("arch.kb"); -// import("arch.owl"); + /** examples **/ +c1 +c4 Added: trunk/examples/arch/arch_owl.conf =================================================================== --- trunk/examples/arch/arch_owl.conf (rev 0) +++ trunk/examples/arch/arch_owl.conf 2008-02-13 10:08:17 UTC (rev 551) @@ -0,0 +1,29 @@ +/** + * Arches Example + * + * Originally published in Winston, P.H. (1975). Learning structural descriptions + * from examples. In P.H. Winstons (Ed.), The psychology of computer vision. New + * York: Mc Graw- Hill. + * + * See the pictures for an illustration of the input data. + * + * The example is a converted, modified and extended version of the original + * learning problem. + * + * possible solution: + * EXISTS hasPillar.(freeStandingPillar AND EXISTS leftof.EXISTS supports.TOP) + * + * Copyright (C) 2007, Sebastian Hellmann + */ + + + +/** background knowledge **/ +import("arch.owl"); + +/** examples **/ ++c1 ++c4 +-c2 +-c3 +-c5 This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2008-02-12 20:08:52
|
Revision: 550 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=550&view=rev Author: jenslehmann Date: 2008-02-12 12:08:48 -0800 (Tue, 12 Feb 2008) Log Message: ----------- - support for object/datatype property domains/ranges in DL-Learner OWL core - carcinogenesis mapper extended Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java trunk/src/dl-learner/org/dllearner/core/owl/Description.java trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyDomainAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyRange.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyRangeAxiom.java Modified: trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java 2008-02-12 15:32:56 UTC (rev 549) +++ trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java 2008-02-12 20:08:48 UTC (rev 550) @@ -23,6 +23,6 @@ * @author Jens Lehmann * */ -public abstract class DataRange implements KBElement { +public abstract class DataRange implements PropertyRange { } Added: trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/Datatype.java 2008-02-12 20:08:48 UTC (rev 550) @@ -0,0 +1,70 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * Enumeration of possible types wrapped in a class such that + * it is a valid data range. + * + * @author Jens Lehmann + * + */ +public class Datatype extends DataRange { + + public enum Type { DOUBLE, INT, BOOLEAN }; + + private Type type; + + public Datatype(Type type) { + this.type = type; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#accept(org.dllearner.core.owl.KBElementVisitor) + */ + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + return 1; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + + /** + * @return the type + */ + public Type getType() { + return type; + } + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyDomainAxiom.java 2008-02-12 20:08:48 UTC (rev 550) @@ -0,0 +1,69 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * @author Jens Lehmann + * + */ +public class DatatypePropertyDomainAxiom extends PropertyDomainAxiom { + + public DatatypePropertyDomainAxiom(DatatypeProperty property, Description domain) { + super(property, domain); + } + + @Override + public DatatypeProperty getProperty() { + return (DatatypeProperty) property; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + return domain.getLength() + 2; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Axiom#accept(org.dllearner.core.owl.AxiomVisitor) + */ + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#accept(org.dllearner.core.owl.KBElementVisitor) + */ + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyRangeAxiom.java 2008-02-12 20:08:48 UTC (rev 550) @@ -0,0 +1,64 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * @author Jens Lehmann + * + */ +public class DatatypePropertyRangeAxiom extends PropertyRangeAxiom { + + public DatatypePropertyRangeAxiom(DatatypeProperty property, DataRange domain) { + super(property, domain); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + return range.getLength() + 2; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Axiom#accept(org.dllearner.core.owl.AxiomVisitor) + */ + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#accept(org.dllearner.core.owl.KBElementVisitor) + */ + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } + +} Modified: trunk/src/dl-learner/org/dllearner/core/owl/Description.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Description.java 2008-02-12 15:32:56 UTC (rev 549) +++ trunk/src/dl-learner/org/dllearner/core/owl/Description.java 2008-02-12 20:08:48 UTC (rev 550) @@ -10,7 +10,7 @@ * @author jl * */ -public abstract class Description implements Cloneable, KBElement { +public abstract class Description implements Cloneable, PropertyRange, KBElement { protected Description parent = null; protected List<Description> children = new LinkedList<Description>(); Modified: trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java 2008-02-12 15:32:56 UTC (rev 549) +++ trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java 2008-02-12 20:08:48 UTC (rev 550) @@ -27,6 +27,8 @@ */ public interface KBElementVisitor extends AxiomVisitor, DescriptionVisitor, PropertyExpressionVisitor { + void visit(Datatype datatype); + void visit(BooleanDataRange booleanDataRange); void visit(DoubleMaxValue doubleMaxValue); Added: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyDomainAxiom.java 2008-02-12 20:08:48 UTC (rev 550) @@ -0,0 +1,65 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * @author Jens Lehmann + * + */ +public class ObjectPropertyDomainAxiom extends PropertyDomainAxiom { + + public ObjectPropertyDomainAxiom(ObjectProperty property, Description domain) { + super(property, domain); + } + + @Override + public ObjectProperty getProperty() { + return (ObjectProperty) property; + } + + + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + return domain.getLength() + 2; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyRangeAxiom.java 2008-02-12 20:08:48 UTC (rev 550) @@ -0,0 +1,67 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * @author Jens Lehmann + * + */ +public class ObjectPropertyRangeAxiom extends PropertyRangeAxiom { + + + public ObjectPropertyRangeAxiom(ObjectProperty property, Description domain) { + super(property, domain); + } + + + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + return range.getLength() + 2; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Axiom#accept(org.dllearner.core.owl.AxiomVisitor) + */ + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#accept(org.dllearner.core.owl.KBElementVisitor) + */ + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } + +} Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java 2008-02-12 15:32:56 UTC (rev 549) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java 2008-02-12 20:08:48 UTC (rev 550) @@ -36,4 +36,12 @@ public void visit(TransitiveObjectPropertyAxiom axiom); public void visit(SubObjectPropertyAxiom axiom); + + void visit(DatatypePropertyDomainAxiom axiom); + + void visit(ObjectPropertyDomainAxiom axiom); + + void visit(DatatypePropertyRangeAxiom axiom); + + void visit(ObjectPropertyRangeAxiom axiom); } Added: trunk/src/dl-learner/org/dllearner/core/owl/PropertyDomainAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyDomainAxiom.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyDomainAxiom.java 2008-02-12 20:08:48 UTC (rev 550) @@ -0,0 +1,46 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * Axiom to specifiy the domain of a property. + * + * @author Jens Lehmann + * + */ +public abstract class PropertyDomainAxiom extends PropertyAxiom { + + Description domain; + Property property; + + public PropertyDomainAxiom(Property property, Description domain) { + this.property = property; + this.domain = domain; + } + + public Description getDomain() { + return domain; + } + + public Property getProperty() { + return property; + } + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/PropertyRange.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyRange.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyRange.java 2008-02-12 20:08:48 UTC (rev 550) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public interface PropertyRange extends KBElement { + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/PropertyRangeAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyRangeAxiom.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyRangeAxiom.java 2008-02-12 20:08:48 UTC (rev 550) @@ -0,0 +1,40 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public abstract class PropertyRangeAxiom extends PropertyAxiom { + + Property property; + PropertyRange range; + + public PropertyRangeAxiom(Property property, PropertyRange range) { + this.property = property; + this.range = range; + } + + public Property getProperty() { + return property; + } + +} Modified: trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java =================================================================== --- trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-02-12 15:32:56 UTC (rev 549) +++ trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-02-12 20:08:48 UTC (rev 550) @@ -28,6 +28,8 @@ import java.util.LinkedList; import java.util.List; import java.util.Map; +import java.util.Set; +import java.util.TreeSet; import org.dllearner.core.owl.NamedClass; import org.dllearner.core.owl.Axiom; @@ -39,6 +41,7 @@ import org.dllearner.core.owl.KB; import org.dllearner.core.owl.ObjectProperty; import org.dllearner.core.owl.ObjectPropertyAssertion; +import org.dllearner.core.owl.SubClassAxiom; import org.dllearner.parser.ParseException; import org.dllearner.parser.PrologParser; import org.dllearner.prolog.Atom; @@ -74,6 +77,14 @@ // mapping of symbols to names of chemical elements private static Map<String,String> chemElements; + // types of atoms and bonds + private static Set<String> atomTypes = new TreeSet<String>(); + private static Set<String> bondTypes = new TreeSet<String>(); + + // we need a counter for bonds, because they are instances in OWL + // but not in Prolog + private static int bondNr = 0; + /** * @param args * No arguments supported. @@ -120,13 +131,22 @@ } // prepare mapping + KB kb = new KB(); createChemElementsMapping(); + // create subclasses of atom + NamedClass atomClass = getAtomicConcept("Atom"); + for(String element : chemElements.values()) { + NamedClass elClass = getAtomicConcept(element); + SubClassAxiom sc = new SubClassAxiom(elClass, atomClass); + kb.addAxiom(sc); + } + // define properties including domain and range + // ... TODO ... // mapping clauses to axioms System.out.print("Mapping clauses to axioms ... "); startTime = System.nanoTime(); ArrayList<Clause> clauses = program.getClauses(); - KB kb = new KB(); for (Clause clause : clauses) { List<Axiom> axioms = mapClause(clause); for (Axiom axiom : axioms) @@ -153,8 +173,7 @@ // ArrayList<Literal> literals = body.getLiterals(); // handle: atm(compound,atom,element,atomtype,charge) if (headName.equals("atm")) { - // System.out.println(clause.toPLString()); - // System.out.println(clause); + String compoundName = head.getArgument(0).toPLString(); String atomName = head.getArgument(1).toPLString(); String elementName = head.getArgument(2).toPLString(); @@ -167,11 +186,47 @@ String atomClass = getAtomClass(elementName, type); ClassAssertionAxiom ca = getConceptAssertion(atomClass,atomName); axioms.add(ca); + // write subclass axiom if doesn't exist already + if(!atomTypes.contains(atomClass)) { + NamedClass subClass = getAtomicConcept(atomClass); + NamedClass superClass = getAtomicConcept(getFullElementName(elementName)); + SubClassAxiom sc = new SubClassAxiom(subClass, superClass); + axioms.add(sc); + atomTypes.add(atomClass); + } // charge of atom DatatypePropertyAssertion dpa = getDoubleDatatypePropertyAssertion(atomName, "charge", charge); axioms.add(dpa); + } else if(headName.equals("bond")) { + String compoundName = head.getArgument(0).toPLString(); + String atom1Name = head.getArgument(1).toPLString(); + String atom2Name = head.getArgument(2).toPLString(); + String bondType = head.getArgument(3).toPLString(); + String bondClass = "Bond-" + bondType; + String bondInstance = "bond" + bondNr; + ObjectPropertyAssertion op = getRoleAssertion("hasBond", compoundName, "bond" + bondNr); + axioms.add(op); + // make Bond-X subclass of Bond if that hasn't been done already + if(!bondTypes.contains(bondClass)) { + NamedClass subClass = getAtomicConcept(bondClass); + SubClassAxiom sc = new SubClassAxiom(subClass, getAtomicConcept("Bond")); + axioms.add(sc); + bondTypes.add(bondClass); + } + // make e.g. bond382 instance of Bond-3 + ClassAssertionAxiom ca = getConceptAssertion(bondClass, bondInstance); + axioms.add(ca); + bondNr++; + // connect atoms with bond + ObjectPropertyAssertion op1 = getRoleAssertion("inBond", bondInstance, atom1Name); + ObjectPropertyAssertion op2 = getRoleAssertion("inBond", bondInstance, atom2Name); + axioms.add(op1); + axioms.add(op2); } else { // print clauses which are not supported yet + System.out.println("unsupported clause"); + System.out.println(clause.toPLString()); + System.out.println(clause); } return axioms; } @@ -193,8 +248,8 @@ return new ObjectPropertyAssertion(ar,ind1,ind2); } - private static DoubleDatatypePropertyAssertion getDoubleDatatypePropertyAssertion(String datatypeProperty, String i, double value) { - Individual ind = getIndividual(i); + private static DoubleDatatypePropertyAssertion getDoubleDatatypePropertyAssertion(String individual, String datatypeProperty, double value) { + Individual ind = getIndividual(individual); DatatypeProperty dp = getDatatypeProperty(datatypeProperty); return new DoubleDatatypePropertyAssertion(dp,ind,value); } Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java 2008-02-12 15:32:56 UTC (rev 549) +++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java 2008-02-12 20:08:48 UTC (rev 550) @@ -26,12 +26,16 @@ import org.dllearner.core.owl.Axiom; import org.dllearner.core.owl.AxiomVisitor; import org.dllearner.core.owl.ClassAssertionAxiom; +import org.dllearner.core.owl.DatatypePropertyDomainAxiom; +import org.dllearner.core.owl.DatatypePropertyRangeAxiom; import org.dllearner.core.owl.DoubleDatatypePropertyAssertion; import org.dllearner.core.owl.EquivalentClassesAxiom; import org.dllearner.core.owl.FunctionalObjectPropertyAxiom; import org.dllearner.core.owl.InverseObjectPropertyAxiom; import org.dllearner.core.owl.KB; import org.dllearner.core.owl.ObjectPropertyAssertion; +import org.dllearner.core.owl.ObjectPropertyDomainAxiom; +import org.dllearner.core.owl.ObjectPropertyRangeAxiom; import org.dllearner.core.owl.SubClassAxiom; import org.dllearner.core.owl.SubObjectPropertyAxiom; import org.dllearner.core.owl.SymmetricObjectPropertyAxiom; @@ -232,6 +236,38 @@ addAxiom(axiomOWLAPI); } + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.DatatypePropertyDomainAxiom) + */ + public void visit(DatatypePropertyDomainAxiom datatypePropertyDomainAxiom) { + // TODO Auto-generated method stub + + } + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.ObjectPropertyDomainAxiom) + */ + public void visit(ObjectPropertyDomainAxiom objectPropertyDomainAxiom) { + // TODO Auto-generated method stub + + } + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.DatatypePropertyRangeAxiom) + */ + public void visit(DatatypePropertyRangeAxiom axiom) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.ObjectPropertyRangeAxiom) + */ + public void visit(ObjectPropertyRangeAxiom axiom) { + // TODO Auto-generated method stub + + } + + + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ton...@us...> - 2008-02-12 15:33:08
|
Revision: 549 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=549&view=rev Author: tonytacker Date: 2008-02-12 07:32:56 -0800 (Tue, 12 Feb 2008) Log Message: ----------- renamed class and more comments Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelAbstract.java Removed Paths: ------------- trunk/src/dl-learner/org/dllearner/gui/AbstractWidgetPanel.java Deleted: trunk/src/dl-learner/org/dllearner/gui/AbstractWidgetPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/AbstractWidgetPanel.java 2008-02-12 14:46:20 UTC (rev 548) +++ trunk/src/dl-learner/org/dllearner/gui/AbstractWidgetPanel.java 2008-02-12 15:32:56 UTC (rev 549) @@ -1,47 +0,0 @@ -package org.dllearner.gui; - -/** - * Copyright (C) 2007-2008, Jens Lehmann - * - * This file is part of DL-Learner. - * - * DL-Learner is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * DL-Learner is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -import javax.swing.JPanel; - -/** - * AbstractWidgetPanel - * - * @author Tilo Hielscher - */ -public abstract class AbstractWidgetPanel extends JPanel { - - /** - * Show label and tooltip. - */ - public abstract void showLabel(); - - /** - * Show textfield, setbutton and so on, make layout. - */ - public abstract void showThingToChange(); - - /** - * Set entry you got from showThingToChange(). - */ - public abstract void setEntry(); - -} Modified: trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java 2008-02-12 14:46:20 UTC (rev 548) +++ trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java 2008-02-12 15:32:56 UTC (rev 549) @@ -29,7 +29,7 @@ import java.util.Set; /** - * CheckBoxList is a list of CheckBox's + * CheckBoxList constitute a list of CheckBox's * * @author Tilo Hielscher */ @@ -41,7 +41,7 @@ private GridBagConstraints constraints = new GridBagConstraints(); /** - * get a JPanel + * Make a JPanel with GridBagLayout. */ public CheckBoxList() { checkBoxPanel.setLayout(gridbag); @@ -52,7 +52,9 @@ /** * Add new entry and make a new JCheckBox. * - * @param label This text will be shown. + * @param label + * This text will be shown. It is the name of new JCheckBox + * and will add to list. */ public void add(String label) { list.add(new JCheckBox(label)); @@ -75,7 +77,8 @@ /** * Select items. * - * @param selectionSet Is a Set of Strings. + * @param selectionSet + * Is a Set of Strings. */ public void setSelections(Set<String> selectionSet) { for (int i = 0; i < list.size(); i++) { Modified: trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java 2008-02-12 14:46:20 UTC (rev 548) +++ trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java 2008-02-12 15:32:56 UTC (rev 549) @@ -21,7 +21,7 @@ */ /** - * Start algorihtm in a new thread. + * Start algorithm in a new thread. * * @author Tilo Hielscher */ Copied: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelAbstract.java (from rev 548, trunk/src/dl-learner/org/dllearner/gui/AbstractWidgetPanel.java) =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelAbstract.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelAbstract.java 2008-02-12 15:32:56 UTC (rev 549) @@ -0,0 +1,47 @@ +package org.dllearner.gui; + +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +import javax.swing.JPanel; + +/** + * WidgetPanelAbstract defines all Widgets in an abstract way. + * + * @author Tilo Hielscher + */ +public abstract class WidgetPanelAbstract extends JPanel { + + /** + * Show label and tooltip. + */ + public abstract void showLabel(); + + /** + * Show textfield, setbutton and so on, make layout. + */ + public abstract void showThingToChange(); + + /** + * Set entry you got from showThingToChange(). + */ + public abstract void setEntry(); + +} Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-02-12 14:46:20 UTC (rev 548) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-02-12 15:32:56 UTC (rev 549) @@ -41,7 +41,7 @@ * * @author Tilo Hielscher */ -public class WidgetPanelBoolean extends AbstractWidgetPanel implements +public class WidgetPanelBoolean extends WidgetPanelAbstract implements ActionListener { private static final long serialVersionUID = -4800583253223939928L; Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java 2008-02-12 14:46:20 UTC (rev 548) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java 2008-02-12 15:32:56 UTC (rev 549) @@ -35,7 +35,7 @@ * @author Tilo Hielscher * */ -public class WidgetPanelDefault extends AbstractWidgetPanel { +public class WidgetPanelDefault extends WidgetPanelAbstract { private static final long serialVersionUID = 4059515858894036769L; Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java 2008-02-12 14:46:20 UTC (rev 548) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java 2008-02-12 15:32:56 UTC (rev 549) @@ -43,7 +43,7 @@ * @author Tilo Hielscher * */ -public class WidgetPanelDouble extends AbstractWidgetPanel implements +public class WidgetPanelDouble extends WidgetPanelAbstract implements ActionListener { private static final long serialVersionUID = 5238903690721116289L; Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-02-12 14:46:20 UTC (rev 548) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-02-12 15:32:56 UTC (rev 549) @@ -43,7 +43,7 @@ * @author Tilo Hielscher * */ -public class WidgetPanelInteger extends AbstractWidgetPanel implements +public class WidgetPanelInteger extends WidgetPanelAbstract implements ActionListener { private static final long serialVersionUID = -1802111225835164644L; Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java 2008-02-12 14:46:20 UTC (rev 548) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java 2008-02-12 15:32:56 UTC (rev 549) @@ -45,7 +45,7 @@ * @author Tilo Hielscher * */ -public class WidgetPanelString extends AbstractWidgetPanel implements +public class WidgetPanelString extends WidgetPanelAbstract implements ActionListener { private static final long serialVersionUID = -2169739820989891226L; Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-12 14:46:20 UTC (rev 548) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-12 15:32:56 UTC (rev 549) @@ -56,7 +56,7 @@ * @author Tilo Hielscher * */ -public class WidgetPanelStringSet extends AbstractWidgetPanel implements +public class WidgetPanelStringSet extends WidgetPanelAbstract implements ActionListener { private static final long serialVersionUID = 7832726987046601916L; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ton...@us...> - 2008-02-12 14:46:29
|
Revision: 548 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=548&view=rev Author: tonytacker Date: 2008-02-12 06:46:20 -0800 (Tue, 12 Feb 2008) Log Message: ----------- add/changed comments Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/AbstractWidgetPanel.java trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java trunk/src/dl-learner/org/dllearner/gui/Config.java trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java trunk/src/dl-learner/org/dllearner/gui/RunPanel.java trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java Modified: trunk/src/dl-learner/org/dllearner/gui/AbstractWidgetPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/AbstractWidgetPanel.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/AbstractWidgetPanel.java 2008-02-12 14:46:20 UTC (rev 548) @@ -26,24 +26,22 @@ * AbstractWidgetPanel * * @author Tilo Hielscher - * */ public abstract class AbstractWidgetPanel extends JPanel { - - /* - * show label and tooltip + /** + * Show label and tooltip. */ - protected abstract void showLabel(); + public abstract void showLabel(); - /* - * show textfield, setbutton and so on + /** + * Show textfield, setbutton and so on, make layout. */ - protected abstract void showThingToChange(); + public abstract void showThingToChange(); - /* - * set entry you got from showThingToChange() + /** + * Set entry you got from showThingToChange(). */ - protected abstract void setEntry(); - + public abstract void setEntry(); + } Modified: trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java 2008-02-12 14:46:20 UTC (rev 548) @@ -29,10 +29,8 @@ import java.util.Set; /** - * CheckBoxList + * CheckBoxList is a list of CheckBox's * - * a list of CheckBoxes - * * @author Tilo Hielscher */ public class CheckBoxList extends JPanel { Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-02-12 14:46:20 UTC (rev 548) @@ -20,209 +20,219 @@ * */ -import java.util.HashSet; -import java.util.Set; - import org.dllearner.core.ComponentManager; import org.dllearner.core.KnowledgeSource; +import org.dllearner.core.LearningProblem; +import org.dllearner.core.ReasoningService; import org.dllearner.core.LearningAlgorithm; -import org.dllearner.core.LearningProblem; import org.dllearner.core.ReasonerComponent; -import org.dllearner.core.ReasoningService; /** - * config + * Config save all together used variables: ComponentManager, KnowledgeSource, + * Reasoner, ReasoningService, LearningProblem, LearningAlgorithm; also inits of + * these components * - * this class save all together used variables - * * @author Tilo Hielscher - * */ - public class Config { private ComponentManager cm = ComponentManager.getInstance(); private KnowledgeSource source; private String uri; private ReasonerComponent reasoner; private ReasoningService rs; - private Set<String> posExampleSet = new HashSet<String>(); - private Set<String> negExampleSet = new HashSet<String>(); private LearningProblem lp; private LearningAlgorithm la; private boolean[] isInit = new boolean[4]; - protected ComponentManager getComponentManager() { - return cm; + /** + * Get ComponentManager. + * + * @return ComponentManager + */ + public ComponentManager getComponentManager() { + return this.cm; } - protected void setComponentManager(ComponentManager input) { - cm = input; + /** + * It is necessary for init KnowledgeSource. + * + * @return URI + */ + public String getURI() { + return this.uri; } - protected String getURI() { - return uri; + /** + * Set an URI. + * + * @param uri + * it's a Link like "http://example.com" or "file://myfile" + */ + public void setURI(String uri) { + this.uri = uri; } - protected void setURI(String input) { - uri = input; + /** + * Get Reasoner. + * + * @return reasoner + */ + public ReasonerComponent getReasoner() { + return this.reasoner; } - protected ReasonerComponent getReasoner() { - return reasoner; + /** + * Set Reasoner. + * + * @param reasoner + */ + public void setReasoner(ReasonerComponent reasoner) { + this.reasoner = reasoner; } - protected void setReasoner(ReasonerComponent input) { - reasoner = input; + /** + * Get ReasoningService. + * + * @return ReasoningService + */ + public ReasoningService getReasoningService() { + return this.rs; } - protected ReasoningService getReasoningService() { - return rs; + /** + * Set ReasoningService. + * + * @param reasoningService + */ + public void setReasoningService(ReasoningService reasoningService) { + this.rs = reasoningService; } - protected void setReasoningService(ReasoningService input) { - rs = input; + /** + * Get KnowledgeSource. + * + * @return KnowledgeSource + */ + public KnowledgeSource getKnowledgeSource() { + return this.source; } - protected KnowledgeSource getKnowledgeSource() { - return source; + /** + * Set KnowledgeSource. + * + * @param knowledgeSource + */ + public void setKnowledgeSource(KnowledgeSource knowledgeSource) { + this.source = knowledgeSource; } - protected void setKnowledgeSource(KnowledgeSource input) { - source = input; + /** + * Set LearningProblem. + * + * @param learningProblem + */ + public void setLearningProblem(LearningProblem learningProblem) { + this.lp = learningProblem; } - protected void setPosExampleSet(Set<String> posExampleSet) { - this.posExampleSet = posExampleSet; + /** + * Get LearningProblem. + * + * @return learningProblem + */ + public LearningProblem getLearningProblem() { + return this.lp; } - protected Set<String> getPosExampleSet() { - return this.posExampleSet; + /** + * Set LearningAlgorithm. + * + * @param learningAlgorithm + */ + public void setLearningAlgorithm(LearningAlgorithm learningAlgorithm) { + this.la = learningAlgorithm; } - protected void setNegExampleSet(Set<String> negExampleSet) { - this.negExampleSet = negExampleSet; + /** + * Get LearningAlgorithm. + * + * @return LearningAlgorithm + */ + public LearningAlgorithm getLearningAlgorithm() { + return this.la; } - protected Set<String> getNegExampleSet() { - return this.negExampleSet; - } - - protected void setLearningProblem(LearningProblem input) { - lp = input; - } - - protected LearningProblem getLearningProblem() { - return lp; - } - - protected void setLearningAlgorithm(LearningAlgorithm input) { - la = input; - } - - protected LearningAlgorithm getLearningAlgorithm() { - return la; - } - /** - * KnowledgeSource.init has run? return true, if it was + * KnowledgeSource.init has run? + * + * @return true, if init was made, false if not */ - protected boolean isInitKnowledgeSource() { + public boolean isInitKnowledgeSource() { return isInit[0]; } /** - * set true if you run KnowwledgeSource.init + * Set true if you run KnowwledgeSource.init. The inits from other tabs + * behind will automatic set to false. */ - protected void setInitKnowledgeSource(Boolean is) { + public void setInitKnowledgeSource(Boolean is) { isInit[0] = is; for (int i = 1; i < 4; i++) isInit[i] = false; } /** - * Reasoner.init has run? return true, if it was + * Reasoner.init has run? + * + * @return true, if init was made, false if not */ - protected boolean isInitReasoner() { + public boolean isInitReasoner() { return isInit[1]; } /** - * set true if you run Reasoner.init + * Set true if you run Reasoner.init. The inits from other tabs behind will + * automatic set to false. */ - protected void setInitReasoner(Boolean is) { + public void setInitReasoner(Boolean is) { isInit[1] = is; for (int i = 2; i < 4; i++) isInit[i] = false; } /** - * LearningProblem.init has run? return true, if it was + * LearningProblem.init has run? + * + * @return true, if init was made, false if not */ - protected boolean isInitLearningProblem() { + public boolean isInitLearningProblem() { return isInit[2]; } /** - * set true if you run LearningProblem.init + * Set true if you run LearningProblem.init. The inits from other tabs + * behind will automatic set to false. */ - protected void setInitLearningProblem(Boolean is) { + public void setInitLearningProblem(Boolean is) { isInit[2] = is; for (int i = 3; i < 4; i++) isInit[i] = false; } /** - * LearningAlgorithm.init() has run? return true, if it was + * LearningAlgorithm.init() has run? + * + * @return true, if init was made, false if not */ - protected boolean isInitLearningAlgorithm() { + public boolean isInitLearningAlgorithm() { return isInit[3]; } /** * set true if you run LearningAlgorithm.init */ - protected void setInitLearningAlgorithm(Boolean is) { + public void setInitLearningAlgorithm(Boolean is) { isInit[3] = is; } - @Deprecated - protected void autoInit() { - // Knowledge Source - if (!this.isInitKnowledgeSource() && this.getKnowledgeSource() != null - && this.getURI() != null) { - this.getKnowledgeSource().init(); - this.setInitKnowledgeSource(true); - System.out.println("init KnowledgeSource"); - } - // Reasoner - if (!this.isInitReasoner() && this.getKnowledgeSource() != null - && this.getReasoner() != null) { - this.getReasoner().init(); - System.out.println("init Reasoner"); - // set ReasoningService - this.setReasoningService(this.getComponentManager() - .reasoningService(this.getReasoner())); - System.out.println("init ReasoningService"); - this.setInitReasoner(true); - } - // Learning Problem - if (!this.isInitLearningProblem() && this.getReasoner() != null - && this.getLearningProblem() != null) { - this.getComponentManager().applyConfigEntry( - this.getLearningProblem(), "negativeExamples", - this.getNegExampleSet()); - this.getLearningProblem().init(); - this.setInitLearningProblem(true); - System.out.println("init LearningProblem"); - } - // Learning Algorithm - if (!this.isInitLearningAlgorithm() - && this.getLearningProblem() != null - && this.getLearningAlgorithm() != null) { - this.getLearningAlgorithm().init(); - System.out.println("init LearningAlgorithm"); - } - - } - } Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-02-12 14:46:20 UTC (rev 548) @@ -28,10 +28,10 @@ import org.dllearner.core.KnowledgeSource; /** - * KnowledgeSourcePanel + * KnowledgeSourcePanel, tab 1. Choose Source, change Options and final initiate + * KnowledgeSource. * * @author Tilo Hielscher - * */ public class KnowledgeSourcePanel extends JPanel implements ActionListener { Modified: trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-12 14:46:20 UTC (rev 548) @@ -29,10 +29,10 @@ import org.dllearner.core.LearningAlgorithm; /** - * LearningAlgorithmPanel + * LearningAlgorithmPanel, tab 4. Choose LearningAlgorithm, change Options and + * final initiate LearningAlgorithm. * * @author Tilo Hielscher - * */ public class LearningAlgorithmPanel extends JPanel implements ActionListener { Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-12 14:46:20 UTC (rev 548) @@ -28,7 +28,8 @@ import org.dllearner.core.LearningProblem; /** - * LearningProblemPanel + * LearningProblemPanel tab 3. Choose LearingProblem, change Options and final + * initiate LearningProblem. * * @author Tilo Hielscher */ Modified: trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/OptionPanel.java 2008-02-12 14:46:20 UTC (rev 548) @@ -35,7 +35,7 @@ import org.dllearner.core.config.*; /** - * OptionPanel + * OptionPanel reads all possible options and use all widgets. Definition map is here. * * @author Tilo Hielscher * Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-02-12 14:46:20 UTC (rev 548) @@ -30,10 +30,10 @@ import org.dllearner.core.ReasonerComponent; /** - * ReasonerPanel + * ReasonerPanel, tab 2. Choose Resoner, change Options and final initiate + * Reasoner and ReasoningService. * * @author Tilo Hielscher - * */ public class ReasonerPanel extends JPanel implements ActionListener { Modified: trunk/src/dl-learner/org/dllearner/gui/RunPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-02-12 14:46:20 UTC (rev 548) @@ -29,7 +29,7 @@ // import org.dllearner.core.dl.Concept; /** - * OutputPanel + * RunPanel let algorithm start and stop and show informations about. * * @author Tilo Hielscher * Modified: trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/ThreadRun.java 2008-02-12 14:46:20 UTC (rev 548) @@ -21,7 +21,7 @@ */ /** - * threadRun + * Start algorihtm in a new thread. * * @author Tilo Hielscher */ @@ -33,13 +33,18 @@ this.config = config; } - // method to start thread + /** + * method to start thread + */ @Override public void run() { if (config.getLearningAlgorithm() != null) config.getLearningAlgorithm().start(); } + /** + * stop thread + */ public void exit() { if (config.getLearningAlgorithm() != null) config.getLearningAlgorithm().stop(); Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-02-12 14:46:20 UTC (rev 548) @@ -36,10 +36,10 @@ import org.dllearner.core.config.InvalidConfigOptionValueException; /** - * WidgetPanelInteger + * Panel for option Boolean, defined in + * org.dllearner.core.config.BooleanConfigOption. * * @author Tilo Hielscher - * */ public class WidgetPanelBoolean extends AbstractWidgetPanel implements ActionListener { @@ -69,23 +69,19 @@ add(widgetPanel, BorderLayout.CENTER); } - public JPanel getPanel() { - return this; - } - public void actionPerformed(ActionEvent e) { setEntry(); } @Override - protected void showLabel() { + public void showLabel() { nameLabel = new JLabel(configOption.getName()); nameLabel.setToolTipText(configOption.getDescription()); widgetPanel.add(nameLabel); } @Override - protected void showThingToChange() { + public void showThingToChange() { if (component != null) { // BooleanConfigOption if (configOption.getClass().toString().contains( @@ -127,7 +123,7 @@ } @Override - protected void setEntry() { + public void setEntry() { BooleanConfigOption specialOption; if (cb.getSelectedIndex() == 0) value = false; Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDefault.java 2008-02-12 14:46:20 UTC (rev 548) @@ -30,7 +30,7 @@ import org.dllearner.core.config.ConfigOption; /** - * WidgetPanelDefault + * Panel for not defined options. * * @author Tilo Hielscher * @@ -55,14 +55,14 @@ } @Override - protected void showLabel() { + public void showLabel() { nameLabel = new JLabel(configOption.getName()); nameLabel.setToolTipText(configOption.getDescription()); widgetPanel.add(nameLabel); } @Override - protected void showThingToChange() { + public void showThingToChange() { JLabel notImplementedLabel = new JLabel(configOption.getClass() .getSimpleName() + " not implemented"); @@ -72,7 +72,7 @@ } @Override - protected void setEntry() { + public void setEntry() { } } Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelDouble.java 2008-02-12 14:46:20 UTC (rev 548) @@ -37,7 +37,8 @@ import org.dllearner.core.config.InvalidConfigOptionValueException; /** - * WidgetPanelDouble + * Panel for option Double, defined in + * org.dllearner.core.config.DoubleConfigOption. * * @author Tilo Hielscher * @@ -70,10 +71,6 @@ add(widgetPanel, BorderLayout.CENTER); } - public JPanel getPanel() { - return this; - } - public void actionPerformed(ActionEvent e) { if (e.getSource() == setButton) { setEntry(); @@ -81,14 +78,14 @@ } @Override - protected void showLabel() { + public void showLabel() { nameLabel = new JLabel(configOption.getName()); nameLabel.setToolTipText(configOption.getDescription()); widgetPanel.add(nameLabel); } @Override - protected void showThingToChange() { + public void showThingToChange() { if (component != null) { // DoubleConfigOption if (configOption.getClass().toString().contains( @@ -128,7 +125,7 @@ } @Override - protected void setEntry() { + public void setEntry() { DoubleConfigOption specialOption; value = Double.parseDouble(doubleField.getText()); // get from input specialOption = (DoubleConfigOption) config.getComponentManager() Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelInteger.java 2008-02-12 14:46:20 UTC (rev 548) @@ -37,7 +37,8 @@ import org.dllearner.core.config.InvalidConfigOptionValueException; /** - * WidgetPanelInteger + * Panel for option Integer, defined in + * org.dllearner.core.config.IntegerConfigOption. * * @author Tilo Hielscher * @@ -71,10 +72,6 @@ add(widgetPanel, BorderLayout.CENTER); } - public JPanel getPanel() { - return this; - } - public void actionPerformed(ActionEvent e) { if (e.getSource() == setButton) { setEntry(); @@ -82,14 +79,14 @@ } @Override - protected void showLabel() { + public void showLabel() { nameLabel = new JLabel(configOption.getName()); nameLabel.setToolTipText(configOption.getDescription()); widgetPanel.add(nameLabel); } @Override - protected void showThingToChange() { + public void showThingToChange() { if (component != null) { // IntegerConfigOption if (configOption.getClass().toString().contains( @@ -129,7 +126,7 @@ } @Override - protected void setEntry() { + public void setEntry() { IntegerConfigOption specialOption; value = Integer.parseInt(integerField.getText()); // get from input specialOption = (IntegerConfigOption) config.getComponentManager() Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelString.java 2008-02-12 14:46:20 UTC (rev 548) @@ -39,7 +39,8 @@ import org.dllearner.core.config.InvalidConfigOptionValueException; /** - * WidgetPanelString + * Panel for option String, defined in + * org.dllearner.core.config.StringConfigOption. * * @author Tilo Hielscher * @@ -72,10 +73,6 @@ add(widgetPanel, BorderLayout.CENTER); } - public JPanel getPanel() { - return this; - } - public void actionPerformed(ActionEvent e) { if (e.getSource() == setButton) { if (checkForFilename()) { @@ -86,7 +83,7 @@ value = fc.getSelectedFile().toString(); stringField.setText(value); config.setURI(value); // save variable - System.out.println("value: " + config.getURI()); + System.out.println("value: " + config.getURI()); } } setEntry(); @@ -100,14 +97,14 @@ } @Override - protected void showLabel() { + public void showLabel() { nameLabel = new JLabel(configOption.getName()); nameLabel.setToolTipText(configOption.getDescription()); widgetPanel.add(nameLabel); } @Override - protected void showThingToChange() { + public void showThingToChange() { if (component != null) { // StringConfigOption if (configOption.getClass().toString().contains( @@ -149,7 +146,7 @@ } @Override - protected void setEntry() { + public void setEntry() { StringConfigOption specialOption; value = stringField.getText(); // get from input specialOption = (StringConfigOption) config.getComponentManager() Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-12 12:10:53 UTC (rev 547) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-12 14:46:20 UTC (rev 548) @@ -47,8 +47,12 @@ import org.dllearner.core.owl.ObjectProperty; /** - * WidgetPanelStringSet + * Panel for option StringSet, defined in + * org.dllearner.core.config.StringSetConfigOption. * + * There are 2 layouts defined. First for normal option and a second for special + * options. Second layout shows a list of JCheckBox's. + * * @author Tilo Hielscher * */ @@ -141,7 +145,7 @@ } @Override - protected void showLabel() { + public void showLabel() { nameLabel = new JLabel(configOption.getName()); nameLabel.setToolTipText(configOption.getDescription()); buildConstraints(constraints, 0, 0, 1, 1, 100, 100); @@ -152,7 +156,7 @@ @SuppressWarnings("unchecked") @Override - protected void showThingToChange() { + public void showThingToChange() { if (component != null) { // StringSetConfigOption if (configOption.getClass().toString().contains( @@ -272,7 +276,7 @@ } @Override - protected void setEntry() { + public void setEntry() { StringSetConfigOption specialOption; specialOption = (StringSetConfigOption) config.getComponentManager() .getConfigOption(componentOption, configOption.getName()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2008-02-12 12:10:58
|
Revision: 547 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=547&view=rev Author: jenslehmann Date: 2008-02-12 04:10:53 -0800 (Tue, 12 Feb 2008) Log Message: ----------- - another visitor for arbitrary elements of a knowledge base - implemented export of double data type assertion using OWL API - marker interface for named elements of a knowledge base Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Individual.java trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/KB.java trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java trunk/src/dl-learner/org/dllearner/core/owl/Negation.java trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Thing.java trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Union.java trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/core/owl/NamedKBElement.java Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2008-02-12 12:10:53 UTC (rev 547) @@ -4,6 +4,7 @@ import org.dllearner.core.owl.Description; import org.dllearner.core.owl.DescriptionVisitor; +import org.dllearner.core.owl.KBElementVisitor; public class ADC extends Description { @@ -39,4 +40,8 @@ visitor.visit(this); } + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -1,5 +1,5 @@ package org.dllearner.core.owl; public abstract class AssertionalAxiom extends Axiom { - + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -7,4 +7,5 @@ return toString(null, null); } + public abstract void accept(AxiomVisitor visitor); } Modified: trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java 2008-02-12 12:10:53 UTC (rev 547) @@ -27,7 +27,5 @@ * */ public interface AxiomVisitor extends AssertionalAxiomVisitor, PropertyAxiomVisitor, TerminologicalAxiomVisitor { - - } Modified: trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java 2008-02-12 12:10:53 UTC (rev 547) @@ -19,10 +19,47 @@ */ package org.dllearner.core.owl; +import java.util.Map; + /** + * Allows to specify the value of a boolean datatype restriction, + * e.g. ChemicalSubstance AND EXISTS acidTest = true + * * @author Jens Lehmann * */ public class BooleanDataRange extends DataRange { + private boolean isTrue; + + public BooleanDataRange(boolean isTrue) { + this.isTrue = isTrue; + } + + /** + * @return The boolean value of this restriction. + */ + public boolean isTrue() { + return isTrue; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + // length is 1, because we have either true or false + return 1; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -53,4 +53,13 @@ public String toString(String baseURI, Map<String,String> prefixes) { return concept.toString(baseURI, prefixes) + "(" + individual + ")"; } + + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java 2008-02-12 12:10:53 UTC (rev 547) @@ -23,6 +23,6 @@ * @author Jens Lehmann * */ -public abstract class DataRange { +public abstract class DataRange implements KBElement { } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -52,12 +52,12 @@ return null; } - /* (non-Javadoc) - * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) - */ @Override public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -52,11 +52,12 @@ return null; } - /* (non-Javadoc) - * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) - */ @Override public void accept(DescriptionVisitor visitor) { visitor.visit(this); - } + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -59,4 +59,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2008-02-12 12:10:53 UTC (rev 547) @@ -27,7 +27,7 @@ * @author Jens Lehmann * */ -public class DatatypeProperty extends PropertyExpression implements Property { +public class DatatypeProperty extends PropertyExpression implements Property, NamedKBElement { protected String name; @@ -42,6 +42,10 @@ return 1; } + public String getName() { + return name; + } + /* (non-Javadoc) * @see org.dllearner.core.dl.KBElement#toString(java.lang.String, java.util.Map) */ @@ -49,4 +53,7 @@ return Helper.getAbbreviatedString(name, baseURI, prefixes); } + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -66,5 +66,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } - + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -32,4 +32,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2008-02-12 12:10:53 UTC (rev 547) @@ -33,9 +33,7 @@ super(datatypeProperty, individual); this.value = value; } - - /* (non-Javadoc) * @see org.dllearner.core.dl.KBElement#toString(java.lang.String, java.util.Map) */ @@ -47,4 +45,12 @@ return value; } + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2008-02-12 12:10:53 UTC (rev 547) @@ -19,6 +19,8 @@ */ package org.dllearner.core.owl; +import java.util.Map; + /** * Double data range restricted by a maximum value, e.g. * hasAge <= 65. @@ -40,5 +42,24 @@ public double getValue() { return value; } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + return 2; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2008-02-12 12:10:53 UTC (rev 547) @@ -19,6 +19,8 @@ */ package org.dllearner.core.owl; +import java.util.Map; + /** * Double data range restricted by a maximum value, e.g. * hasAge >= 18. @@ -39,6 +41,24 @@ */ public double getValue() { return value; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + return 2; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; } + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -27,4 +27,13 @@ public String toString(String baseURI, Map<String,String> prefixes) { return concept1.toString(baseURI, prefixes) + " = " + concept2.toString(baseURI, prefixes); } + + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -21,4 +21,13 @@ public String toString(String baseURI, Map<String,String> prefixes) { return "Functional(" + role.toString(baseURI, prefixes) + ")"; } + + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Individual.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Individual.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/Individual.java 2008-02-12 12:10:53 UTC (rev 547) @@ -29,7 +29,7 @@ * @author Jens Lehmann * */ -public class Individual implements KBElement, Comparable<Individual> { +public class Individual implements NamedKBElement, Comparable<Individual> { private String name; @@ -62,5 +62,9 @@ public String toString(String baseURI, Map<String,String> prefixes) { return Helper.getAbbreviatedString(name, baseURI, prefixes); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java 2008-02-12 12:10:53 UTC (rev 547) @@ -62,4 +62,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -27,4 +27,13 @@ public String toString(String baseURI, Map<String,String> prefixes) { return "Inverse(" + inverseRole + "," + role.toString(baseURI, prefixes) + ")"; } + + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/KB.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/KB.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/KB.java 2008-02-12 12:10:53 UTC (rev 547) @@ -223,4 +223,8 @@ return (abox.size() + tbox.size() + rbox.size()); } + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java 2008-02-12 12:10:53 UTC (rev 547) @@ -13,4 +13,6 @@ public int getLength(); public String toString(String baseURI, Map<String,String> prefixes); + + public void accept(KBElementVisitor visitor); } Modified: trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java 2008-02-12 12:10:53 UTC (rev 547) @@ -27,4 +27,14 @@ */ public interface KBElementVisitor extends AxiomVisitor, DescriptionVisitor, PropertyExpressionVisitor { + void visit(BooleanDataRange booleanDataRange); + + void visit(DoubleMaxValue doubleMaxValue); + + void visit(DoubleMinValue doubleMinValue); + + void visit(Individual individual); + + void visit(KB kb); + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java 2008-02-12 12:10:53 UTC (rev 547) @@ -30,7 +30,7 @@ * @author Jens Lehmann * */ -public class NamedClass extends Description { +public class NamedClass extends Description implements NamedKBElement { String name; @@ -66,5 +66,9 @@ @Override public void accept(DescriptionVisitor visitor) { visitor.visit(this); - } + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Added: trunk/src/dl-learner/org/dllearner/core/owl/NamedKBElement.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/NamedKBElement.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/NamedKBElement.java 2008-02-12 12:10:53 UTC (rev 547) @@ -0,0 +1,33 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * Marker interface for those OWL elements, which have a name, e.g. + * the name of an individual, an object property, a data type property + * or a named class. + * + * @author Jens Lehmann + * + */ +public interface NamedKBElement extends KBElement { + + public String getName(); +} Modified: trunk/src/dl-learner/org/dllearner/core/owl/Negation.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Negation.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/Negation.java 2008-02-12 12:10:53 UTC (rev 547) @@ -38,4 +38,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java 2008-02-12 12:10:53 UTC (rev 547) @@ -34,4 +34,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -102,5 +102,9 @@ @Override public void accept(DescriptionVisitor visitor) { visitor.visit(this); - } + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -47,4 +47,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -24,4 +24,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -24,4 +24,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java 2008-02-12 12:10:53 UTC (rev 547) @@ -30,7 +30,7 @@ * @author Jens Lehmann * */ -public class ObjectProperty extends ObjectPropertyExpression implements Property { +public class ObjectProperty extends ObjectPropertyExpression implements Property, NamedKBElement { public ObjectProperty(String name) { super(name); @@ -48,4 +48,8 @@ public String toString(String baseURI, Map<String,String> prefixes) { return Helper.getAbbreviatedString(name, baseURI, prefixes); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2008-02-12 12:10:53 UTC (rev 547) @@ -51,6 +51,11 @@ public ObjectProperty getRole() { return role; } + + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } public int getLength() { return 2 + role.getLength(); @@ -59,4 +64,8 @@ public String toString(String baseURI, Map<String,String> prefixes) { return role.toString(baseURI, prefixes) + "(" + individual1.toString(baseURI, prefixes) + "," + individual2.toString(baseURI, prefixes) +")"; } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java 2008-02-12 12:10:53 UTC (rev 547) @@ -49,4 +49,8 @@ public String toString(String baseURI, Map<String,String> prefixes) { return Helper.getAbbreviatedString(name, baseURI, prefixes) + "-"; } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -104,4 +104,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java 2008-02-12 12:10:53 UTC (rev 547) @@ -20,6 +20,9 @@ package org.dllearner.core.owl; /** + * Restricts the value of an object property to a single individual + * (corresponds to owl:hasValue). + * * @author Jens Lehmann * */ @@ -33,4 +36,7 @@ visitor.visit(this); } + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -1,5 +1,5 @@ package org.dllearner.core.owl; public abstract class PropertyAxiom extends Axiom { - + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java 2008-02-12 12:10:53 UTC (rev 547) @@ -34,4 +34,6 @@ public void visit(SymmetricObjectPropertyAxiom axiom); public void visit(TransitiveObjectPropertyAxiom axiom); + + public void visit(SubObjectPropertyAxiom axiom); } Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -27,4 +27,13 @@ public String toString(String baseURI, Map<String,String> prefixes) { return subConcept.toString(baseURI, prefixes) + " SUBCONCEPTOF " + superConcept.toString(baseURI, prefixes); } + + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -26,5 +26,14 @@ public String toString(String baseURI, Map<String,String> prefixes) { return "Subrole(" + subRole.toString(baseURI, prefixes) + "," + role.toString(baseURI, prefixes) + ")"; - } + } + + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -20,5 +20,14 @@ public String toString(String baseURI, Map<String,String> prefixes) { return "Symmetric(" + role.toString(baseURI, prefixes) + ")"; + } + + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -1,5 +1,5 @@ package org.dllearner.core.owl; public abstract class TerminologicalAxiom extends Axiom { - + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Thing.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Thing.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/Thing.java 2008-02-12 12:10:53 UTC (rev 547) @@ -32,4 +32,8 @@ public void accept(DescriptionVisitor visitor) { visitor.visit(this); } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java 2008-02-12 12:10:53 UTC (rev 547) @@ -21,4 +21,13 @@ public String toString(String baseURI, Map<String,String> prefixes) { return "Transitive(" + role.toString(baseURI, prefixes) + ")"; } + + @Override + public void accept(AxiomVisitor visitor) { + visitor.visit(this); + } + + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Union.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Union.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/core/owl/Union.java 2008-02-12 12:10:53 UTC (rev 547) @@ -65,4 +65,7 @@ visitor.visit(this); } + public void accept(KBElementVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java 2008-02-12 12:10:53 UTC (rev 547) @@ -23,6 +23,7 @@ import java.util.HashSet; import java.util.Set; +import org.dllearner.core.owl.Axiom; import org.dllearner.core.owl.AxiomVisitor; import org.dllearner.core.owl.ClassAssertionAxiom; import org.dllearner.core.owl.DoubleDatatypePropertyAssertion; @@ -32,17 +33,22 @@ import org.dllearner.core.owl.KB; import org.dllearner.core.owl.ObjectPropertyAssertion; import org.dllearner.core.owl.SubClassAxiom; +import org.dllearner.core.owl.SubObjectPropertyAxiom; import org.dllearner.core.owl.SymmetricObjectPropertyAxiom; import org.dllearner.core.owl.TransitiveObjectPropertyAxiom; import org.semanticweb.owl.model.AddAxiom; import org.semanticweb.owl.model.OWLAxiom; import org.semanticweb.owl.model.OWLDataFactory; +import org.semanticweb.owl.model.OWLDataProperty; +import org.semanticweb.owl.model.OWLDataType; import org.semanticweb.owl.model.OWLDescription; import org.semanticweb.owl.model.OWLIndividual; import org.semanticweb.owl.model.OWLObjectProperty; import org.semanticweb.owl.model.OWLOntology; import org.semanticweb.owl.model.OWLOntologyChangeException; import org.semanticweb.owl.model.OWLOntologyManager; +import org.semanticweb.owl.model.OWLTypedConstant; +import org.semanticweb.owl.vocab.XSDVocabulary; // static import for easy access to the description converter import static org.dllearner.reasoning.OWLAPIDescriptionConvertVisitor.getOWLDescription; @@ -71,11 +77,14 @@ } public static void fillOWLOntology(OWLOntologyManager manager, OWLOntology ontology, KB kb) { - // OWLAPIAxiomConvertVisitor converter = new OWLAPIAxiomConvertVisitor(manager, ontology, kb); - // for(Axiom axiom : kb.getTbox()) - // axiom.accept(this); - // return converter.getOWLDescription(); - } + OWLAPIAxiomConvertVisitor converter = new OWLAPIAxiomConvertVisitor(manager, ontology, kb); + for(Axiom axiom : kb.getTbox()) + axiom.accept(converter); + for(Axiom axiom : kb.getRbox()) + axiom.accept(converter); + for(Axiom axiom : kb.getAbox()) + axiom.accept(converter); + } // convencience function for adding an axiom to the ontology private void addAxiom(OWLAxiom axiom) { @@ -122,8 +131,13 @@ * @see org.dllearner.core.owl.AssertionalAxiomVisitor#visit(org.dllearner.core.owl.DoubleDatatypePropertyAssertion) */ public void visit(DoubleDatatypePropertyAssertion axiom) { - // TODO Auto-generated method stub - + OWLIndividual i = factory.getOWLIndividual(URI.create(axiom.getIndividual().getName())); + OWLDataProperty dp = factory.getOWLDataProperty(URI.create(axiom.getDatatypeProperty().getName())); + Double value = axiom.getValue(); + OWLDataType doubleType = factory.getOWLDataType(XSDVocabulary.DOUBLE.getURI()); + OWLTypedConstant valueConstant = factory.getOWLTypedConstant(value.toString(), doubleType); + OWLAxiom axiomOWLAPI = factory.getOWLDataPropertyAssertionAxiom(i, dp, valueConstant); + addAxiom(axiomOWLAPI); } /* @@ -176,6 +190,18 @@ addAxiom(axiomOWLAPI); } + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.SubObjectPropertyAxiom) + */ + public void visit(SubObjectPropertyAxiom axiom) { + OWLObjectProperty role = factory.getOWLObjectProperty( + URI.create(((SubObjectPropertyAxiom) axiom).getRole().getName())); + OWLObjectProperty subRole = factory.getOWLObjectProperty( + URI.create(((SubObjectPropertyAxiom) axiom).getSubRole().getName())); + OWLAxiom axiomOWLAPI = factory.getOWLSubObjectPropertyAxiom(subRole, role); + addAxiom(axiomOWLAPI); + } + /* * (non-Javadoc) * @@ -206,4 +232,6 @@ addAxiom(axiomOWLAPI); } + + } Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java =================================================================== --- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-02-12 11:36:32 UTC (rev 546) +++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-02-12 12:10:53 UTC (rev 547) @@ -532,7 +532,8 @@ OWLOntology ontology; try { ontology = manager.createOntology(ontologyURI); - OWLAPIReasoner.fillOWLAPIOntology(manager, ontology, kb); + // OWLAPIReasoner.fillOWLAPIOntology(manager, ontology, kb); + OWLAPIAxiomConvertVisitor.fillOWLOntology(manager, ontology, kb); manager.saveOntology(ontology); } catch (OWLOntologyCreationException e) { // TODO Auto-generated catch block This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ton...@us...> - 2008-02-12 11:36:36
|
Revision: 546 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=546&view=rev Author: tonytacker Date: 2008-02-12 03:36:32 -0800 (Tue, 12 Feb 2008) Log Message: ----------- add an icon Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/gui/icon.gif trunk/src/dl-learner/org/dllearner/gui/package.html Modified: trunk/src/dl-learner/org/dllearner/gui/StartGUI.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-02-12 09:20:06 UTC (rev 545) +++ trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-02-12 11:36:32 UTC (rev 546) @@ -57,11 +57,14 @@ private JMenuItem saveItem = new JMenuItem("Save Config"); public StartGUI() { - this.setTitle("DL-Learner GUI"); + this.setTitle("DL-Learner"); this.setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE); this.setLocationByPlatform(true); this.setSize(800, 600); - + + // set icon + setIconImage(java.awt.Toolkit.getDefaultToolkit().getImage(this.getClass().getResource("icon.gif"))); + tab0 = new KnowledgeSourcePanel(config, this); tab1 = new ReasonerPanel(config, this); tab2 = new LearningProblemPanel(config, this); Added: trunk/src/dl-learner/org/dllearner/gui/icon.gif =================================================================== (Binary files differ) Property changes on: trunk/src/dl-learner/org/dllearner/gui/icon.gif ___________________________________________________________________ Name: svn:mime-type + application/octet-stream Added: trunk/src/dl-learner/org/dllearner/gui/package.html =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/package.html (rev 0) +++ trunk/src/dl-learner/org/dllearner/gui/package.html 2008-02-12 11:36:32 UTC (rev 546) @@ -0,0 +1,7 @@ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN"> +<html> +<head></head> +<body bgcolor="white"> +<p>Classes for generating a Graphical User Interface for DL-Learner.</p> +</body> +</html> \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2008-02-12 09:20:08
|
Revision: 545 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=545&view=rev Author: jenslehmann Date: 2008-02-12 01:20:06 -0800 (Tue, 12 Feb 2008) Log Message: ----------- - added more OWL structures, in particular datatype some-restrictions and data ranges - continued visitor pattern - implemented DL-Learner to OWL API converter using visitors Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/Description.java trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java trunk/src/dl-learner/org/dllearner/core/owl/Negation.java trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectQuantorRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/Thing.java trunk/src/dl-learner/org/dllearner/core/owl/Union.java trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/package.html trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeQuantorRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DoubleDataRange.java trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpression.java trunk/src/dl-learner/org/dllearner/core/owl/QuantorRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/Restriction.java trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIDescriptionConvertVisitor.java Removed Paths: ------------- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIConverterVisitor.java Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2008-02-12 09:20:06 UTC (rev 545) @@ -3,6 +3,7 @@ import java.util.Map; import org.dllearner.core.owl.Description; +import org.dllearner.core.owl.DescriptionVisitor; public class ADC extends Description { @@ -29,4 +30,13 @@ public int getArity() { return 0; } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } + } Added: trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/BooleanDataRange.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public class BooleanDataRange extends DataRange { + +} Modified: trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -23,6 +23,6 @@ * @author Jens Lehmann * */ -public abstract class CardinalityRestriction extends Description { +public abstract class CardinalityRestriction extends Restriction { } Added: trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DataRange.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public abstract class DataRange { + +} Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -51,5 +51,13 @@ // TODO Auto-generated method stub return null; } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -52,4 +52,11 @@ return null; } + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -52,4 +52,11 @@ return null; } + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2008-02-12 09:20:06 UTC (rev 545) @@ -27,7 +27,7 @@ * @author Jens Lehmann * */ -public class DatatypeProperty implements Property { +public class DatatypeProperty extends PropertyExpression implements Property { protected String name; Added: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeQuantorRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeQuantorRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeQuantorRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public abstract class DatatypeQuantorRestriction extends QuantorRestriction { + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeSomeRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,70 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * This class represents restrictions on datatypes, such as + * Man AND EXISTS hasAge >= 18. + * + * TODO: connect this with a data range and a datatype property + * + * @author Jens Lehmann + * + */ +public class DatatypeSomeRestriction extends DatatypeQuantorRestriction { + + + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#getArity() + */ + @Override + public int getArity() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } + +} Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -25,4 +25,11 @@ */ public class DatatypeValueRestriction extends ValueRestriction { + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Description.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Description.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/Description.java 2008-02-12 09:20:06 UTC (rev 545) @@ -274,5 +274,6 @@ public String toString() { return toString(null, null); } - + + public abstract void accept(DescriptionVisitor visitor); } Modified: trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java 2008-02-12 09:20:06 UTC (rev 545) @@ -19,6 +19,8 @@ */ package org.dllearner.core.owl; +import org.dllearner.algorithms.gp.ADC; + /** * Visitor for elements in complex class descriptions (it supports * the currently relevant ones - needs to be extended when further @@ -28,13 +30,19 @@ * */ public interface DescriptionVisitor { - + + public void visit(NamedClass description); + + public void visit(ADC description); + public void visit(Negation description); public void visit(ObjectAllRestriction description); public void visit(ObjectSomeRestriction description); + public void visit(DatatypeSomeRestriction description); + public void visit(Nothing description); public void visit(Thing description); @@ -51,5 +59,12 @@ public void visit(ObjectValueRestriction description); + public void visit(DatatypeMinCardinalityRestriction description); + + public void visit(DatatypeExactCardinalityRestriction description); + + public void visit(DatatypeMaxCardinalityRestriction description); + public void visit(DatatypeValueRestriction description); + } Added: trunk/src/dl-learner/org/dllearner/core/owl/DoubleDataRange.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleDataRange.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleDataRange.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,30 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * Ranges of type double for use in datatye restrictions. + * + * @author Jens Lehmann + * + */ +public abstract class DoubleDataRange extends DataRange { + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMaxValue.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,44 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * Double data range restricted by a maximum value, e.g. + * hasAge <= 65. + * + * @author Jens Lehmann + * + */ +public class DoubleMaxValue extends DoubleDataRange { + + private double value; + + public DoubleMaxValue(double value) { + this.value = value; + } + + /** + * @return The maximum value. + */ + public double getValue() { + return value; + } + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleMinValue.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,44 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * Double data range restricted by a maximum value, e.g. + * hasAge >= 18. + * + * @author Jens Lehmann + * + */ +public class DoubleMinValue extends DoubleDataRange { + + private double value; + + public DoubleMinValue(double value) { + this.value = value; + } + + /** + * @return The maximum value. + */ + public double getValue() { + return value; + } + +} Modified: trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java 2008-02-12 09:20:06 UTC (rev 545) @@ -55,4 +55,11 @@ return ret; } + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java 2008-02-12 09:20:06 UTC (rev 545) @@ -60,4 +60,11 @@ return Helper.getAbbreviatedString(name, baseURI, prefixes); } + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Negation.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Negation.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/Negation.java 2008-02-12 09:20:06 UTC (rev 545) @@ -31,4 +31,11 @@ return 1; } + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java 2008-02-12 09:20:06 UTC (rev 545) @@ -26,4 +26,12 @@ public int getArity() { return 0; } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -96,4 +96,11 @@ } */ + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectCardinalityRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectCardinalityRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -1,6 +1,6 @@ package org.dllearner.core.owl; -public abstract class ObjectCardinalityRestriction extends Description { +public abstract class ObjectCardinalityRestriction extends CardinalityRestriction { protected ObjectPropertyExpression role; protected int number; Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -40,4 +40,11 @@ return "= " + number + " " + role.toString(baseURI, prefixes) + " " + getChild(0).toString(baseURI, prefixes); } + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -16,4 +16,12 @@ public String toString(String baseURI, Map<String,String> prefixes) { return "<= " + number + " " + role.toString(baseURI, prefixes) + " " + getChild(0).toString(baseURI, prefixes); } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -16,4 +16,12 @@ public String toString(String baseURI, Map<String,String> prefixes) { return ">= " + number + " " + role.toString(baseURI, prefixes) + " " + getChild(0).toString(baseURI, prefixes); } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java 2008-02-12 09:20:06 UTC (rev 545) @@ -27,7 +27,7 @@ * @author Jens Lehmann * */ -public abstract class ObjectPropertyExpression implements KBElement { +public abstract class ObjectPropertyExpression extends PropertyExpression implements KBElement { protected String name; Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectQuantorRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectQuantorRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectQuantorRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -1,6 +1,6 @@ package org.dllearner.core.owl; -public abstract class ObjectQuantorRestriction extends Description { +public abstract class ObjectQuantorRestriction extends QuantorRestriction { ObjectPropertyExpression role; Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -95,5 +95,13 @@ public int getLength() { return 2; } - */ + */ + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -25,4 +25,12 @@ */ public class ObjectValueRestriction extends ValueRestriction { + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } + } Added: trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpression.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpression.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpression.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public abstract class PropertyExpression implements KBElement { + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/QuantorRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/QuantorRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/QuantorRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public abstract class QuantorRestriction extends Restriction { + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/Restriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Restriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/Restriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,29 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public abstract class Restriction extends Description { + + +} Modified: trunk/src/dl-learner/org/dllearner/core/owl/Thing.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Thing.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/Thing.java 2008-02-12 09:20:06 UTC (rev 545) @@ -23,5 +23,13 @@ @Override public int getArity() { return 0; - } + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } } Modified: trunk/src/dl-learner/org/dllearner/core/owl/Union.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/Union.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/Union.java 2008-02-12 09:20:06 UTC (rev 545) @@ -57,4 +57,12 @@ return ret; } + /* (non-Javadoc) + * @see org.dllearner.core.owl.Description#accept(org.dllearner.core.owl.DescriptionVisitor) + */ + @Override + public void accept(DescriptionVisitor visitor) { + visitor.visit(this); + } + } Modified: trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java 2008-02-12 09:20:06 UTC (rev 545) @@ -25,7 +25,7 @@ * @author Jens Lehmann * */ -public class ValueRestriction extends Description { +public abstract class ValueRestriction extends Description { /* (non-Javadoc) * @see org.dllearner.core.owl.Concept#getArity() Modified: trunk/src/dl-learner/org/dllearner/core/owl/package.html =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/package.html 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/core/owl/package.html 2008-02-12 09:20:06 UTC (rev 545) @@ -2,6 +2,6 @@ <html> <head></head> <body bgcolor="white"> -<p>Classes for representing Description Logic constructs.</p> +<p>Classes for representing OWL constructs.</p> </body> </html> \ No newline at end of file Copied: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java (from rev 543, trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIConverterVisitor.java) =================================================================== --- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIAxiomConvertVisitor.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,209 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.reasoning; + +import java.net.URI; +import java.util.HashSet; +import java.util.Set; + +import org.dllearner.core.owl.AxiomVisitor; +import org.dllearner.core.owl.ClassAssertionAxiom; +import org.dllearner.core.owl.DoubleDatatypePropertyAssertion; +import org.dllearner.core.owl.EquivalentClassesAxiom; +import org.dllearner.core.owl.FunctionalObjectPropertyAxiom; +import org.dllearner.core.owl.InverseObjectPropertyAxiom; +import org.dllearner.core.owl.KB; +import org.dllearner.core.owl.ObjectPropertyAssertion; +import org.dllearner.core.owl.SubClassAxiom; +import org.dllearner.core.owl.SymmetricObjectPropertyAxiom; +import org.dllearner.core.owl.TransitiveObjectPropertyAxiom; +import org.semanticweb.owl.model.AddAxiom; +import org.semanticweb.owl.model.OWLAxiom; +import org.semanticweb.owl.model.OWLDataFactory; +import org.semanticweb.owl.model.OWLDescription; +import org.semanticweb.owl.model.OWLIndividual; +import org.semanticweb.owl.model.OWLObjectProperty; +import org.semanticweb.owl.model.OWLOntology; +import org.semanticweb.owl.model.OWLOntologyChangeException; +import org.semanticweb.owl.model.OWLOntologyManager; + +// static import for easy access to the description converter +import static org.dllearner.reasoning.OWLAPIDescriptionConvertVisitor.getOWLDescription; + +/** + * A converter from DL-Learner axioms to OWL API axioms based on the visitor + * pattern. + * + * TODO: Investigate whether OWLOntologyManager and OWLOntology should be + * removed as parameters. It would be natural to have a DL-Learner KB as input + * and an OWL API OWLOntology as output. + * + * @author Jens Lehmann + * + */ +public class OWLAPIAxiomConvertVisitor implements AxiomVisitor { + + OWLDataFactory factory; + private OWLOntology ontology; + private OWLOntologyManager manager; + + public OWLAPIAxiomConvertVisitor(OWLOntologyManager manager, OWLOntology ontology, KB kb) { + this.manager = manager; + this.ontology = ontology; + factory = manager.getOWLDataFactory(); + } + + public static void fillOWLOntology(OWLOntologyManager manager, OWLOntology ontology, KB kb) { + // OWLAPIAxiomConvertVisitor converter = new OWLAPIAxiomConvertVisitor(manager, ontology, kb); + // for(Axiom axiom : kb.getTbox()) + // axiom.accept(this); + // return converter.getOWLDescription(); + } + + // convencience function for adding an axiom to the ontology + private void addAxiom(OWLAxiom axiom) { + AddAxiom addAxiom = new AddAxiom(ontology, axiom); + try { + manager.applyChange(addAxiom); + } catch (OWLOntologyChangeException e) { + e.printStackTrace(); + } + } + + /* + * (non-Javadoc) + * + * @see org.dllearner.core.dl.AxiomVisitor#visit(org.dllearner.core.dl.ObjectPropertyAssertion) + */ + public void visit(ObjectPropertyAssertion axiom) { + OWLObjectProperty role = factory.getOWLObjectProperty(URI + .create(((ObjectPropertyAssertion) axiom).getRole().getName())); + OWLIndividual i1 = factory.getOWLIndividual(URI.create(((ObjectPropertyAssertion) axiom) + .getIndividual1().getName())); + OWLIndividual i2 = factory.getOWLIndividual(URI.create(((ObjectPropertyAssertion) axiom) + .getIndividual2().getName())); + OWLAxiom axiomOWLAPI = factory.getOWLObjectPropertyAssertionAxiom(i1, role, i2); + addAxiom(axiomOWLAPI); + } + + /* + * (non-Javadoc) + * + * @see org.dllearner.core.owl.AssertionalAxiomVisitor#visit(org.dllearner.core.owl.ClassAssertionAxiom) + */ + public void visit(ClassAssertionAxiom axiom) { + OWLDescription d = getOWLDescription(axiom.getConcept()); + OWLIndividual i = factory.getOWLIndividual(URI.create(((ClassAssertionAxiom) axiom) + .getIndividual().getName())); + OWLAxiom axiomOWLAPI = factory.getOWLClassAssertionAxiom(i, d); + addAxiom(axiomOWLAPI); + } + + /* + * (non-Javadoc) + * + * @see org.dllearner.core.owl.AssertionalAxiomVisitor#visit(org.dllearner.core.owl.DoubleDatatypePropertyAssertion) + */ + public void visit(DoubleDatatypePropertyAssertion axiom) { + // TODO Auto-generated method stub + + } + + /* + * (non-Javadoc) + * + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.FunctionalObjectPropertyAxiom) + */ + public void visit(FunctionalObjectPropertyAxiom axiom) { + OWLObjectProperty role = factory.getOWLObjectProperty( + URI.create(((FunctionalObjectPropertyAxiom) axiom).getRole().getName())); + OWLAxiom axiomOWLAPI = factory.getOWLFunctionalObjectPropertyAxiom(role); + addAxiom(axiomOWLAPI); + } + + /* + * (non-Javadoc) + * + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.InverseObjectPropertyAxiom) + */ + public void visit(InverseObjectPropertyAxiom axiom) { + OWLObjectProperty role = factory.getOWLObjectProperty( + URI.create(((InverseObjectPropertyAxiom) axiom).getRole().getName())); + OWLObjectProperty inverseRole = factory.getOWLObjectProperty( + URI.create(((InverseObjectPropertyAxiom) axiom).getInverseRole().getName())); + OWLAxiom axiomOWLAPI = factory.getOWLInverseObjectPropertiesAxiom(role, inverseRole); + addAxiom(axiomOWLAPI); + } + + /* + * (non-Javadoc) + * + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.SymmetricObjectPropertyAxiom) + */ + public void visit(SymmetricObjectPropertyAxiom axiom) { + OWLObjectProperty role = factory.getOWLObjectProperty( + URI.create(((SymmetricObjectPropertyAxiom) axiom).getRole().getName())); + OWLAxiom axiomOWLAPI = factory.getOWLSymmetricObjectPropertyAxiom(role); + addAxiom(axiomOWLAPI); + } + + /* + * (non-Javadoc) + * + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.TransitiveObjectPropertyAxiom) + */ + public void visit(TransitiveObjectPropertyAxiom axiom) { + OWLObjectProperty role = factory.getOWLObjectProperty( + URI.create(axiom.getRole().getName())); + OWLAxiom axiomOWLAPI = factory.getOWLTransitiveObjectPropertyAxiom(role); + addAxiom(axiomOWLAPI); + } + + /* + * (non-Javadoc) + * + * @see org.dllearner.core.owl.TerminologicalAxiomVisitor#visit(org.dllearner.core.owl.EquivalentClassesAxiom) + */ + public void visit(EquivalentClassesAxiom axiom) { + OWLDescription d1 = getOWLDescription(axiom.getConcept1()); + OWLDescription d2 = getOWLDescription(axiom.getConcept2()); + Set<OWLDescription> ds = new HashSet<OWLDescription>(); + ds.add(d1); + ds.add(d2); + OWLAxiom axiomOWLAPI = factory.getOWLEquivalentClassesAxiom(ds); + addAxiom(axiomOWLAPI); + } + + /* + * (non-Javadoc) + * + * @see org.dllearner.core.owl.TerminologicalAxiomVisitor#visit(org.dllearner.core.owl.SubClassAxiom) + */ + public void visit(SubClassAxiom axiom) { + OWLDescription d1 = getOWLDescription(axiom.getSubConcept()); + OWLDescription d2 = getOWLDescription(axiom.getSuperConcept()); + Set<OWLDescription> ds = new HashSet<OWLDescription>(); + ds.add(d1); + ds.add(d2); + OWLAxiom axiomOWLAPI = factory.getOWLSubClassAxiom(d1,d2); + addAxiom(axiomOWLAPI); + } + +} Deleted: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIConverterVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIConverterVisitor.java 2008-02-12 09:15:20 UTC (rev 544) +++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIConverterVisitor.java 2008-02-12 09:20:06 UTC (rev 545) @@ -1,284 +0,0 @@ -/** - * Copyright (C) 2007-2008, Jens Lehmann - * - * This file is part of DL-Learner. - * - * DL-Learner is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * DL-Learner is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.dllearner.reasoning; - -import java.net.URI; - -import org.dllearner.core.owl.ClassAssertionAxiom; -import org.dllearner.core.owl.DatatypeProperty; -import org.dllearner.core.owl.DatatypeValueRestriction; -import org.dllearner.core.owl.DoubleDatatypePropertyAssertion; -import org.dllearner.core.owl.EquivalentClassesAxiom; -import org.dllearner.core.owl.FunctionalObjectPropertyAxiom; -import org.dllearner.core.owl.Intersection; -import org.dllearner.core.owl.InverseObjectPropertyAxiom; -import org.dllearner.core.owl.KB; -import org.dllearner.core.owl.KBElementVisitor; -import org.dllearner.core.owl.Negation; -import org.dllearner.core.owl.Nothing; -import org.dllearner.core.owl.ObjectAllRestriction; -import org.dllearner.core.owl.ObjectExactCardinalityRestriction; -import org.dllearner.core.owl.ObjectMaxCardinalityRestriction; -import org.dllearner.core.owl.ObjectMinCardinalityRestriction; -import org.dllearner.core.owl.ObjectProperty; -import org.dllearner.core.owl.ObjectPropertyAssertion; -import org.dllearner.core.owl.ObjectPropertyInverse; -import org.dllearner.core.owl.ObjectSomeRestriction; -import org.dllearner.core.owl.ObjectValueRestriction; -import org.dllearner.core.owl.SubClassAxiom; -import org.dllearner.core.owl.SymmetricObjectPropertyAxiom; -import org.dllearner.core.owl.Thing; -import org.dllearner.core.owl.TransitiveObjectPropertyAxiom; -import org.dllearner.core.owl.Union; -import org.semanticweb.owl.model.AddAxiom; -import org.semanticweb.owl.model.OWLAxiom; -import org.semanticweb.owl.model.OWLDataFactory; -import org.semanticweb.owl.model.OWLIndividual; -import org.semanticweb.owl.model.OWLObjectProperty; -import org.semanticweb.owl.model.OWLOntology; -import org.semanticweb.owl.model.OWLOntologyChangeException; -import org.semanticweb.owl.model.OWLOntologyManager; - -/** - * A converter from DL-Learner format to OWL API format. - * - * @author Jens Lehmann - * - */ -public class OWLAPIConverterVisitor implements KBElementVisitor { - - OWLDataFactory factory; - private OWLOntology ontology; - private OWLOntologyManager manager; - - public OWLAPIConverterVisitor(OWLOntologyManager manager, OWLOntology ontology, KB kb) { - this.manager = manager; - this.ontology = ontology; - factory = manager.getOWLDataFactory(); - } - - private void addAxiom(OWLAxiom axiom) { - AddAxiom addAxiom = new AddAxiom(ontology, axiom); - try { - manager.applyChange(addAxiom); - } catch (OWLOntologyChangeException e) { - e.printStackTrace(); - } - } - - /* (non-Javadoc) - * @see org.dllearner.core.dl.AxiomVisitor#visit(org.dllearner.core.dl.ObjectPropertyAssertion) - */ - public void visit(ObjectPropertyAssertion axiom) { - OWLObjectProperty role = factory.getOWLObjectProperty( - URI.create(((ObjectPropertyAssertion) axiom).getRole().getName())); - OWLIndividual i1 = factory.getOWLIndividual( - URI.create(((ObjectPropertyAssertion) axiom).getIndividual1().getName())); - OWLIndividual i2 = factory.getOWLIndividual( - URI.create(((ObjectPropertyAssertion) axiom).getIndividual2().getName())); - OWLAxiom axiomOWLAPI = factory.getOWLObjectPropertyAssertionAxiom(i1, role, i2); - addAxiom(axiomOWLAPI); - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.AssertionalAxiomVisitor#visit(org.dllearner.core.owl.ClassAssertionAxiom) - */ - public void visit(ClassAssertionAxiom axiom) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.AssertionalAxiomVisitor#visit(org.dllearner.core.owl.DoubleDatatypePropertyAssertion) - */ - public void visit(DoubleDatatypePropertyAssertion axiom) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.FunctionalObjectPropertyAxiom) - */ - public void visit(FunctionalObjectPropertyAxiom axiom) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.InverseObjectPropertyAxiom) - */ - public void visit(InverseObjectPropertyAxiom axiom) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.SymmetricObjectPropertyAxiom) - */ - public void visit(SymmetricObjectPropertyAxiom axiom) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.TransitiveObjectPropertyAxiom) - */ - public void visit(TransitiveObjectPropertyAxiom axiom) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.TerminologicalAxiomVisitor#visit(org.dllearner.core.owl.EquivalentClassesAxiom) - */ - public void visit(EquivalentClassesAxiom axiom) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.TerminologicalAxiomVisitor#visit(org.dllearner.core.owl.SubClassAxiom) - */ - public void visit(SubClassAxiom axiom) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Negation) - */ - public void visit(Negation description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectAllRestriction) - */ - public void visit(ObjectAllRestriction description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectSomeRestriction) - */ - public void visit(ObjectSomeRestriction description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Nothing) - */ - public void visit(Nothing description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Thing) - */ - public void visit(Thing description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Intersection) - */ - public void visit(Intersection description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Union) - */ - public void visit(Union description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectMinCardinalityRestriction) - */ - public void visit(ObjectMinCardinalityRestriction description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectExactCardinalityRestriction) - */ - public void visit(ObjectExactCardinalityRestriction description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectMaxCardinalityRestriction) - */ - public void visit(ObjectMaxCardinalityRestriction description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectValueRestriction) - */ - public void visit(ObjectValueRestriction description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.DatatypeValueRestriction) - */ - public void visit(DatatypeValueRestriction description) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.PropertyExpressionVisitor#visit(org.dllearner.core.owl.ObjectProperty) - */ - public void visit(ObjectProperty property) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.PropertyExpressionVisitor#visit(org.dllearner.core.owl.ObjectPropertyInverse) - */ - public void visit(ObjectPropertyInverse property) { - // TODO Auto-generated method stub - - } - - /* (non-Javadoc) - * @see org.dllearner.core.owl.PropertyExpressionVisitor#visit(org.dllearner.core.owl.DatatypeProperty) - */ - public void visit(DatatypeProperty property) { - // TODO Auto-generated method stub - - } - -} Added: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIDescriptionConvertVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIDescriptionConvertVisitor.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIDescriptionConvertVisitor.java 2008-02-12 09:20:06 UTC (rev 545) @@ -0,0 +1,256 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.reasoning; + +import java.net.URI; +import java.util.HashSet; +import java.util.Set; +import java.util.Stack; + +import org.dllearner.algorithms.gp.ADC; +import org.dllearner.core.owl.DatatypeExactCardinalityRestriction; +import org.dllearner.core.owl.DatatypeMaxCardinalityRestriction; +import org.dllearner.core.owl.DatatypeMinCardinalityRestriction; +import org.dllearner.core.owl.DatatypeSomeRestriction; +import org.dllearner.core.owl.DatatypeValueRestriction; +import org.dllearner.core.owl.Description; +import org.dllearner.core.owl.DescriptionVisitor; +import org.dllearner.core.owl.Intersection; +import org.dllearner.core.owl.NamedClass; +import org.dllearner.core.owl.Negation; +import org.dllearner.core.owl.Nothing; +import org.dllearner.core.owl.ObjectAllRestriction; +import org.dllearner.core.owl.ObjectExactCardinalityRestriction; +import org.dllearner.core.owl.ObjectMaxCardinalityRestriction; +import org.dllearner.core.owl.ObjectMinCardinalityRestriction; +import org.dllearner.core.owl.ObjectSomeRestriction; +import org.dllearner.core.owl.ObjectValueRestriction; +import org.dllearner.core.owl.Thing; +import org.dllearner.core.owl.Union; +import org.dllearner.parser.KBParser; +import org.dllearner.parser.ParseException; +import org.semanticweb.owl.apibinding.OWLManager; +import org.semanticweb.owl.model.OWLDataFactory; +import org.semanticweb.owl.model.OWLDescription; +import org.semanticweb.owl.model.OWLObjectProperty; + +/** + * Converter from DL-Learner descriptions to OWL API descriptions based + * on the visitor pattern. + * + * @author Jens Lehmann + * + */ +public class OWLAPIDescriptionConvertVisitor implements DescriptionVisitor { + + // private OWLDescription description; + private Stack<OWLDescription> stack = new Stack<OWLDescription>(); + + private OWLDataFactory factory = OWLManager.createOWLOntologyManager().getOWLDataFactory(); + + public OWLDescription getOWLDescription() { + return stack.pop(); + } + + /** + * Converts a DL-Learner description into an OWL API decription. + * @param description DL-Learner description. + * @return Corresponding OWL API description. + */ + public static OWLDescription getOWLDescription(Description description) { + OWLAPIDescriptionConvertVisitor converter = new OWLAPIDescriptionConvertVisitor(); + description.accept(converter); + return converter.getOWLDescription(); + } + + /** + * Used for testing the OWL API converter. + * + * @param args + */ + public static void main(String[] args) { + try { + Description d = KBParser.parseConcept("(male AND (rich OR NOT stupid))"); + OWLDescription od = OWLAPIDescriptionConvertVisitor.getOWLDescription(d); + System.out.println(d); + System.out.println(od); + } catch (ParseException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Negation) + */ + public void visit(Negation description) { + description.getChild(0).accept(this); + OWLDescription d = stack.pop(); + stack.push(factory.getOWLObjectComplementOf(d)); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectAllRestriction) + */ + public void visit(ObjectAllRestriction description) { + OWLObjectProperty role = factory.getOWLObjectProperty( + URI.create(description.getRole().getName())); + description.getChild(0).accept(this); + OWLDescription d = stack.pop(); + stack.push(factory.getOWLObjectAllRestriction(role, d)); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectSomeRestriction) + */ + public void visit(ObjectSomeRestriction description) { + OWLObjectProperty role = factory.getOWLObjectProperty( + URI.create(description.getRole().getName())); + description.getChild(0).accept(this); + OWLDescription d = stack.pop(); + stack.push(factory.getOWLObjectSomeRestriction(role, d)); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Nothing) + */ + public void visit(Nothing description) { + stack.push(factory.getOWLNothing()); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Thing) + */ + public void visit(Thing description) { + stack.push(factory.getOWLThing()); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Intersection) + */ + public void visit(Intersection description) { + Set<OWLDescription> descriptions = new HashSet<OWLDescription>(); + for(Description child : description.getChildren()) { + child.accept(this); + descriptions.add(stack.pop()); + } + stack.push(factory.getOWLObjectIntersectionOf(descriptions)); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Union) + */ + public void visit(Union description) { + Set<OWLDescription> descriptions = new HashSet<OWLDescription>(); + for(Description child : description.getChildren()) { + child.accept(this); + descriptions.add(stack.pop()); + } + stack.push(factory.getOWLObjectUnionOf(descriptions)); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectMinCardinalityRestriction) + */ + public void visit(ObjectMinCardinalityRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectExactCardinalityRestriction) + */ + public void visit(ObjectExactCardinalityRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectMaxCardinalityRestriction) + */ + public void visit(ObjectMaxCardinalityRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectValueRestriction) + */ + public void visit(ObjectValueRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.DatatypeValueRe... [truncated message content] |
From: <ton...@us...> - 2008-02-12 09:15:23
|
Revision: 544 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=544&view=rev Author: tonytacker Date: 2008-02-12 01:15:20 -0800 (Tue, 12 Feb 2008) Log Message: ----------- new method for selecting checkbox's Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java Modified: trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java 2008-02-11 19:01:36 UTC (rev 543) +++ trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java 2008-02-12 09:15:20 UTC (rev 544) @@ -41,7 +41,6 @@ private LinkedList<JCheckBox> list = new LinkedList<JCheckBox>(); private GridBagLayout gridbag = new GridBagLayout(); private GridBagConstraints constraints = new GridBagConstraints(); - private Set<String> selectionSet = new HashSet<String>(); /** * get a JPanel @@ -53,9 +52,9 @@ } /** - * add new entry + * Add new entry and make a new JCheckBox. * - * @param label + * @param label This text will be shown. */ public void add(String label) { list.add(new JCheckBox(label)); @@ -63,18 +62,33 @@ } /** - * return a set of selected items + * Return a set of selected items. */ public Set<String> getSelections() { + Set<String> selectionSet = new HashSet<String>(); selectionSet.clear(); // remove all for (int i = 0; i < list.size(); i++) { if (list.get(i).isSelected()) - this.selectionSet.add(list.get(i).getText()); + selectionSet.add(list.get(i).getText()); } - return this.selectionSet; + return selectionSet; } /** + * Select items. + * + * @param selectionSet Is a Set of Strings. + */ + public void setSelections(Set<String> selectionSet) { + for (int i = 0; i < list.size(); i++) { + if (selectionSet.contains(list.get(i).getText())) + list.get(i).setSelected(true); + else + list.get(i).setSelected(false); + } + } + + /** * update JCheckBox's */ private void update() { Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-11 19:01:36 UTC (rev 543) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-12 09:15:20 UTC (rev 544) @@ -111,9 +111,8 @@ // remove selection if (e.getSource() == removeButton) { int[] selectedIndices = stringList.getSelectedIndices(); - int count = 0; // remove i.e. index 2 and 4: after delete 2, 4 - // is - // now index 3 + int count = 0; + // remove i.e. 2 and 4: after delete 2: 4 is now 3 for (int i : selectedIndices) listModel.remove(i - count++); } @@ -212,6 +211,8 @@ buildConstraints(constraints, 1, 1, 1, 1, 100, 100); gridbag.setConstraints(setButton, constraints); widgetPanel.add(setButton, constraints); + // set selections + cBL.setSelections(value); // DEFINE LIST // positiveExamples or negativeExamples if (configOption.getName().equalsIgnoreCase( @@ -255,23 +256,24 @@ } // UNKNOWN else { - JLabel notImplementedLabel = new JLabel("not a set of strings"); + JLabel notImplementedLabel = new JLabel(" not a set of strings"); notImplementedLabel.setForeground(Color.RED); - buildConstraints(constraints, 0, 1, 1, 1, 100, 100); + buildConstraints(constraints, 1, 0, 1, 1, 100, 100); gridbag.setConstraints(notImplementedLabel, constraints); widgetPanel.add(notImplementedLabel); } } else { // configOption == NULL - JLabel noConfigOptionLabel = new JLabel("no init (StringSet)"); + JLabel noConfigOptionLabel = new JLabel(" no init (StringSet)"); noConfigOptionLabel.setForeground(Color.MAGENTA); - widgetPanel.add(noConfigOptionLabel); + buildConstraints(constraints, 1, 0, 1, 1, 100, 100); + gridbag.setConstraints(noConfigOptionLabel, constraints); + widgetPanel.add(noConfigOptionLabel, constraints); } } @Override protected void setEntry() { StringSetConfigOption specialOption; - // value = stringField.getText(); // get from input specialOption = (StringSetConfigOption) config.getComponentManager() .getConfigOption(componentOption, configOption.getName()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2008-02-11 19:01:58
|
Revision: 543 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=543&view=rev Author: jenslehmann Date: 2008-02-11 11:01:36 -0800 (Mon, 11 Feb 2008) Log Message: ----------- - wrote visitor interfaces for OWL structures - more structures added Added Paths: ----------- trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiomVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpressionVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiomVisitor.java trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIConverterVisitor.java Added: trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiomVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiomVisitor.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiomVisitor.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,36 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * Visitor for assertional (ABox) axioms. + * + * @author Jens Lehmann + * + */ +public interface AssertionalAxiomVisitor { + + public void visit(ClassAssertionAxiom axiom); + + public void visit(ObjectPropertyAssertion axiom); + + public void visit(DoubleDatatypePropertyAssertion axiom); + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/AxiomVisitor.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,33 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * Visitor interface for all implemented kinds of axioms in a knowledge + * base. + * + * @author Jens Lehmann + * + */ +public interface AxiomVisitor extends AssertionalAxiomVisitor, PropertyAxiomVisitor, TerminologicalAxiomVisitor { + + + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/CardinalityRestriction.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public abstract class CardinalityRestriction extends Description { + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeCardinalityRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeCardinalityRestriction.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public abstract class DatatypeCardinalityRestriction extends CardinalityRestriction { + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeExactCardinalityRestriction.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,55 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * @author Jens Lehmann + * + */ +public class DatatypeExactCardinalityRestriction extends DatatypeCardinalityRestriction { + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Concept#getArity() + */ + @Override + public int getArity() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMaxCardinalityRestriction.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,55 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * @author Jens Lehmann + * + */ +public class DatatypeMaxCardinalityRestriction extends DatatypeCardinalityRestriction { + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Concept#getArity() + */ + @Override + public int getArity() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeMinCardinalityRestriction.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,55 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * @author Jens Lehmann + * + */ +public class DatatypeMinCardinalityRestriction extends DatatypeCardinalityRestriction { + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Concept#getArity() + */ + @Override + public int getArity() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeValueRestriction.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public class DatatypeValueRestriction extends ValueRestriction { + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/DescriptionVisitor.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,55 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * Visitor for elements in complex class descriptions (it supports + * the currently relevant ones - needs to be extended when further + * constructs are needed). + * + * @author Jens Lehmann + * + */ +public interface DescriptionVisitor { + + public void visit(Negation description); + + public void visit(ObjectAllRestriction description); + + public void visit(ObjectSomeRestriction description); + + public void visit(Nothing description); + + public void visit(Thing description); + + public void visit(Intersection description); + + public void visit(Union description); + + public void visit(ObjectMinCardinalityRestriction description); + + public void visit(ObjectExactCardinalityRestriction description); + + public void visit(ObjectMaxCardinalityRestriction description); + + public void visit(ObjectValueRestriction description); + + public void visit(DatatypeValueRestriction description); +} Added: trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/KBElementVisitor.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,30 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * Visitor for all elements of a knowledge base. + * + * @author Jens Lehmann + * + */ +public interface KBElementVisitor extends AxiomVisitor, DescriptionVisitor, PropertyExpressionVisitor { + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectExactCardinalityRestriction.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,43 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * @author Jens Lehmann + * + */ +public class ObjectExactCardinalityRestriction extends ObjectCardinalityRestriction { + + public ObjectExactCardinalityRestriction(int number, ObjectPropertyExpression role, Description c) { + super(number,role,c); + } + + @Override + public int getArity() { + return 1; + } + + public String toString(String baseURI, Map<String,String> prefixes) { + return "= " + number + " " + role.toString(baseURI, prefixes) + " " + getChild(0).toString(baseURI, prefixes); + } + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectValueRestriction.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public class ObjectValueRestriction extends ValueRestriction { + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiomVisitor.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,37 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * Visitor for property (RBox) axioms. + * + * @author Jens Lehmann + * + */ +public interface PropertyAxiomVisitor { + + public void visit(FunctionalObjectPropertyAxiom axiom); + + public void visit(InverseObjectPropertyAxiom axiom); + + public void visit(SymmetricObjectPropertyAxiom axiom); + + public void visit(TransitiveObjectPropertyAxiom axiom); +} Added: trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpressionVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpressionVisitor.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyExpressionVisitor.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,36 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * A visitor for property expression, which can occur in class + * descriptions. + * + * @author Jens Lehmann + * + */ +public interface PropertyExpressionVisitor { + + public void visit(ObjectProperty property); + + public void visit(ObjectPropertyInverse property); + + public void visit(DatatypeProperty property); +} Added: trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiomVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiomVisitor.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiomVisitor.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,32 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +/** + * @author Jens Lehmann + * + */ +public interface TerminologicalAxiomVisitor { + + public void visit(EquivalentClassesAxiom axiom); + + public void visit(SubClassAxiom axiom); + +} Added: trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/ValueRestriction.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,55 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +/** + * @author Jens Lehmann + * + */ +public class ValueRestriction extends Description { + + /* (non-Javadoc) + * @see org.dllearner.core.owl.Concept#getArity() + */ + @Override + public int getArity() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#getLength() + */ + public int getLength() { + // TODO Auto-generated method stub + return 0; + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + // TODO Auto-generated method stub + return null; + } + +} Added: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIConverterVisitor.java =================================================================== --- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIConverterVisitor.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIConverterVisitor.java 2008-02-11 19:01:36 UTC (rev 543) @@ -0,0 +1,284 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.reasoning; + +import java.net.URI; + +import org.dllearner.core.owl.ClassAssertionAxiom; +import org.dllearner.core.owl.DatatypeProperty; +import org.dllearner.core.owl.DatatypeValueRestriction; +import org.dllearner.core.owl.DoubleDatatypePropertyAssertion; +import org.dllearner.core.owl.EquivalentClassesAxiom; +import org.dllearner.core.owl.FunctionalObjectPropertyAxiom; +import org.dllearner.core.owl.Intersection; +import org.dllearner.core.owl.InverseObjectPropertyAxiom; +import org.dllearner.core.owl.KB; +import org.dllearner.core.owl.KBElementVisitor; +import org.dllearner.core.owl.Negation; +import org.dllearner.core.owl.Nothing; +import org.dllearner.core.owl.ObjectAllRestriction; +import org.dllearner.core.owl.ObjectExactCardinalityRestriction; +import org.dllearner.core.owl.ObjectMaxCardinalityRestriction; +import org.dllearner.core.owl.ObjectMinCardinalityRestriction; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.ObjectPropertyAssertion; +import org.dllearner.core.owl.ObjectPropertyInverse; +import org.dllearner.core.owl.ObjectSomeRestriction; +import org.dllearner.core.owl.ObjectValueRestriction; +import org.dllearner.core.owl.SubClassAxiom; +import org.dllearner.core.owl.SymmetricObjectPropertyAxiom; +import org.dllearner.core.owl.Thing; +import org.dllearner.core.owl.TransitiveObjectPropertyAxiom; +import org.dllearner.core.owl.Union; +import org.semanticweb.owl.model.AddAxiom; +import org.semanticweb.owl.model.OWLAxiom; +import org.semanticweb.owl.model.OWLDataFactory; +import org.semanticweb.owl.model.OWLIndividual; +import org.semanticweb.owl.model.OWLObjectProperty; +import org.semanticweb.owl.model.OWLOntology; +import org.semanticweb.owl.model.OWLOntologyChangeException; +import org.semanticweb.owl.model.OWLOntologyManager; + +/** + * A converter from DL-Learner format to OWL API format. + * + * @author Jens Lehmann + * + */ +public class OWLAPIConverterVisitor implements KBElementVisitor { + + OWLDataFactory factory; + private OWLOntology ontology; + private OWLOntologyManager manager; + + public OWLAPIConverterVisitor(OWLOntologyManager manager, OWLOntology ontology, KB kb) { + this.manager = manager; + this.ontology = ontology; + factory = manager.getOWLDataFactory(); + } + + private void addAxiom(OWLAxiom axiom) { + AddAxiom addAxiom = new AddAxiom(ontology, axiom); + try { + manager.applyChange(addAxiom); + } catch (OWLOntologyChangeException e) { + e.printStackTrace(); + } + } + + /* (non-Javadoc) + * @see org.dllearner.core.dl.AxiomVisitor#visit(org.dllearner.core.dl.ObjectPropertyAssertion) + */ + public void visit(ObjectPropertyAssertion axiom) { + OWLObjectProperty role = factory.getOWLObjectProperty( + URI.create(((ObjectPropertyAssertion) axiom).getRole().getName())); + OWLIndividual i1 = factory.getOWLIndividual( + URI.create(((ObjectPropertyAssertion) axiom).getIndividual1().getName())); + OWLIndividual i2 = factory.getOWLIndividual( + URI.create(((ObjectPropertyAssertion) axiom).getIndividual2().getName())); + OWLAxiom axiomOWLAPI = factory.getOWLObjectPropertyAssertionAxiom(i1, role, i2); + addAxiom(axiomOWLAPI); + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.AssertionalAxiomVisitor#visit(org.dllearner.core.owl.ClassAssertionAxiom) + */ + public void visit(ClassAssertionAxiom axiom) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.AssertionalAxiomVisitor#visit(org.dllearner.core.owl.DoubleDatatypePropertyAssertion) + */ + public void visit(DoubleDatatypePropertyAssertion axiom) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.FunctionalObjectPropertyAxiom) + */ + public void visit(FunctionalObjectPropertyAxiom axiom) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.InverseObjectPropertyAxiom) + */ + public void visit(InverseObjectPropertyAxiom axiom) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.SymmetricObjectPropertyAxiom) + */ + public void visit(SymmetricObjectPropertyAxiom axiom) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyAxiomVisitor#visit(org.dllearner.core.owl.TransitiveObjectPropertyAxiom) + */ + public void visit(TransitiveObjectPropertyAxiom axiom) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.TerminologicalAxiomVisitor#visit(org.dllearner.core.owl.EquivalentClassesAxiom) + */ + public void visit(EquivalentClassesAxiom axiom) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.TerminologicalAxiomVisitor#visit(org.dllearner.core.owl.SubClassAxiom) + */ + public void visit(SubClassAxiom axiom) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Negation) + */ + public void visit(Negation description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectAllRestriction) + */ + public void visit(ObjectAllRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectSomeRestriction) + */ + public void visit(ObjectSomeRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Nothing) + */ + public void visit(Nothing description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Thing) + */ + public void visit(Thing description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Intersection) + */ + public void visit(Intersection description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.Union) + */ + public void visit(Union description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectMinCardinalityRestriction) + */ + public void visit(ObjectMinCardinalityRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectExactCardinalityRestriction) + */ + public void visit(ObjectExactCardinalityRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectMaxCardinalityRestriction) + */ + public void visit(ObjectMaxCardinalityRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.ObjectValueRestriction) + */ + public void visit(ObjectValueRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.DescriptionVisitor#visit(org.dllearner.core.owl.DatatypeValueRestriction) + */ + public void visit(DatatypeValueRestriction description) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyExpressionVisitor#visit(org.dllearner.core.owl.ObjectProperty) + */ + public void visit(ObjectProperty property) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyExpressionVisitor#visit(org.dllearner.core.owl.ObjectPropertyInverse) + */ + public void visit(ObjectPropertyInverse property) { + // TODO Auto-generated method stub + + } + + /* (non-Javadoc) + * @see org.dllearner.core.owl.PropertyExpressionVisitor#visit(org.dllearner.core.owl.DatatypeProperty) + */ + public void visit(DatatypeProperty property) { + // TODO Auto-generated method stub + + } + +} This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2008-02-11 18:50:54
|
Revision: 542 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=542&view=rev Author: jenslehmann Date: 2008-02-11 10:50:44 -0800 (Mon, 11 Feb 2008) Log Message: ----------- - refactored some DL elements to OWL elements - enhanced datatype support Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedNode.java trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/RefinementOperator.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/SearchSpace.java trunk/src/dl-learner/org/dllearner/cli/Start.java trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java trunk/src/dl-learner/org/dllearner/core/LearningProblem.java trunk/src/dl-learner/org/dllearner/core/Reasoner.java trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java trunk/src/dl-learner/org/dllearner/core/ReasoningService.java trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java trunk/src/dl-learner/org/dllearner/core/owl/KB.java trunk/src/dl-learner/org/dllearner/core/owl/Negation.java trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java trunk/src/dl-learner/org/dllearner/gui/MiniGUI.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLPStrict.java trunk/src/dl-learner/org/dllearner/learningproblems/PosNegInclusionLP.java trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyDefinitionLP.java trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyInclusionLP.java trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.java trunk/src/dl-learner/org/dllearner/parser/KBParser.java trunk/src/dl-learner/org/dllearner/parser/kb.jj trunk/src/dl-learner/org/dllearner/reasoning/DIGConverter.java trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java trunk/src/dl-learner/org/dllearner/utilities/ConceptComparator.java trunk/src/dl-learner/org/dllearner/utilities/ConceptTransformation.java trunk/src/dl-learner/org/dllearner/utilities/CrossValidation.java trunk/src/dl-learner/org/dllearner/utilities/Datastructures.java trunk/src/dl-learner/org/dllearner/utilities/Helper.java trunk/src/dl-learner/org/dllearner/utilities/OntologyClassRewriter.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/core/owl/ClassAssertionAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Description.java trunk/src/dl-learner/org/dllearner/core/owl/EquivalentClassesAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/FunctionalObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Intersection.java trunk/src/dl-learner/org/dllearner/core/owl/InverseObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/NamedClass.java trunk/src/dl-learner/org/dllearner/core/owl/Nothing.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectAllRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectMaxCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectMinCardinalityRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyHierarchy.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectQuantorRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectSomeRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/SubClassAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/SubObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/SymmetricObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Thing.java trunk/src/dl-learner/org/dllearner/core/owl/TransitiveObjectPropertyAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Union.java Removed Paths: ------------- trunk/src/dl-learner/org/dllearner/core/owl/All.java trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java trunk/src/dl-learner/org/dllearner/core/owl/Bottom.java trunk/src/dl-learner/org/dllearner/core/owl/Concept.java trunk/src/dl-learner/org/dllearner/core/owl/ConceptAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/Conjunction.java trunk/src/dl-learner/org/dllearner/core/owl/Disjunction.java trunk/src/dl-learner/org/dllearner/core/owl/Equality.java trunk/src/dl-learner/org/dllearner/core/owl/Exists.java trunk/src/dl-learner/org/dllearner/core/owl/FunctionalRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/GreaterEqual.java trunk/src/dl-learner/org/dllearner/core/owl/Inclusion.java trunk/src/dl-learner/org/dllearner/core/owl/InverseRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/LessEqual.java trunk/src/dl-learner/org/dllearner/core/owl/MultiConjunction.java trunk/src/dl-learner/org/dllearner/core/owl/MultiDisjunction.java trunk/src/dl-learner/org/dllearner/core/owl/NumberRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/Quantification.java trunk/src/dl-learner/org/dllearner/core/owl/RBoxAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/RoleHierarchy.java trunk/src/dl-learner/org/dllearner/core/owl/SubRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/SymmetricRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Top.java trunk/src/dl-learner/org/dllearner/core/owl/TransitiveRoleAxiom.java Modified: trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-02-11 17:41:10 UTC (rev 541) +++ trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-02-11 18:50:44 UTC (rev 542) @@ -35,16 +35,16 @@ import org.dllearner.core.config.ConfigOption; import org.dllearner.core.config.IntegerConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; -import org.dllearner.core.owl.All; -import org.dllearner.core.owl.AtomicConcept; -import org.dllearner.core.owl.Bottom; -import org.dllearner.core.owl.Concept; -import org.dllearner.core.owl.Conjunction; -import org.dllearner.core.owl.Disjunction; -import org.dllearner.core.owl.Exists; +import org.dllearner.core.owl.Intersection; +import org.dllearner.core.owl.Union; +import org.dllearner.core.owl.ObjectAllRestriction; +import org.dllearner.core.owl.NamedClass; +import org.dllearner.core.owl.Nothing; +import org.dllearner.core.owl.Description; +import org.dllearner.core.owl.ObjectSomeRestriction; import org.dllearner.core.owl.Negation; import org.dllearner.core.owl.ObjectProperty; -import org.dllearner.core.owl.Top; +import org.dllearner.core.owl.Thing; /** * A brute force learning algorithm. @@ -59,14 +59,14 @@ private LearningProblem learningProblem; - private Concept bestDefinition; + private Description bestDefinition; private Score bestScore; private Integer maxLength = 7; private String returnType; // list of all generated concepts sorted by length - private Map<Integer,List<Concept>> generatedDefinitions = new HashMap<Integer,List<Concept>>(); + private Map<Integer,List<Description>> generatedDefinitions = new HashMap<Integer,List<Description>>(); public BruteForceLearner(LearningProblem learningProblem, ReasoningService rs) { this.learningProblem = learningProblem; @@ -159,12 +159,12 @@ long startTime = System.currentTimeMillis(); System.out.print("Testing definitions of length " + i + " ... "); count = 0; - for(Concept program : generatedDefinitions.get(i)) { + for(Description program : generatedDefinitions.get(i)) { // if a return type is already given an appropriate tree is // generated here - Concept newRoot; + Description newRoot; if(returnType != null) { - newRoot = new Conjunction(new AtomicConcept(returnType),program); + newRoot = new Intersection(new NamedClass(returnType),program); } else newRoot = program; @@ -189,19 +189,19 @@ } private void generatePrograms(int length) { - generatedDefinitions.put(length,new LinkedList<Concept>()); + generatedDefinitions.put(length,new LinkedList<Description>()); if(length==1) { - generatedDefinitions.get(1).add(new Top()); - generatedDefinitions.get(1).add(new Bottom()); - for(AtomicConcept atomicConcept : learningProblem.getReasoningService().getAtomicConcepts()) { + generatedDefinitions.get(1).add(new Thing()); + generatedDefinitions.get(1).add(new Nothing()); + for(NamedClass atomicConcept : learningProblem.getReasoningService().getAtomicConcepts()) { generatedDefinitions.get(1).add(atomicConcept); } } if(length>1) { // negation - for(Concept childNode : generatedDefinitions.get(length-1)) { - Concept root = new Negation(childNode); + for(Description childNode : generatedDefinitions.get(length-1)) { + Description root = new Negation(childNode); generatedDefinitions.get(length).add(root); } } @@ -216,15 +216,15 @@ for(int z=1; z<=Math.floor(0.5*(length-1)); z++) { // cycle through all concepts of length z (left subtree) - for(Concept leftChild : generatedDefinitions.get(z)) { + for(Description leftChild : generatedDefinitions.get(z)) { // cycle thorugh all concept of lengt "length-z-1" (right subtree) - for(Concept rightChild : generatedDefinitions.get(length-z-1)) { + for(Description rightChild : generatedDefinitions.get(length-z-1)) { // create concept tree - Concept root; + Description root; if(i==0) { - root = new Disjunction(leftChild,rightChild); + root = new Union(leftChild,rightChild); } else { - root = new Conjunction(leftChild,rightChild); + root = new Intersection(leftChild,rightChild); } // Please not that we only set links here, i.e.: @@ -250,12 +250,12 @@ } // EXISTS and ALL - for(Concept childNode : generatedDefinitions.get(length-2)) { + for(Description childNode : generatedDefinitions.get(length-2)) { for(ObjectProperty atomicRole : learningProblem.getReasoningService().getAtomicRoles()) { - Concept root1 = new Exists(atomicRole,childNode); + Description root1 = new ObjectSomeRestriction(atomicRole,childNode); generatedDefinitions.get(length).add(root1); - Concept root2 = new All(atomicRole,childNode); + Description root2 = new ObjectAllRestriction(atomicRole,childNode); generatedDefinitions.get(length).add(root2); } } @@ -268,7 +268,7 @@ } @Override - public Concept getBestSolution() { + public Description getBestSolution() { return bestDefinition; } Modified: trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-02-11 17:41:10 UTC (rev 541) +++ trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-02-11 18:50:44 UTC (rev 542) @@ -33,11 +33,11 @@ import org.dllearner.core.config.ConfigOption; import org.dllearner.core.config.IntegerConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; -import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Description; public class RandomGuesser extends LearningAlgorithm { - private Concept bestDefinition = null; + private Description bestDefinition = null; private Score bestScore; private double bestFitness = Double.NEGATIVE_INFINITY; private LearningProblem learningProblem; @@ -117,7 +117,7 @@ } @Override - public Concept getBestSolution() { + public Description getBestSolution() { return bestDefinition; } Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2008-02-11 17:41:10 UTC (rev 541) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2008-02-11 18:50:44 UTC (rev 542) @@ -2,9 +2,9 @@ import java.util.Map; -import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Description; -public class ADC extends Concept { +public class ADC extends Description { /* @Override Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java 2008-02-11 17:41:10 UTC (rev 541) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java 2008-02-11 18:50:44 UTC (rev 542) @@ -41,8 +41,8 @@ import org.dllearner.core.config.IntegerConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; import org.dllearner.core.config.StringConfigOption; -import org.dllearner.core.owl.Concept; -import org.dllearner.core.owl.Top; +import org.dllearner.core.owl.Description; +import org.dllearner.core.owl.Thing; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.utilities.Helper; @@ -120,7 +120,7 @@ private long startTime; private Score bestScore; - private Concept bestConcept; + private Description bestConcept; private PosNegLP learningProblem; @@ -510,7 +510,7 @@ for(int i=0; i<numberOfIndividuals; i++) { if(individuals[i].getTree().getLength()>maxConceptLength) { System.out.println("Warning: GP produced concept longer then " + maxConceptLength + ". Replacing it with TOP."); - individuals[i] = GPUtilities.createProgram(learningProblem, new Top()); + individuals[i] = GPUtilities.createProgram(learningProblem, new Thing()); } } @@ -534,10 +534,10 @@ // der echten Score entsprechen muss, d.h. hier muss die // Konzeptlänge mit einberechnet werden => deswegen werden // neue Score-Objekte generiert - Set<Entry<Concept,Score>> entrySet = psi.evalCache.entrySet(); - for(Entry<Concept,Score> entry : entrySet) { + Set<Entry<Description,Score>> entrySet = psi.evalCache.entrySet(); + for(Entry<Description,Score> entry : entrySet) { Score tmpScore = entry.getValue(); - Concept c = entry.getKey(); + Description c = entry.getKey(); tmpScore = tmpScore.getModifiedLengthScore(c.getLength()); double tmpScoreValue = tmpScore.getScore(); if(tmpScoreValue>bestValue) { @@ -820,7 +820,7 @@ private void printStatistics(Program fittestIndividual) { // output statistics: best individual, average fitness, etc. double averageFitness = getFitnessSum() / numberOfIndividuals; - Concept n = fittestIndividual.getTree(); + Description n = fittestIndividual.getTree(); int misClassifications = fittestIndividual.getScore().getNotCoveredPositives().size() + fittestIndividual.getScore().getCoveredNegatives().size(); @@ -947,7 +947,7 @@ } @Override - public Concept getBestSolution() { + public Description getBestSolution() { // return fittestIndividual.getTree(); return bestConcept; } Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java 2008-02-11 17:41:10 UTC (rev 541) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java 2008-02-11 18:50:44 UTC (rev 542) @@ -10,18 +10,18 @@ import org.dllearner.core.LearningProblem; import org.dllearner.core.ReasoningMethodUnsupportedException; import org.dllearner.core.Score; -import org.dllearner.core.owl.All; -import org.dllearner.core.owl.AtomicConcept; -import org.dllearner.core.owl.Bottom; -import org.dllearner.core.owl.Concept; -import org.dllearner.core.owl.Exists; +import org.dllearner.core.owl.ObjectAllRestriction; +import org.dllearner.core.owl.NamedClass; +import org.dllearner.core.owl.Nothing; +import org.dllearner.core.owl.Description; +import org.dllearner.core.owl.ObjectSomeRestriction; import org.dllearner.core.owl.FlatABox; import org.dllearner.core.owl.Individual; -import org.dllearner.core.owl.MultiConjunction; -import org.dllearner.core.owl.MultiDisjunction; +import org.dllearner.core.owl.Intersection; +import org.dllearner.core.owl.Union; import org.dllearner.core.owl.Negation; import org.dllearner.core.owl.ObjectProperty; -import org.dllearner.core.owl.Top; +import org.dllearner.core.owl.Thing; import org.dllearner.learningproblems.PosNegDefinitionLPStrict; import org.dllearner.learningproblems.ScoreThreeValued; import org.dllearner.reasoning.FastRetrieval; @@ -53,7 +53,7 @@ private static Random rand = new Random(); - private static Score calculateFitness(LearningProblem learningProblem, Concept hypothesis) { + private static Score calculateFitness(LearningProblem learningProblem, Description hypothesis) { return calculateFitness(learningProblem, hypothesis, null); } @@ -62,8 +62,8 @@ // (macht aber nicht so viel Sinn, da man das bei richtigen Reasoning-Algorithmen // ohnehin mit einer Erweiterung der Wissensbasis um die Inklusion Target SUBSETOF ReturnType // erschlagen kann) - private static Score calculateFitness(LearningProblem learningProblem, Concept hypothesis, Concept adc) { - Concept extendedHypothesis; + private static Score calculateFitness(LearningProblem learningProblem, Description hypothesis, Description adc) { + Description extendedHypothesis; // return type temporarily disabled // => it is probably more appropriate to have the @@ -122,11 +122,11 @@ return score; } - public static Program createProgram(LearningProblem learningProblem, Concept mainTree) { + public static Program createProgram(LearningProblem learningProblem, Description mainTree) { return new Program(calculateFitness(learningProblem, mainTree), mainTree); } - private static Program createProgram(LearningProblem learningProblem, Concept mainTree, Concept adc) { + private static Program createProgram(LearningProblem learningProblem, Description mainTree, Description adc) { return new Program(calculateFitness(learningProblem, mainTree,adc), mainTree, adc); } @@ -140,29 +140,29 @@ // TODO: hier kann man noch mehr Feinabstimmung machen, d.h. // Mutation abh�ngig von Knotenanzahl if(Math.random()<0.5) { - Concept mainTree = mutation(learningProblem, p.getTree(),true); - Concept adc = p.getAdc(); + Description mainTree = mutation(learningProblem, p.getTree(),true); + Description adc = p.getAdc(); Score score = calculateFitness(learningProblem,mainTree,adc); return new Program(score, mainTree, adc); } else { - Concept mainTree = p.getTree(); - Concept adc = mutation(learningProblem, p.getAdc(),false); + Description mainTree = p.getTree(); + Description adc = mutation(learningProblem, p.getAdc(),false); Score score = calculateFitness(learningProblem,mainTree,adc); return new Program(score, mainTree, adc); } } else { - Concept tree = mutation(learningProblem, p.getTree(),false); + Description tree = mutation(learningProblem, p.getTree(),false); Score score = calculateFitness(learningProblem, tree); return new Program(score, tree); } } - private static Concept mutation(LearningProblem learningProblem, Concept tree, boolean useADC) { + private static Description mutation(LearningProblem learningProblem, Description tree, boolean useADC) { // auch bei Mutation muss darauf geachtet werden, dass // Baum nicht modifiziert wird (sonst w�rde man automatisch auch // andere "selected individuals" modifizieren) - Concept t = (Concept) tree.clone(); + Description t = (Description) tree.clone(); // bis auf Klon Mutation genau wie vorher int size = t.getNumberOfNodes(); // TODO: auch Mutationen von Einzelknoten erlauben @@ -182,10 +182,10 @@ */ // neue Implementierung int randNr = rand.nextInt(size) + 1; - Concept st = t.getSubtree(randNr); - Concept stParent = st.getParent(); + Description st = t.getSubtree(randNr); + Description stParent = st.getParent(); stParent.getChildren().remove(st); - Concept treeNew = createGrowRandomTree(learningProblem,3, useADC); + Description treeNew = createGrowRandomTree(learningProblem,3, useADC); stParent.addChild(treeNew); } else // return createLeafNode(useADC); @@ -193,11 +193,11 @@ return t; } - private static void swapSubtrees(Concept t1, Concept t2) { + private static void swapSubtrees(Description t1, Description t2) { if (t1.getParent() != null && t2.getParent() != null) { // handling children - Concept t1Parent = t1.getParent(); - Concept t2Parent = t2.getParent(); + Description t1Parent = t1.getParent(); + Description t2Parent = t2.getParent(); // t1 is first child if (t1Parent.getChild(0).equals(t1)) t1Parent.getChildren().add(0, t2); @@ -230,7 +230,7 @@ public static Program[] crossover(LearningProblem learningProblem, Program p1, Program p2) { crossover++; if(p1.getAdc() != null) { - Concept[] pt; + Description[] pt; Program result[] = new Program[2]; // es wird entweder ADC oder Hauptbaum einem Crossover @@ -246,7 +246,7 @@ } return result; } else { - Concept[] pt = crossover(p1.getTree(), p2.getTree()); + Description[] pt = crossover(p1.getTree(), p2.getTree()); Program result[] = new Program[2]; result[0] = createProgram(learningProblem,pt[0]); result[1] = createProgram(learningProblem,pt[1]); @@ -254,18 +254,18 @@ } } - private static Concept[] crossover(Concept tree1, Concept tree2) { - Concept tree1cloned = (Concept) tree1.clone(); - Concept tree2cloned = (Concept) tree2.clone(); + private static Description[] crossover(Description tree1, Description tree2) { + Description tree1cloned = (Description) tree1.clone(); + Description tree2cloned = (Description) tree2.clone(); - Concept[] results = new Concept[2]; + Description[] results = new Description[2]; int rand1 = rand.nextInt(tree1.getNumberOfNodes()); int rand2 = rand.nextInt(tree2.getNumberOfNodes()); - Concept t1 = tree1cloned.getSubtree(rand1); - Concept t2 = tree2cloned.getSubtree(rand2); + Description t1 = tree1cloned.getSubtree(rand1); + Description t2 = tree2cloned.getSubtree(rand2); if (t1.isRoot() && !t2.isRoot()) { - Concept t2Parent = t2.getParent(); + Description t2Parent = t2.getParent(); // t2 is first child if (t2Parent.getChild(0).equals(t2)) t2Parent.getChildren().add(0, t1); @@ -278,7 +278,7 @@ results[0] = t2; results[1] = tree2cloned; } else if (!t1.isRoot() && t2.isRoot()) { - Concept t1Parent = t1.getParent(); + Description t1Parent = t1.getParent(); // t2 is first child if (t1Parent.getChild(0).equals(t1)) t1Parent.getChildren().add(0, t2); @@ -314,7 +314,7 @@ // SortedSetTuple s = new SortedSetTuple(p.getScore().getDefPosSet(),p.getScore().getDefNegSet()); // Knoten kopieren, damit er sich nicht ver�ndert (es wird sonst der // parent-Link ver�ndert) - Concept treecloned = (Concept) p.getTree().clone(); + Description treecloned = (Description) p.getTree().clone(); if(p.getAdc() != null) return createProgram(learningProblem,hillClimbing(learningProblem,treecloned,(ScoreThreeValued)p.getScore()),p.getAdc()); else @@ -326,11 +326,11 @@ // Alternativen zu speichern und dann ein Element zuf�llig auszuw�hlen, // aber w�rde man das nicht machen, dann w�re das ein starker Bias // zu z.B. Disjunktion (weil die als erstes getestet wird) - private static Concept hillClimbing(LearningProblem learningProblem, Concept node, ScoreThreeValued score) { + private static Description hillClimbing(LearningProblem learningProblem, Description node, ScoreThreeValued score) { SortedSetTuple<Individual> tuple = new SortedSetTuple<Individual>(score.getPosClassified(),score.getNegClassified()); SortedSetTuple<String> stringTuple = Helper.getStringTuple(tuple); // FlatABox abox = FlatABox.getInstance(); - Concept returnNode = node; + Description returnNode = node; // damit stellen wir sicher, dass nur Konzepte in die Auswahl // genommen werden, die besser klassifizieren als das �bergebene // Konzept (falls das nicht existiert, dann hill climbing = reproduction) @@ -422,7 +422,7 @@ // returnNode.addChild(new AtomicConcept(name)); // returnNode.addChild(node); // if(useMultiStructures) - returnNode = new MultiDisjunction(new AtomicConcept(name),node); + returnNode = new Union(new NamedClass(name),node); // else // returnNode = new Disjunction(new AtomicConcept(name),node); // wegen else if schlie�en sich die F�lle gegenseitig aus @@ -432,19 +432,19 @@ // returnNode.addChild(new AtomicConcept(name)); // returnNode.addChild(node); // if(useMultiStructures) - returnNode = new MultiConjunction(new AtomicConcept(name),node); + returnNode = new Intersection(new NamedClass(name),node); // else // returnNode = new Conjunction(new AtomicConcept(name),node); } else if(nr<sizeSum3) { name = bestNeighbours.get(3).get(nr-sizeSum2); // returnNode = new Exists(new AtomicRole(name)); // returnNode.addChild(node); - returnNode = new Exists(new ObjectProperty(name),node); + returnNode = new ObjectSomeRestriction(new ObjectProperty(name),node); } else { name = bestNeighbours.get(4).get(nr-sizeSum3); // returnNode = new All(new AtomicRole(name)); // returnNode.addChild(node); - returnNode = new All(new ObjectProperty(name),node); + returnNode = new ObjectAllRestriction(new ObjectProperty(name),node); } return returnNode; @@ -488,7 +488,7 @@ return returnMap; } - private static Concept pickTerminalSymbol(LearningProblem learningProblem, boolean useADC) { + private static Description pickTerminalSymbol(LearningProblem learningProblem, boolean useADC) { // FlatABox abox = FlatABox.getInstance(); int nr; int nrOfConcepts = learningProblem.getReasoningService().getAtomicConcepts().size(); @@ -501,16 +501,16 @@ nr = rand.nextInt(2+nrOfConcepts); if(nr==0) - return new Top(); + return new Thing(); else if(nr==1) - return new Bottom(); + return new Nothing(); // die Zahl kann nur vorkommen, wenn ADC aktiviert ist else if(nr==2+nrOfConcepts) { // System.out.println("== ADC 2 =="); return new ADC(); } else - return (AtomicConcept) learningProblem.getReasoningService().getAtomicConceptsList().get(nr-2).clone(); + return (NamedClass) learningProblem.getReasoningService().getAtomicConceptsList().get(nr-2).clone(); } // Funktion nach Umstelllung der Konstruktoren nicht mehr ben�tigt @@ -628,7 +628,7 @@ return createProgram(learningProblem, createFullRandomTree(learningProblem, depth, false)); } - private static Concept createFullRandomTree(LearningProblem learningProblem, int depth, boolean useADC) { + private static Description createFullRandomTree(LearningProblem learningProblem, int depth, boolean useADC) { // FlatABox abox = FlatABox.getInstance(); int numberOfRoles = learningProblem.getReasoningService().getAtomicRoles().size(); // abox.roles.size(); @@ -637,26 +637,26 @@ // System.out.println(nr); // Node node = createNonLeafNodeEqualProp(); // Concept node = pickFunctionSymbol(); - Concept child1 = createFullRandomTree(learningProblem, depth-1, useADC); + Description child1 = createFullRandomTree(learningProblem, depth-1, useADC); if(nr == 0 || nr == 1) { - Concept child2 = createFullRandomTree(learningProblem, depth-1, useADC); + Description child2 = createFullRandomTree(learningProblem, depth-1, useADC); if(nr == 0) { // if(useMultiStructures) - return new MultiDisjunction(child1,child2); + return new Union(child1,child2); // else // return new Disjunction(child1,child2); } else { // if(useMultiStructures) - return new MultiConjunction(child1, child2); + return new Intersection(child1, child2); // else // return new Conjunction(child1, child2); } } else if(nr==2) { return new Negation(child1); } else if(nr - 3 < numberOfRoles) - return new Exists(learningProblem.getReasoningService().getAtomicRolesList().get(nr-3),child1); + return new ObjectSomeRestriction(learningProblem.getReasoningService().getAtomicRolesList().get(nr-3),child1); else - return new All(learningProblem.getReasoningService().getAtomicRolesList().get(nr-3-numberOfRoles),child1); + return new ObjectAllRestriction(learningProblem.getReasoningService().getAtomicRolesList().get(nr-3-numberOfRoles),child1); /* if(node instanceof Disjunction || node instanceof Conjunction) { @@ -689,7 +689,7 @@ return createProgram(learningProblem, createGrowRandomTree(learningProblem, depth,false)); } - private static Concept createGrowRandomTree(LearningProblem learningProblem, int depth, boolean useADC) { + private static Description createGrowRandomTree(LearningProblem learningProblem, int depth, boolean useADC) { /* private static Concept pickAlphabetSymbol(boolean useADC) { FlatABox abox = FlatABox.getInstance(); @@ -761,30 +761,30 @@ // Concept node = pickAlphabetSymbol(useADC); if(nr==0) - return new Top(); + return new Thing(); else if(nr==1) - return new Bottom(); + return new Nothing(); // ADC bekommt die h�chste Nummer, die nur in diesem Fall m�glich ist else if(nr==numberOfConcepts + 2*numberOfRoles + 5) return new ADC(); else if(nr>=2 && nr < numberOfConcepts+2) - return (AtomicConcept)learningProblem.getReasoningService().getAtomicConceptsList().get(nr-2).clone(); + return (NamedClass)learningProblem.getReasoningService().getAtomicConceptsList().get(nr-2).clone(); else if(nr==numberOfConcepts+2) { // if(useMultiStructures) - return new MultiConjunction(createGrowRandomTree(learningProblem, depth-1, useADC),createGrowRandomTree(learningProblem, depth-1, useADC)); + return new Intersection(createGrowRandomTree(learningProblem, depth-1, useADC),createGrowRandomTree(learningProblem, depth-1, useADC)); // else // return new Conjunction(createGrowRandomTree(learningProblem, depth-1, useADC),createGrowRandomTree(learningProblem, depth-1, useADC)); } else if(nr==numberOfConcepts+3) { // if(useMultiStructures) - return new MultiDisjunction(createGrowRandomTree(learningProblem, depth-1, useADC),createGrowRandomTree(learningProblem, depth-1, useADC)); + return new Union(createGrowRandomTree(learningProblem, depth-1, useADC),createGrowRandomTree(learningProblem, depth-1, useADC)); // else // return new Disjunction(createGrowRandomTree(learningProblem, depth-1, useADC),createGrowRandomTree(learningProblem, depth-1, useADC)); } else if(nr==numberOfConcepts+4) return new Negation(createGrowRandomTree(learningProblem, depth-1, useADC)); else if(nr>=numberOfConcepts+5 && nr<numberOfConcepts+5+numberOfRoles) - return new Exists(learningProblem.getReasoningService().getAtomicRolesList().get(nr-numberOfConcepts-5),createGrowRandomTree(learningProblem,depth-1, useADC)); + return new ObjectSomeRestriction(learningProblem.getReasoningService().getAtomicRolesList().get(nr-numberOfConcepts-5),createGrowRandomTree(learningProblem,depth-1, useADC)); else - return new All(learningProblem.getReasoningService().getAtomicRolesList().get(nr-numberOfConcepts-5-numberOfRoles),createGrowRandomTree(learningProblem,depth-1, useADC)); + return new ObjectAllRestriction(learningProblem.getReasoningService().getAtomicRolesList().get(nr-numberOfConcepts-5-numberOfRoles),createGrowRandomTree(learningProblem,depth-1, useADC)); /* if(node instanceof Disjunction || node instanceof Conjunction) { @@ -812,14 +812,14 @@ return checkTree(prog.getTree(), true); } - public static boolean checkTree(Concept node, boolean isRootNode) { + public static boolean checkTree(Description node, boolean isRootNode) { if(isRootNode && node.getParent()!=null) { System.out.println("inconsistent root"); return false; } // Kinder �berpr�fen - for(Concept child : node.getChildren()) { + for(Description child : node.getChildren()) { if(!child.getParent().equals(node)) { System.out.println("inconsistent tree " + node + " (child " + child + ")"); return false; Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java 2008-02-11 17:41:10 UTC (rev 541) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java 2008-02-11 18:50:44 UTC (rev 542) @@ -21,7 +21,7 @@ package org.dllearner.algorithms.gp; import org.dllearner.core.Score; -import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Description; /** * This class represents a program, i.e. an individual. @@ -33,11 +33,11 @@ // public static int fitnessEvaluations = 0; - private Concept hypothesis; + private Description hypothesis; // private Concept extendedHypothesis; - private Concept adc; + private Description adc; private Score score; @@ -53,11 +53,11 @@ * @param concept * The program tree. */ - public Program(Score score, Concept hypothesis) { + public Program(Score score, Description hypothesis) { this(score, hypothesis, null); } - public Program(Score score, Concept hypothesis, Concept adc) { + public Program(Score score, Description hypothesis, Description adc) { // this.learningProblem = learningProblem; this.score = score; this.hypothesis = hypothesis; @@ -126,7 +126,7 @@ * * @return The program tree. */ - public Concept getTree() { + public Description getTree() { return hypothesis; } @@ -134,7 +134,7 @@ return score; } - public Concept getAdc() { + public Description getAdc() { return adc; } } Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java 2008-02-11 17:41:10 UTC (rev 541) +++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java 2008-02-11 18:50:44 UTC (rev 542) @@ -7,7 +7,7 @@ import org.dllearner.algorithms.gp.Program; import org.dllearner.core.Score; -import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Description; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.utilities.ConceptComparator; import org.dllearner.utilities.ConceptTransformation; @@ -23,12 +23,12 @@ // Cache, damit keine Konzepte doppelt ausgewertet werden ConceptComparator conceptComparator = new ConceptComparator(); - public SortedMap<Concept,Score> evalCache = new TreeMap<Concept,Score>(conceptComparator); + public SortedMap<Description,Score> evalCache = new TreeMap<Description,Score>(conceptComparator); // Cache, damit PsiDown bzw. PsiUp nicht mehrfach für gleiches Konzept // aufgerufen werden - public SortedMap<Concept,Set<Concept>> pdCache = new TreeMap<Concept,Set<Concept>>(conceptComparator); - public SortedMap<Concept,Set<Concept>> puCache = new TreeMap<Concept,Set<Concept>>(conceptComparator); + public SortedMap<Description,Set<Description>> pdCache = new TreeMap<Description,Set<Description>>(conceptComparator); + public SortedMap<Description,Set<Description>> puCache = new TreeMap<Description,Set<Description>>(conceptComparator); // Statistiken int conceptCacheHits = 0; @@ -57,7 +57,7 @@ random = new Random(); } - public Concept applyPsi(Concept concept, int coveredPositives, int coveredNegatives) { + public Description applyPsi(Description concept, int coveredPositives, int coveredNegatives) { // Wahrscheinlichkeit für upward refinement berechnen double tmp = coveredNegatives/(double)nrOfNegativeExamples; double tmp2 = coveredPositives/(double)nrOfPositiveExamples; @@ -92,7 +92,7 @@ // someTimeStart = System.nanoTime(); // downward oder upward refinement operator anwenden - Set<Concept> refinements; + Set<Description> refinements; if(downward) { pdRequests++; // Cache aufrufen @@ -137,7 +137,7 @@ // ein refinement zufällig auswählen - Concept[] array = refinements.toArray(new Concept[0]); + Description[] array = refinements.toArray(new Description[0]); // kein refinement gefunden if(array.length==0) { if(debug) { @@ -149,12 +149,12 @@ } int position = random.nextInt(array.length); - Concept returnConcept = array[position]; + Description returnConcept = array[position]; ConceptTransformation.cleanConcept(returnConcept); // das Rückgabekonzept wird geklont, damit alle parent-Links repariert // werden (damit andere GP-Operatoren korrekt funktionieren) - Concept returnConceptClone = (Concept)returnConcept.clone(); + Description returnConceptClone = (Description)returnConcept.clone(); returnConceptClone.setParent(null); if(debug) { @@ -169,7 +169,7 @@ psiApplicationStartTime = System.nanoTime(); nrOfRequests++; - Concept concept = program.getTree(); + Description concept = program.getTree(); // es muss sichergestellt sein, dass Konjunktionen nur als MultConjunctions // vorhanden sind (analog bei Disjunktion) => effizienter wäre eine Auslagerung // dieses Codes in die Konzepterzeugung, da die Transformation häufig nichts @@ -180,11 +180,11 @@ // sich lohnt Operatoren zu definieren, die keine Negationsnormalform // erfordern) - Concept conceptMod = ConceptTransformation.transformToNegationNormalForm(concept); + Description conceptMod = ConceptTransformation.transformToNegationNormalForm(concept); // um mehr Cache Hits zu bekommen, wird noch vereinfach und geordnet - Concept conceptModForCache = ConceptTransformation.applyEquivalenceRules(conceptMod); + Description conceptModForCache = ConceptTransformation.applyEquivalenceRules(conceptMod); ConceptTransformation.transformToOrderedNegationNormalForm(conceptModForCache, conceptComparator); Score score = program.getScore(); @@ -196,14 +196,14 @@ int coveredPositives = score.getCoveredPositives().size(); int coveredNegatives = score.getCoveredNegatives().size(); // someTimeStart = System.nanoTime(); - Concept newConcept = applyPsi(conceptMod, coveredPositives, coveredNegatives); + Description newConcept = applyPsi(conceptMod, coveredPositives, coveredNegatives); ConceptTransformation.cleanConcept(newConcept); // someTime += System.nanoTime() - someTimeStart; // newConcept.setParent(null); /////////// TESTCODE: umwandeln des erhaltenen Konzepts // someTimeStart = System.nanoTime(); - Concept newConceptMod = ConceptTransformation.applyEquivalenceRules(newConcept); + Description newConceptMod = ConceptTransformation.applyEquivalenceRules(newConcept); ConceptTransformation.transformToOrderedNegationNormalForm(newConceptMod, conceptComparator); // someTime += System.nanoTime() - someTimeStart; /////////// @@ -278,11 +278,11 @@ return puRequests; } - public SortedMap<Concept, Set<Concept>> getPdCache() { + public SortedMap<Description, Set<Description>> getPdCache() { return pdCache; } - public SortedMap<Concept, Set<Concept>> getPuCache() { + public SortedMap<Description, Set<Description>> getPuCache() { return puCache; } Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java 2008-02-11 17:41:10 UTC (rev 541) +++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java 2008-02-11 18:50:44 UTC (rev 542) @@ -9,17 +9,17 @@ import org.dllearner.algorithms.refinement.RefinementOperator; import org.dllearner.core.ReasoningService; -import org.dllearner.core.owl.All; -import org.dllearner.core.owl.AtomicConcept; -import org.dllearner.core.owl.Bottom; -import org.dllearner.core.owl.Concept; -import org.dllearner.core.owl.Exists; -import org.dllearner.core.owl.MultiConjunction; -import org.dllearner.core.owl.MultiDisjunction; +import org.dllearner.core.owl.ObjectAllRestriction; +import org.dllearner.core.owl.NamedClass; +import org.dllearner.core.owl.Nothing; +import org.dllearner.core.owl.Description; +import org.dllearner.core.owl.ObjectSomeRestriction; +import org.dllearner.core.owl.Intersection; +import org.dllearner.core.owl.Union; import org.dllearner.core.owl.Negation; import org.dllearner.core.owl.ObjectProperty; -import org.dllearner.core.owl.Quantification; -import org.dllearner.core.owl.Top; +import org.dllearner.core.owl.ObjectQuantorRestriction; +import org.dllearner.core.owl.Thing; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.utilities.ConceptComparator; @@ -42,7 +42,7 @@ PosNegLP learningProblem; ReasoningService reasoningService; - private TreeSet<Concept> topSet; + private TreeSet<Description> topSet; public PsiDown(PosNegLP learningProblem) { this.learningProblem = learningProblem; @@ -53,140 +53,140 @@ } private void createTopSet() { - topSet = new TreeSet<Concept>(conceptComparator); + topSet = new TreeSet<Description>(conceptComparator); // TOP OR TOP => Was soll mit Refinements passieren, die immer improper sind? - MultiDisjunction md = new MultiDisjunction(); - md.addChild(new Top()); - md.addChild(new Top()); + Union md = new Union(); + md.addChild(new Thing()); + md.addChild(new Thing()); topSet.add(md); // allgemeinste Konzepte - topSet.addAll(reasoningService.getMoreSpecialConcepts(new Top())); + topSet.addAll(reasoningService.getMoreSpecialConcepts(new Thing())); // negierte speziellste Konzepte - Set<Concept> tmp = learningProblem.getReasoningService().getMoreGeneralConcepts(new Bottom()); - for(Concept c : tmp) + Set<Description> tmp = learningProblem.getReasoningService().getMoreGeneralConcepts(new Nothing()); + for(Description c : tmp) topSet.add(new Negation(c)); // EXISTS r.TOP und ALL r.TOP für alle r for(ObjectProperty r : reasoningService.getAtomicRoles()) { - topSet.add(new All(r, new Top())); - topSet.add(new Exists(r, new Top())); + topSet.add(new ObjectAllRestriction(r, new Thing())); + topSet.add(new ObjectSomeRestriction(r, new Thing())); } } @SuppressWarnings("unchecked") - public Set<Concept> refine(Concept concept) { + public Set<Description> refine(Description concept) { - Set<Concept> refinements = new HashSet<Concept>(); - Set<Concept> tmp = new HashSet<Concept>(); + Set<Description> refinements = new HashSet<Description>(); + Set<Description> tmp = new HashSet<Description>(); - if (concept instanceof Top) { - return (Set<Concept>) topSet.clone(); - } else if (concept instanceof Bottom) { + if (concept instanceof Thing) { + return (Set<Description>) topSet.clone(); + } else if (concept instanceof Nothing) { // return new TreeSet<Concept>(conceptComparator); - return new HashSet<Concept>(); - } else if (concept instanceof AtomicConcept) { + return new HashSet<Description>(); + } else if (concept instanceof NamedClass) { // beachte: die Funktion gibt bereits nur nicht-äquivalente Konzepte zurück // beachte weiter: die zurückgegebenen Instanzen dürfen nicht verändert werden, // da beim Caching der Subsumptionhierarchie (momentan) keine Kopien gemacht werden // Bottom wird hier ggf. automatisch mit zurückgegeben refinements.addAll(reasoningService.getMoreSpecialConcepts(concept)); // negiertes atomares Konzept - } else if (concept instanceof Negation && concept.getChild(0) instanceof AtomicConcept) { + } else if (concept instanceof Negation && concept.getChild(0) instanceof NamedClass) { tmp.addAll(reasoningService.getMoreGeneralConcepts(concept.getChild(0))); // Top rausschmeissen boolean containsTop = false; - Iterator<Concept> it = tmp.iterator(); + Iterator<Description> it = tmp.iterator(); while(it.hasNext()) { - Concept c = it.next(); - if(c instanceof Top) { + Description c = it.next(); + if(c instanceof Thing) { it.remove(); containsTop = true; } } if(containsTop) - refinements.add(new Bottom()); + refinements.add(new Nothing()); - for(Concept c : tmp) { + for(Description c : tmp) { refinements.add(new Negation(c)); } - } else if (concept instanceof MultiConjunction) { + } else if (concept instanceof Intersection) { // eines der Elemente kann verfeinert werden - for(Concept child : concept.getChildren()) { + for(Description child : concept.getChildren()) { // Refinement für das Kind ausführen tmp = refine(child); // neue MultiConjunction konstruieren - for(Concept c : tmp) { + for(Description c : tmp) { // TODO: müssen auch alle Konzepte geklont werden?? // hier wird nur eine neue Liste erstellt // => eigentlich muss nicht geklont werden (d.h. deep copy) da // die Konzepte nicht verändert werden während des Algorithmus - List<Concept> newChildren = new LinkedList<Concept>(concept.getChildren()); + List<Description> newChildren = new LinkedList<Description>(concept.getChildren()); // es muss genau die vorherige Reihenfolge erhalten bleiben // (zumindest bis die Normalform definiert ist) int index = newChildren.indexOf(child); newChildren.add(index, c); newChildren.remove(child); - MultiConjunction mc = new MultiConjunction(newChildren); + Intersection mc = new Intersection(newChildren); refinements.add(mc); } } - } else if (concept instanceof MultiDisjunction) { + } else if (concept instanceof Union) { // eines der Elemente kann verfeinert werden - for(Concept child : concept.getChildren()) { + for(Description child : concept.getChildren()) { // Refinement für das Kind ausführen // tmp = refine(child); tmp = refine(child); // neue MultiConjunction konstruieren - for(Concept c : tmp) { - List<Concept> newChildren = new LinkedList<Concept>(concept.getChildren()); + for(Description c : tmp) { + List<Description> newChildren = new LinkedList<Description>(concept.getChildren()); // es muss genau die vorherige Reihenfolge erhalten bleiben // (zumindest bis die Normalform definiert ist) int index = newChildren.indexOf(child); newChildren.add(index, c); newChildren.remove(child); - MultiDisjunction md = new MultiDisjunction(newChildren); + Union md = new Union(newChildren); refinements.add(md); } } // ein Element der Disjunktion kann weggelassen werden - for(Concept child : concept.getChildren()) { - List<Concept> newChildren = new LinkedList<Concept>(concept.getChildren()); + for(Description child : concept.getChildren()) { + List<Description> newChildren = new LinkedList<Description>(concept.getChildren()); newChildren.remove(child); // wenn nur ein Kind da ist, dann wird Disjunktion gleich weggelassen if(newChildren.size()==1) refinements.add(newChildren.get(0)); else { - MultiDisjunction md = new MultiDisjunction(newChildren); + Union md = new Union(newChildren); refinements.add(md); } } - } else if (concept instanceof Exists) { + } else if (concept instanceof ObjectSomeRestriction) { tmp = refine(concept.getChild(0)); - for(Concept c : tmp) { - refinements.add(new Exists(((Quantification)concept).getRole(),c)); + for(Description c : tmp) { + refinements.add(new ObjectSomeRestriction(((ObjectQuantorRestriction)concept).getRole(),c)); } // falls Kind Bottom ist, dann kann exists weggelassen werden - if(concept.getChild(0) instanceof Bottom) - refinements.add(new Bottom()); + if(concept.getChild(0) instanceof Nothing) + refinements.add(new Nothing()); - } else if (concept instanceof All) { + } else if (concept instanceof ObjectAllRestriction) { tmp = refine(concept.getChild(0)); - for(Concept c : tmp) { - refinements.add(new All(((Quantification)concept).getRole(),c)); + for(Description c : tmp) { + refinements.add(new ObjectAllRestriction(((ObjectQuantorRestriction)concept).getRole(),c)); } - if(concept.getChild(0) instanceof Bottom) - refinements.add(new Bottom()); + if(concept.getChild(0) instanceof Nothing) + refinements.add(new Nothing()); // falls es keine spezielleren atomaren Konzepte gibt, dann wird // bottom angehangen => nur wenn es ein atomares Konzept (insbesondere != bottom) @@ -200,13 +200,13 @@ // falls Konzept ungleich Bottom oder Top, dann kann ein Refinement von Top // angehangen werden - if(concept instanceof MultiDisjunction || concept instanceof AtomicConcept || - concept instanceof Negation || concept instanceof Exists || concept instanceof All) { + if(concept instanceof Union || concept instanceof NamedClass || + concept instanceof Negation || concept instanceof ObjectSomeRestriction || concept instanceof ObjectAllRestriction) { // es wird AND TOP angehangen - MultiConjunction mc = new MultiConjunction(); + Intersection mc = new Intersection(); mc.addChild(concept); - mc.addChild(new Top()); + mc.addChild(new Thing()); refinements.add(mc); } @@ -237,8 +237,8 @@ } - public Set<Concept> refine(Concept concept, int maxLength, - List<Concept> knownRefinements) { + public Set<Description> refine(Description concept, int maxLength, + List<Description> knownRefinements) { throw new RuntimeException(); } Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java 2008-02-11 17:41:10 UTC (rev 541) +++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java 2008-02-11 18:50:44 UTC (rev 542) @@ -9,17 +9,17 @@ import org.dllearner.algorithms.refinement.RefinementOperator; import org.dllearner.core.ReasoningService; -import org.dllearner.core.owl.All; -import org.dllearner.core.owl.AtomicConcept; -import org.dllearner.core.owl.Bottom; -import org.dllearner.core.owl.Concept; -import org.dllearner.core.owl.Exists; -import org.dllearner.core.owl.MultiConjunction; -import org.dllearner.core.owl.MultiDisjunction; +import org.dllearner.core.owl.ObjectAllRestriction; +import org.dllearner.core.owl.NamedClass; +import org.dllearner.core.owl.Nothing; +import org.dllearner.core.owl.Description; +import org.dllearner.core.owl.ObjectSomeRestriction; +import org.dllearner.core.owl.Intersection; +import org.dllearner.core.owl.Union; import org.dllearner.core.owl.Negation; import org.dllearner.core.owl.ObjectProperty; -import org.dllearner.core.owl.Quantification; -import org.dllearner.core.owl.Top; +import org.dllearner.core.owl.ObjectQuantorRestriction; +import org.dllearner.core.owl.Thing; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.utilities.ConceptComparator; @@ -30,7 +30,7 @@ PosNegLP learningProblem; ReasoningService reasoningService; - private TreeSet<Concept> bottomSet; + private TreeSet<Description> bottomSet; public PsiUp(PosNegLP learningProblem) { this.learningProblem = learningProblem; @@ -41,53 +41,53 @@ } private void createBottomSet() { - bottomSet = new TreeSet<Concept>(conceptComparator); + bottomSet = new TreeSet<Description>(conceptComparator); // BOTTOM AND BOTTOM - MultiConjunction mc = new MultiConjunction(); - mc.addChild(new Bottom()); - mc.addChild(new Bottom()); + Intersection mc = new Intersection(); + mc.addChild(new Nothing()); + mc.addChild(new Nothing()); bottomSet.add(mc); // speziellste Konzepte - bottomSet.addAll(reasoningService.getMoreGeneralConcepts(new Bottom())); + bottomSet.addAll(reasoningService.getMoreGeneralConcepts(new Nothing())); // negierte allgemeinste Konzepte - Set<Concept> tmp = reasoningService.getMoreSpecialConcepts(new Top()); - for(Concept c : tmp) + Set<Description> tmp = reasoningService.getMoreSpecialConcepts(new Thing()); + for(Description c : tmp) bottomSet.add(new Negation(c)); // EXISTS r.BOTTOM und ALL r.BOTTOM für alle r for(ObjectProperty r : reasoningService.getAtomicRoles()) { - bottomSet.add(new All(r, new Bottom())); - bottomSet.add(new Exists(r, new Bottom())); + bottomSet.add(new ObjectAllRestriction(r, new Nothing())); + bottomSet.add(new ObjectSomeRestriction(r, new Nothing())); } } @SuppressWarnings("unchecked") - public Set<Concept> refine(Concept concept) { + public Set<Description> refine(Description concept) { - Set<Concept> refinements = new HashSet<Concept>(); - Set<Concept> tmp = new HashSet<Concept>(); + Set<Description> refinements = new HashSet<Description>(); + Set<Description> tmp = new HashSet<Description>(); - if (concept instanceof Top) { - return new TreeSet<Concept>(conceptComparator); - } else if (concept instanceof Bottom) { - return (Set<Concept>) bottomSet.clone(); - } else if (concept instanceof AtomicConcept) { + if (concept instanceof Thing) { + return new TreeSet<Description>(conceptComparator); + } else if (concept instanceof Nothing) { + return (Set<Description>) bottomSet.clone(); + } else if (concept instanceof NamedClass) { // Top darf hier mit dabei sein refinements.addAll(reasoningService.getMoreGeneralConcepts(concept)); // negiertes atomares Konzept - } else if (concept instanceof Negation && concept.getChild(0) instanceof AtomicConcept) { + } else if (concept instanceof Negation && concept.getChild(0) instanceof NamedClass) { tmp.addAll(reasoningService.getMoreSpecialConcepts(concept.getChild(0))); // Bottom rausschmeissen boolean containsBottom = false; - Iterator<Concept> it = tmp.iterator(); + Iterator<Description> it = tmp.iterator(); while(it.hasNext()) { - Concept c = it.next(); - if(c instanceof Bottom) { + Description c = it.next(); + if(c instanceof Nothing) { it.remove(); containsBottom = true; } @@ -95,82 +95,82 @@ // es soll z.B. NOT male auch zu NOT BOTTOM d.h. zu TOP verfeinert // werden können if(containsBottom) - refinements.add(new Top()); + refinements.add(new Thing()); - for(Concept c : tmp) { + for(Description c : tmp) { refinements.add(new Negation(c)); } - } else if (concept instanceof MultiConjunction) { + } else if (concept instanceof Intersection) { // eines der Elemente kann verfeinert werden - for(Concept child : concept.getChildren()) { + for(Description child : concept.getChildren()) { // Refinement für das Kind ausführen tmp = refine(child); // neue MultiConjunction konstruieren - for(Concept c : tmp) { + for(Description c : tmp) { // TODO: müssen auch alle Konzepte geklont werden?? // hier wird nur eine neue Liste erstellt // => eigentlich muss nicht geklont werden (d.h. deep copy) da // die Konzepte nicht verändert werden während des Algorithmus - List<Concept> newChildren = new LinkedList<Concept>(concept.getChildren()); + List<Description> newChildren = new LinkedList<Description>(concept.getChildren()); // es muss genau die vorherige Reihenfolge erhalten bleiben // (zumindest bis die Normalform definiert ist) int index = newChildren.indexOf(child); newChildren.add(index, c); newChildren.remove(child); - MultiConjunction mc = new MultiConjunction(... [truncated message content] |
From: <jen...@us...> - 2008-02-11 17:41:17
|
Revision: 541 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=541&view=rev Author: jenslehmann Date: 2008-02-11 09:41:10 -0800 (Mon, 11 Feb 2008) Log Message: ----------- start moving core structures from mixed DL/OWL to OWL only Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedNode.java trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/RefinementOperator.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/SearchSpace.java trunk/src/dl-learner/org/dllearner/cli/Start.java trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java trunk/src/dl-learner/org/dllearner/core/LearningProblem.java trunk/src/dl-learner/org/dllearner/core/Reasoner.java trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java trunk/src/dl-learner/org/dllearner/core/ReasoningService.java trunk/src/dl-learner/org/dllearner/core/Score.java trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java trunk/src/dl-learner/org/dllearner/core/owl/All.java trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java trunk/src/dl-learner/org/dllearner/core/owl/Bottom.java trunk/src/dl-learner/org/dllearner/core/owl/Concept.java trunk/src/dl-learner/org/dllearner/core/owl/ConceptAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/Conjunction.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/Disjunction.java trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/Equality.java trunk/src/dl-learner/org/dllearner/core/owl/Exists.java trunk/src/dl-learner/org/dllearner/core/owl/FlatABox.java trunk/src/dl-learner/org/dllearner/core/owl/FunctionalRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/GreaterEqual.java trunk/src/dl-learner/org/dllearner/core/owl/Inclusion.java trunk/src/dl-learner/org/dllearner/core/owl/Individual.java trunk/src/dl-learner/org/dllearner/core/owl/InverseRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/KB.java trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java trunk/src/dl-learner/org/dllearner/core/owl/LessEqual.java trunk/src/dl-learner/org/dllearner/core/owl/MultiConjunction.java trunk/src/dl-learner/org/dllearner/core/owl/MultiDisjunction.java trunk/src/dl-learner/org/dllearner/core/owl/Negation.java trunk/src/dl-learner/org/dllearner/core/owl/NumberRestriction.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java trunk/src/dl-learner/org/dllearner/core/owl/Property.java trunk/src/dl-learner/org/dllearner/core/owl/PropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/owl/Quantification.java trunk/src/dl-learner/org/dllearner/core/owl/RBoxAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/RoleHierarchy.java trunk/src/dl-learner/org/dllearner/core/owl/SubRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java trunk/src/dl-learner/org/dllearner/core/owl/SymmetricRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java trunk/src/dl-learner/org/dllearner/core/owl/Top.java trunk/src/dl-learner/org/dllearner/core/owl/TransitiveRoleAxiom.java trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java trunk/src/dl-learner/org/dllearner/gui/MiniGUI.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java trunk/src/dl-learner/org/dllearner/kb/KBFile.java trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLPStrict.java trunk/src/dl-learner/org/dllearner/learningproblems/PosNegInclusionLP.java trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyDefinitionLP.java trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyInclusionLP.java trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyLP.java trunk/src/dl-learner/org/dllearner/learningproblems/RoleLearning.java trunk/src/dl-learner/org/dllearner/learningproblems/ScoreThreeValued.java trunk/src/dl-learner/org/dllearner/learningproblems/ScoreTwoValued.java trunk/src/dl-learner/org/dllearner/parser/ConfParser.java trunk/src/dl-learner/org/dllearner/parser/ConfParserTokenManager.java trunk/src/dl-learner/org/dllearner/parser/KBParser.java trunk/src/dl-learner/org/dllearner/parser/KBParserTokenManager.java trunk/src/dl-learner/org/dllearner/parser/conf.jj trunk/src/dl-learner/org/dllearner/parser/kb.jj trunk/src/dl-learner/org/dllearner/reasoning/DIGConverter.java trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java trunk/src/dl-learner/org/dllearner/reasoning/FastRetrieval.java trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java trunk/src/dl-learner/org/dllearner/utilities/ConceptComparator.java trunk/src/dl-learner/org/dllearner/utilities/ConceptTransformation.java trunk/src/dl-learner/org/dllearner/utilities/CrossValidation.java trunk/src/dl-learner/org/dllearner/utilities/Datastructures.java trunk/src/dl-learner/org/dllearner/utilities/Helper.java trunk/src/dl-learner/org/dllearner/utilities/OntologyClassRewriter.java trunk/src/dl-learner/org/dllearner/utilities/RoleComparator.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/core/owl/ trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java Removed Paths: ------------- trunk/src/dl-learner/org/dllearner/core/dl/ trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java Modified: trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-02-11 17:41:10 UTC (rev 541) @@ -35,16 +35,16 @@ import org.dllearner.core.config.ConfigOption; import org.dllearner.core.config.IntegerConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; -import org.dllearner.core.dl.All; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Bottom; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Conjunction; -import org.dllearner.core.dl.Disjunction; -import org.dllearner.core.dl.Exists; -import org.dllearner.core.dl.Negation; -import org.dllearner.core.dl.Top; +import org.dllearner.core.owl.All; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Bottom; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Conjunction; +import org.dllearner.core.owl.Disjunction; +import org.dllearner.core.owl.Exists; +import org.dllearner.core.owl.Negation; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.Top; /** * A brute force learning algorithm. Modified: trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-02-11 17:41:10 UTC (rev 541) @@ -33,7 +33,7 @@ import org.dllearner.core.config.ConfigOption; import org.dllearner.core.config.IntegerConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; -import org.dllearner.core.dl.Concept; +import org.dllearner.core.owl.Concept; public class RandomGuesser extends LearningAlgorithm { Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/ADC.java 2008-02-11 17:41:10 UTC (rev 541) @@ -2,7 +2,7 @@ import java.util.Map; -import org.dllearner.core.dl.Concept; +import org.dllearner.core.owl.Concept; public class ADC extends Concept { Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GP.java 2008-02-11 17:41:10 UTC (rev 541) @@ -41,8 +41,8 @@ import org.dllearner.core.config.IntegerConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; import org.dllearner.core.config.StringConfigOption; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Top; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Top; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.utilities.Helper; Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java 2008-02-11 17:41:10 UTC (rev 541) @@ -10,18 +10,18 @@ import org.dllearner.core.LearningProblem; import org.dllearner.core.ReasoningMethodUnsupportedException; import org.dllearner.core.Score; -import org.dllearner.core.dl.All; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Bottom; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Exists; -import org.dllearner.core.dl.FlatABox; -import org.dllearner.core.dl.Individual; -import org.dllearner.core.dl.MultiConjunction; -import org.dllearner.core.dl.MultiDisjunction; -import org.dllearner.core.dl.Negation; -import org.dllearner.core.dl.Top; +import org.dllearner.core.owl.All; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Bottom; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Exists; +import org.dllearner.core.owl.FlatABox; +import org.dllearner.core.owl.Individual; +import org.dllearner.core.owl.MultiConjunction; +import org.dllearner.core.owl.MultiDisjunction; +import org.dllearner.core.owl.Negation; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.Top; import org.dllearner.learningproblems.PosNegDefinitionLPStrict; import org.dllearner.learningproblems.ScoreThreeValued; import org.dllearner.reasoning.FastRetrieval; Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/Program.java 2008-02-11 17:41:10 UTC (rev 541) @@ -21,7 +21,7 @@ package org.dllearner.algorithms.gp; import org.dllearner.core.Score; -import org.dllearner.core.dl.Concept; +import org.dllearner.core.owl.Concept; /** * This class represents a program, i.e. an individual. Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/Psi.java 2008-02-11 17:41:10 UTC (rev 541) @@ -7,7 +7,7 @@ import org.dllearner.algorithms.gp.Program; import org.dllearner.core.Score; -import org.dllearner.core.dl.Concept; +import org.dllearner.core.owl.Concept; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.utilities.ConceptComparator; import org.dllearner.utilities.ConceptTransformation; Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java 2008-02-11 17:41:10 UTC (rev 541) @@ -9,17 +9,17 @@ import org.dllearner.algorithms.refinement.RefinementOperator; import org.dllearner.core.ReasoningService; -import org.dllearner.core.dl.All; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Bottom; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Exists; -import org.dllearner.core.dl.MultiConjunction; -import org.dllearner.core.dl.MultiDisjunction; -import org.dllearner.core.dl.Negation; -import org.dllearner.core.dl.Quantification; -import org.dllearner.core.dl.Top; +import org.dllearner.core.owl.All; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Bottom; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Exists; +import org.dllearner.core.owl.MultiConjunction; +import org.dllearner.core.owl.MultiDisjunction; +import org.dllearner.core.owl.Negation; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.Quantification; +import org.dllearner.core.owl.Top; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.utilities.ConceptComparator; Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java 2008-02-11 17:41:10 UTC (rev 541) @@ -9,17 +9,17 @@ import org.dllearner.algorithms.refinement.RefinementOperator; import org.dllearner.core.ReasoningService; -import org.dllearner.core.dl.All; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Bottom; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Exists; -import org.dllearner.core.dl.MultiConjunction; -import org.dllearner.core.dl.MultiDisjunction; -import org.dllearner.core.dl.Negation; -import org.dllearner.core.dl.Quantification; -import org.dllearner.core.dl.Top; +import org.dllearner.core.owl.All; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Bottom; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Exists; +import org.dllearner.core.owl.MultiConjunction; +import org.dllearner.core.owl.MultiDisjunction; +import org.dllearner.core.owl.Negation; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.Quantification; +import org.dllearner.core.owl.Top; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.utilities.ConceptComparator; Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedNode.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedNode.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedNode.java 2008-02-11 17:41:10 UTC (rev 541) @@ -23,8 +23,8 @@ import java.util.Set; import java.util.TreeSet; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Individual; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Individual; import org.dllearner.utilities.ConceptComparator; /** Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-02-11 17:41:10 UTC (rev 541) @@ -39,9 +39,9 @@ import org.dllearner.core.config.DoubleConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; import org.dllearner.core.config.StringConfigOption; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Concept; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.ObjectProperty; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.learningproblems.PosOnlyDefinitionLP; import org.dllearner.utilities.Files; Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLearner.java 2008-02-11 17:41:10 UTC (rev 541) @@ -36,11 +36,11 @@ import org.dllearner.core.LearningProblem; import org.dllearner.core.ReasoningService; import org.dllearner.core.Score; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Individual; -import org.dllearner.core.dl.MultiConjunction; -import org.dllearner.core.dl.MultiDisjunction; -import org.dllearner.core.dl.Top; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Individual; +import org.dllearner.core.owl.MultiConjunction; +import org.dllearner.core.owl.MultiDisjunction; +import org.dllearner.core.owl.Top; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.learningproblems.PosOnlyDefinitionLP; import org.dllearner.utilities.ConceptComparator; Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/Node.java 2008-02-11 17:41:10 UTC (rev 541) @@ -3,7 +3,7 @@ import java.util.Set; import java.util.TreeSet; -import org.dllearner.core.dl.Concept; +import org.dllearner.core.owl.Concept; import org.dllearner.utilities.ConceptComparator; public class Node { Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2008-02-11 17:41:10 UTC (rev 541) @@ -24,12 +24,12 @@ import org.dllearner.core.config.DoubleConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; import org.dllearner.core.config.StringConfigOption; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.MultiConjunction; -import org.dllearner.core.dl.MultiDisjunction; -import org.dllearner.core.dl.Top; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.MultiConjunction; +import org.dllearner.core.owl.MultiDisjunction; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.Top; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.learningproblems.PosOnlyDefinitionLP; import org.dllearner.utilities.ConceptComparator; Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/RefinementOperator.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refinement/RefinementOperator.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/RefinementOperator.java 2008-02-11 17:41:10 UTC (rev 541) @@ -3,7 +3,7 @@ import java.util.List; import java.util.Set; -import org.dllearner.core.dl.Concept; +import org.dllearner.core.owl.Concept; public interface RefinementOperator { Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java 2008-02-11 17:41:10 UTC (rev 541) @@ -30,20 +30,20 @@ import java.util.TreeSet; import org.dllearner.core.ReasoningService; -import org.dllearner.core.dl.All; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Bottom; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Conjunction; -import org.dllearner.core.dl.Disjunction; -import org.dllearner.core.dl.Exists; -import org.dllearner.core.dl.MultiConjunction; -import org.dllearner.core.dl.MultiDisjunction; -import org.dllearner.core.dl.Negation; -import org.dllearner.core.dl.Quantification; -import org.dllearner.core.dl.ObjectPropertyExpression; -import org.dllearner.core.dl.Top; +import org.dllearner.core.owl.All; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Bottom; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Conjunction; +import org.dllearner.core.owl.Disjunction; +import org.dllearner.core.owl.Exists; +import org.dllearner.core.owl.MultiConjunction; +import org.dllearner.core.owl.MultiDisjunction; +import org.dllearner.core.owl.Negation; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.ObjectPropertyExpression; +import org.dllearner.core.owl.Quantification; +import org.dllearner.core.owl.Top; import org.dllearner.utilities.ConceptComparator; import org.dllearner.utilities.ConceptTransformation; Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/SearchSpace.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refinement/SearchSpace.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/SearchSpace.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,6 +1,6 @@ package org.dllearner.algorithms.refinement; -import org.dllearner.core.dl.Concept; +import org.dllearner.core.owl.Concept; /** * Soll hauptsächlich dazu dienen zu testen, ob ein Konzept im Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java =================================================================== --- trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-02-11 17:41:10 UTC (rev 541) @@ -61,10 +61,10 @@ import org.dllearner.core.config.StringConfigOption; import org.dllearner.core.config.StringSetConfigOption; import org.dllearner.core.config.StringTupleListConfigOption; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Individual; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Individual; +import org.dllearner.core.owl.ObjectProperty; import org.dllearner.kb.KBFile; import org.dllearner.kb.OWLFile; import org.dllearner.kb.sparql.SparqlKnowledgeSource; Modified: trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/LearningAlgorithm.java 2008-02-11 17:41:10 UTC (rev 541) @@ -23,7 +23,7 @@ import java.util.LinkedList; import java.util.List; -import org.dllearner.core.dl.Concept; +import org.dllearner.core.owl.Concept; /** * @author Jens Lehmann Modified: trunk/src/dl-learner/org/dllearner/core/LearningProblem.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/LearningProblem.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/LearningProblem.java 2008-02-11 17:41:10 UTC (rev 541) @@ -19,7 +19,7 @@ */ package org.dllearner.core; -import org.dllearner.core.dl.Concept; +import org.dllearner.core.owl.Concept; /** * Base class for all learning problems. Modified: trunk/src/dl-learner/org/dllearner/core/Reasoner.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/Reasoner.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/Reasoner.java 2008-02-11 17:41:10 UTC (rev 541) @@ -24,12 +24,12 @@ import java.util.Set; import java.util.SortedSet; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Individual; -import org.dllearner.core.dl.RoleHierarchy; -import org.dllearner.core.dl.SubsumptionHierarchy; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Individual; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.RoleHierarchy; +import org.dllearner.core.owl.SubsumptionHierarchy; import org.dllearner.reasoning.ReasonerType; import org.dllearner.utilities.SortedSetTuple; Modified: trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java 2008-02-11 17:41:10 UTC (rev 541) @@ -25,12 +25,12 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Individual; -import org.dllearner.core.dl.RoleHierarchy; -import org.dllearner.core.dl.SubsumptionHierarchy; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Individual; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.RoleHierarchy; +import org.dllearner.core.owl.SubsumptionHierarchy; import org.dllearner.utilities.SortedSetTuple; /** Modified: trunk/src/dl-learner/org/dllearner/core/ReasoningService.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/ReasoningService.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/ReasoningService.java 2008-02-11 17:41:10 UTC (rev 541) @@ -27,12 +27,12 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Individual; -import org.dllearner.core.dl.RoleHierarchy; -import org.dllearner.core.dl.SubsumptionHierarchy; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Individual; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.RoleHierarchy; +import org.dllearner.core.owl.SubsumptionHierarchy; import org.dllearner.reasoning.ReasonerType; import org.dllearner.utilities.SortedSetTuple; Modified: trunk/src/dl-learner/org/dllearner/core/Score.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/Score.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/Score.java 2008-02-11 17:41:10 UTC (rev 541) @@ -2,7 +2,7 @@ import java.util.Set; -import org.dllearner.core.dl.Individual; +import org.dllearner.core.owl.Individual; public abstract class Score { public abstract double getScore(); Modified: trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java 2008-02-11 17:41:10 UTC (rev 541) @@ -23,9 +23,9 @@ import java.util.SortedSet; import java.util.TreeSet; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Individual; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Individual; +import org.dllearner.core.owl.ObjectProperty; import org.dllearner.utilities.ConceptComparator; /** Copied: trunk/src/dl-learner/org/dllearner/core/owl (from rev 540, trunk/src/dl-learner/org/dllearner/core/dl) Modified: trunk/src/dl-learner/org/dllearner/core/owl/All.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/All.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/All.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/AssertionalAxiom.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/AssertionalAxiom.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; public abstract class AssertionalAxiom extends Axiom { Deleted: trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/AtomicConcept.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,63 +0,0 @@ -/** - * Copyright (C) 2007, Jens Lehmann - * - * This file is part of DL-Learner. - * - * DL-Learner is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * DL-Learner is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.dllearner.core.dl; - -import java.util.Map; - -import org.dllearner.utilities.Helper; - -/** - * Represents an atomic concept in a knowledge base / ontology, - * e.g. "car", "person". - * - * @author Jens Lehmann - * - */ -public class AtomicConcept extends Concept { - - String name; - - public AtomicConcept(String name) { - this.name = name; - } - - public String getName() { - return name; - } - - public int getLength() { - return 1; - } - - @Override - public int getArity() { - return 0; - } - - @Override - public String toString() { - return name; - } - - public String toString(String baseURI, Map<String,String> prefixes) { - return Helper.getAbbreviatedString(name, baseURI, prefixes); - } - -} Added: trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/owl/AtomicConcept.java 2008-02-11 17:41:10 UTC (rev 541) @@ -0,0 +1,63 @@ +/** + * Copyright (C) 2007, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.owl; + +import java.util.Map; + +import org.dllearner.utilities.Helper; + +/** + * Represents an atomic concept in a knowledge base / ontology, + * e.g. "car", "person". + * + * @author Jens Lehmann + * + */ +public class AtomicConcept extends Concept { + + String name; + + public AtomicConcept(String name) { + this.name = name; + } + + public String getName() { + return name; + } + + public int getLength() { + return 1; + } + + @Override + public int getArity() { + return 0; + } + + @Override + public String toString() { + return name; + } + + public String toString(String baseURI, Map<String,String> prefixes) { + return Helper.getAbbreviatedString(name, baseURI, prefixes); + } + +} Modified: trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Axiom.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Axiom.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; public abstract class Axiom implements KBElement { Modified: trunk/src/dl-learner/org/dllearner/core/owl/Bottom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Bottom.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Bottom.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/Concept.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Concept.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Concept.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.LinkedList; import java.util.List; Modified: trunk/src/dl-learner/org/dllearner/core/owl/ConceptAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/ConceptAssertion.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/ConceptAssertion.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/Conjunction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Conjunction.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Conjunction.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/DatatypeProperty.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypeProperty.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/DatatypePropertyAssertion.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/DatatypePropertyAssertion.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; /** * A datatype property assertion. Modified: trunk/src/dl-learner/org/dllearner/core/owl/Disjunction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Disjunction.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Disjunction.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/DoubleDatatypePropertyAssertion.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/DoubleDatatypePropertyAssertion.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/Equality.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Equality.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Equality.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/Exists.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Exists.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Exists.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/FlatABox.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/FlatABox.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/FlatABox.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.HashMap; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/FunctionalRoleAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/FunctionalRoleAxiom.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/FunctionalRoleAxiom.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/GreaterEqual.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/GreaterEqual.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/GreaterEqual.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/Inclusion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Inclusion.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Inclusion.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/Individual.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Individual.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Individual.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/InverseRoleAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/InverseRoleAxiom.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/InverseRoleAxiom.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/KB.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/KB.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/KB.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.HashSet; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/KBElement.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/KBElement.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/LessEqual.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/LessEqual.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/LessEqual.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/MultiConjunction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/MultiConjunction.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/MultiConjunction.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.List; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/MultiDisjunction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/MultiDisjunction.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/MultiDisjunction.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.List; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/Negation.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Negation.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Negation.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/NumberRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/NumberRestriction.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/NumberRestriction.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; public abstract class NumberRestriction extends Concept { Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/ObjectProperty.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectProperty.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyAssertion.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyAssertion.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyExpression.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyExpression.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; /** * An object property expression is an object property construct, which Modified: trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyInverse.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/ObjectPropertyInverse.java 2008-02-11 17:41:10 UTC (rev 541) @@ -18,7 +18,7 @@ * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/Property.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Property.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Property.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; /** * @author Jens Lehmann Modified: trunk/src/dl-learner/org/dllearner/core/owl/PropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/PropertyAssertion.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/PropertyAssertion.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; /** * @author Jens Lehmann Modified: trunk/src/dl-learner/org/dllearner/core/owl/Quantification.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Quantification.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Quantification.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; public abstract class Quantification extends Concept { Modified: trunk/src/dl-learner/org/dllearner/core/owl/RBoxAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/RBoxAxiom.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/RBoxAxiom.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; public abstract class RBoxAxiom extends Axiom { Modified: trunk/src/dl-learner/org/dllearner/core/owl/RoleHierarchy.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/RoleHierarchy.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/RoleHierarchy.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Set; import java.util.SortedSet; Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubRoleAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/SubRoleAxiom.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/SubRoleAxiom.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/SubsumptionHierarchy.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/SubsumptionHierarchy.java 2008-02-11 17:41:10 UTC (rev 541) @@ -17,7 +17,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. * */ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Set; import java.util.SortedSet; Modified: trunk/src/dl-learner/org/dllearner/core/owl/SymmetricRoleAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/SymmetricRoleAxiom.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/SymmetricRoleAxiom.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/TerminologicalAxiom.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/TerminologicalAxiom.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; public abstract class TerminologicalAxiom extends Axiom { Modified: trunk/src/dl-learner/org/dllearner/core/owl/Top.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Top.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/Top.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/core/owl/TransitiveRoleAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/TransitiveRoleAxiom.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/core/owl/TransitiveRoleAxiom.java 2008-02-11 17:41:10 UTC (rev 541) @@ -1,4 +1,4 @@ -package org.dllearner.core.dl; +package org.dllearner.core.owl; import java.util.Map; Modified: trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java =================================================================== --- trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-02-11 17:41:10 UTC (rev 541) @@ -29,16 +29,16 @@ import java.util.List; import java.util.Map; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.DatatypeProperty; -import org.dllearner.core.dl.DatatypePropertyAssertion; -import org.dllearner.core.dl.DoubleDatatypePropertyAssertion; -import org.dllearner.core.dl.ObjectProperty; -import org.dllearner.core.dl.Axiom; -import org.dllearner.core.dl.ConceptAssertion; -import org.dllearner.core.dl.Individual; -import org.dllearner.core.dl.KB; -import org.dllearner.core.dl.ObjectPropertyAssertion; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Axiom; +import org.dllearner.core.owl.ConceptAssertion; +import org.dllearner.core.owl.DatatypeProperty; +import org.dllearner.core.owl.DatatypePropertyAssertion; +import org.dllearner.core.owl.DoubleDatatypePropertyAssertion; +import org.dllearner.core.owl.Individual; +import org.dllearner.core.owl.KB; +import org.dllearner.core.owl.ObjectProperty; +import org.dllearner.core.owl.ObjectPropertyAssertion; import org.dllearner.parser.ParseException; import org.dllearner.parser.PrologParser; import org.dllearner.prolog.Atom; Modified: trunk/src/dl-learner/org/dllearner/gui/MiniGUI.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/MiniGUI.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/gui/MiniGUI.java 2008-02-11 17:41:10 UTC (rev 541) @@ -45,8 +45,8 @@ import org.dllearner.core.LearningProblem; import org.dllearner.core.ReasonerComponent; import org.dllearner.core.ReasoningService; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Individual; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Individual; import org.dllearner.kb.OWLFile; import org.dllearner.learningproblems.PosOnlyDefinitionLP; import org.dllearner.reasoning.DIGReasoner; Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-11 17:41:10 UTC (rev 541) @@ -42,9 +42,9 @@ import org.dllearner.core.config.ConfigOption; import org.dllearner.core.config.StringSetConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; -import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.Individual; -import org.dllearner.core.dl.ObjectProperty; +import org.dllearner.core.owl.AtomicConcept; +import org.dllearner.core.owl.Individual; +import org.dllearner.core.owl.ObjectProperty; /** * WidgetPanelStringSet Modified: trunk/src/dl-learner/org/dllearner/kb/KBFile.java =================================================================== --- trunk/src/dl-learner/org/dllearner/kb/KBFile.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/kb/KBFile.java 2008-02-11 17:41:10 UTC (rev 541) @@ -32,7 +32,7 @@ import org.dllearner.core.config.ConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; import org.dllearner.core.config.StringConfigOption; -import org.dllearner.core.dl.KB; +import org.dllearner.core.owl.KB; import org.dllearner.parser.KBParser; import org.dllearner.parser.ParseException; import org.dllearner.reasoning.DIGConverter; Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java =================================================================== --- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-02-11 17:41:10 UTC (rev 541) @@ -43,7 +43,7 @@ import org.dllearner.core.config.StringConfigOption; import org.dllearner.core.config.StringSetConfigOption; import org.dllearner.core.config.StringTupleListConfigOption; -import org.dllearner.core.dl.KB; +import org.dllearner.core.owl.KB; import org.dllearner.kb.sparql.configuration.SparqlEndpoint; import org.dllearner.kb.sparql.configuration.SparqlQueryType; import org.dllearner.parser.KBParser; Modified: trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java =================================================================== --- trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/learningproblems/EvaluationCache.java 2008-02-11 17:41:10 UTC (rev 541) @@ -23,10 +23,10 @@ import java.util.SortedSet; import java.util.TreeMap; -import org.dllearner.core.dl.Concept; -import org.dllearner.core.dl.Individual; -import org.dllearner.core.dl.MultiConjunction; -import org.dllearner.core.dl.MultiDisjunction; +import org.dllearner.core.owl.Concept; +import org.dllearner.core.owl.Individual; +import org.dllearner.core.owl.MultiConjunction; +import org.dllearner.core.owl.MultiDisjunction; import org.dllearner.utilities.ConceptComparator; import org.dllearner.utilities.Helper; import org.dllearner.utilities.SortedSetTuple; Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java =================================================================== --- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java 2008-02-11 15:24:02 UTC (rev 540) +++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinit... [truncated message content] |
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. |
From: <jen...@us...> - 2008-02-11 15:03:54
|
Revision: 539 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=539&view=rev Author: jenslehmann Date: 2008-02-11 07:03:50 -0800 (Mon, 11 Feb 2008) Log Message: ----------- - continued carcinogenesis mapper - started datatype support in DL-Learner core Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java trunk/src/dl-learner/org/dllearner/cli/Start.java trunk/src/dl-learner/org/dllearner/core/Reasoner.java trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java trunk/src/dl-learner/org/dllearner/core/ReasoningService.java trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java trunk/src/dl-learner/org/dllearner/core/dl/All.java trunk/src/dl-learner/org/dllearner/core/dl/ConceptAssertion.java trunk/src/dl-learner/org/dllearner/core/dl/Exists.java trunk/src/dl-learner/org/dllearner/core/dl/FunctionalRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/dl/GreaterEqual.java trunk/src/dl-learner/org/dllearner/core/dl/InverseRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/dl/KB.java trunk/src/dl-learner/org/dllearner/core/dl/LessEqual.java trunk/src/dl-learner/org/dllearner/core/dl/NumberRestriction.java trunk/src/dl-learner/org/dllearner/core/dl/Quantification.java trunk/src/dl-learner/org/dllearner/core/dl/RoleHierarchy.java trunk/src/dl-learner/org/dllearner/core/dl/SubRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/dl/SymmetricRoleAxiom.java trunk/src/dl-learner/org/dllearner/core/dl/TransitiveRoleAxiom.java trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java trunk/src/dl-learner/org/dllearner/reasoning/DIGConverter.java trunk/src/dl-learner/org/dllearner/reasoning/DIGReasoner.java trunk/src/dl-learner/org/dllearner/reasoning/FastRetrievalReasoner.java trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java trunk/src/dl-learner/org/dllearner/server/DLLearnerWS.java trunk/src/dl-learner/org/dllearner/utilities/ConceptTransformation.java trunk/src/dl-learner/org/dllearner/utilities/Datastructures.java trunk/src/dl-learner/org/dllearner/utilities/Helper.java trunk/src/dl-learner/org/dllearner/utilities/RoleComparator.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/core/dl/DatatypeProperty.java trunk/src/dl-learner/org/dllearner/core/dl/DatatypePropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/dl/DoubleDatatypePropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/dl/ObjectProperty.java trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyAssertion.java trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyExpression.java trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyInverse.java trunk/src/dl-learner/org/dllearner/core/dl/Property.java trunk/src/dl-learner/org/dllearner/core/dl/PropertyAssertion.java Removed Paths: ------------- trunk/src/dl-learner/org/dllearner/core/dl/AtomicRole.java trunk/src/dl-learner/org/dllearner/core/dl/InverseRole.java trunk/src/dl-learner/org/dllearner/core/dl/Role.java trunk/src/dl-learner/org/dllearner/core/dl/RoleAssertion.java Modified: trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-02-11 15:03:50 UTC (rev 539) @@ -37,7 +37,7 @@ import org.dllearner.core.config.InvalidConfigOptionValueException; import org.dllearner.core.dl.All; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Bottom; import org.dllearner.core.dl.Concept; import org.dllearner.core.dl.Conjunction; @@ -251,7 +251,7 @@ // EXISTS and ALL for(Concept childNode : generatedDefinitions.get(length-2)) { - for(AtomicRole atomicRole : learningProblem.getReasoningService().getAtomicRoles()) { + for(ObjectProperty atomicRole : learningProblem.getReasoningService().getAtomicRoles()) { Concept root1 = new Exists(atomicRole,childNode); generatedDefinitions.get(length).add(root1); Modified: trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/algorithms/gp/GPUtilities.java 2008-02-11 15:03:50 UTC (rev 539) @@ -12,7 +12,7 @@ import org.dllearner.core.Score; import org.dllearner.core.dl.All; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Bottom; import org.dllearner.core.dl.Concept; import org.dllearner.core.dl.Exists; @@ -439,12 +439,12 @@ name = bestNeighbours.get(3).get(nr-sizeSum2); // returnNode = new Exists(new AtomicRole(name)); // returnNode.addChild(node); - returnNode = new Exists(new AtomicRole(name),node); + returnNode = new Exists(new ObjectProperty(name),node); } else { name = bestNeighbours.get(4).get(nr-sizeSum3); // returnNode = new All(new AtomicRole(name)); // returnNode.addChild(node); - returnNode = new All(new AtomicRole(name),node); + returnNode = new All(new ObjectProperty(name),node); } return returnNode; Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiDown.java 2008-02-11 15:03:50 UTC (rev 539) @@ -11,7 +11,7 @@ import org.dllearner.core.ReasoningService; import org.dllearner.core.dl.All; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Bottom; import org.dllearner.core.dl.Concept; import org.dllearner.core.dl.Exists; @@ -70,7 +70,7 @@ topSet.add(new Negation(c)); // EXISTS r.TOP und ALL r.TOP für alle r - for(AtomicRole r : reasoningService.getAtomicRoles()) { + for(ObjectProperty r : reasoningService.getAtomicRoles()) { topSet.add(new All(r, new Top())); topSet.add(new Exists(r, new Top())); } Modified: trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/algorithms/hybridgp/PsiUp.java 2008-02-11 15:03:50 UTC (rev 539) @@ -11,7 +11,7 @@ import org.dllearner.core.ReasoningService; import org.dllearner.core.dl.All; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Bottom; import org.dllearner.core.dl.Concept; import org.dllearner.core.dl.Exists; @@ -58,7 +58,7 @@ bottomSet.add(new Negation(c)); // EXISTS r.BOTTOM und ALL r.BOTTOM für alle r - for(AtomicRole r : reasoningService.getAtomicRoles()) { + for(ObjectProperty r : reasoningService.getAtomicRoles()) { bottomSet.add(new All(r, new Bottom())); bottomSet.add(new Exists(r, new Bottom())); } Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-02-11 15:03:50 UTC (rev 539) @@ -40,7 +40,7 @@ import org.dllearner.core.config.InvalidConfigOptionValueException; import org.dllearner.core.config.StringConfigOption; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Concept; import org.dllearner.learningproblems.PosNegLP; import org.dllearner.learningproblems.PosOnlyDefinitionLP; @@ -89,12 +89,12 @@ private static String defaultSearchTreeFile = "log/searchTree.txt"; private String heuristic = "lexicographic"; Set<AtomicConcept> allowedConcepts; - Set<AtomicRole> allowedRoles; + Set<ObjectProperty> allowedRoles; Set<AtomicConcept> ignoredConcepts; - Set<AtomicRole> ignoredRoles; + Set<ObjectProperty> ignoredRoles; // these are computed as the result of the previous four settings Set<AtomicConcept> usedConcepts; - Set<AtomicRole> usedRoles; + Set<ObjectProperty> usedRoles; private boolean applyAllFilter = true; private boolean applyExistsFilter = true; private boolean useTooWeakList = true; Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/ROLearner.java 2008-02-11 15:03:50 UTC (rev 539) @@ -25,7 +25,7 @@ import org.dllearner.core.config.InvalidConfigOptionValueException; import org.dllearner.core.config.StringConfigOption; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Concept; import org.dllearner.core.dl.MultiConjunction; import org.dllearner.core.dl.MultiDisjunction; @@ -51,12 +51,12 @@ private static String defaultSearchTreeFile = "log/searchTree.txt"; private Heuristic heuristic = Heuristic.LEXICOGRAPHIC; Set<AtomicConcept> allowedConcepts; - Set<AtomicRole> allowedRoles; + Set<ObjectProperty> allowedRoles; Set<AtomicConcept> ignoredConcepts; - Set<AtomicRole> ignoredRoles; + Set<ObjectProperty> ignoredRoles; // these are computed as the result of the previous four settings Set<AtomicConcept> usedConcepts; - Set<AtomicRole> usedRoles; + Set<ObjectProperty> usedRoles; private boolean applyAllFilter = true; private boolean applyExistsFilter = true; private boolean useTooWeakList = true; Modified: trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java =================================================================== --- trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/algorithms/refinement/RhoDown.java 2008-02-11 15:03:50 UTC (rev 539) @@ -32,7 +32,7 @@ import org.dllearner.core.ReasoningService; import org.dllearner.core.dl.All; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Bottom; import org.dllearner.core.dl.Concept; import org.dllearner.core.dl.Conjunction; @@ -42,7 +42,7 @@ import org.dllearner.core.dl.MultiDisjunction; import org.dllearner.core.dl.Negation; import org.dllearner.core.dl.Quantification; -import org.dllearner.core.dl.Role; +import org.dllearner.core.dl.ObjectPropertyExpression; import org.dllearner.core.dl.Top; import org.dllearner.utilities.ConceptComparator; import org.dllearner.utilities.ConceptTransformation; @@ -264,7 +264,7 @@ } } else if (concept instanceof Exists) { - Role role = ((Quantification)concept).getRole(); + ObjectPropertyExpression role = ((Quantification)concept).getRole(); // rule 1: EXISTS r.D => EXISTS r.E tmp = refine(concept.getChild(0), maxLength-2, null); @@ -275,14 +275,14 @@ // rule 2: EXISTS r.D => EXISTS s.D or EXISTS r^-1.D => EXISTS s^-1.D // currently inverse roles are not supported - AtomicRole ar = (AtomicRole) role; - Set<AtomicRole> moreSpecialRoles = rs.getMoreSpecialRoles(ar); - for(AtomicRole moreSpecialRole : moreSpecialRoles) { + ObjectProperty ar = (ObjectProperty) role; + Set<ObjectProperty> moreSpecialRoles = rs.getMoreSpecialRoles(ar); + for(ObjectProperty moreSpecialRole : moreSpecialRoles) { refinements.add(new Exists(moreSpecialRole, concept.getChild(0))); } } else if (concept instanceof All) { - Role role = ((Quantification)concept).getRole(); + ObjectPropertyExpression role = ((Quantification)concept).getRole(); // rule 1: ALL r.D => ALL r.E tmp = refine(concept.getChild(0), maxLength-2, null); @@ -302,9 +302,9 @@ // rule 3: ALL r.D => ALL s.D or ALL r^-1.D => ALL s^-1.D // currently inverse roles are not supported - AtomicRole ar = (AtomicRole) role; - Set<AtomicRole> moreSpecialRoles = rs.getMoreSpecialRoles(ar); - for(AtomicRole moreSpecialRole : moreSpecialRoles) { + ObjectProperty ar = (ObjectProperty) role; + Set<ObjectProperty> moreSpecialRoles = rs.getMoreSpecialRoles(ar); + for(ObjectProperty moreSpecialRole : moreSpecialRoles) { refinements.add(new All(moreSpecialRole, concept.getChild(0))); } @@ -334,8 +334,8 @@ if(c instanceof All) { for(Concept child : concept.getChildren()) { if(child instanceof All) { - Role r1 = ((All)c).getRole(); - Role r2 = ((All)child).getRole(); + ObjectPropertyExpression r1 = ((All)c).getRole(); + ObjectPropertyExpression r2 = ((All)child).getRole(); if(r1.toString().equals(r2.toString())) skip = true; } @@ -543,7 +543,7 @@ // m3.add(new Exists(r, new Top())); //} // new operator: only uses most general roles - for(AtomicRole r : rs.getMostGeneralRoles()) { + for(ObjectProperty r : rs.getMostGeneralRoles()) { m3.add(new Exists(r, new Top())); } m.put(3,m3); @@ -573,7 +573,7 @@ // m.get(i+2).add(new All(r,c)); // } - for(AtomicRole r : rs.getMostGeneralRoles()) { + for(ObjectProperty r : rs.getMostGeneralRoles()) { m.get(i+2).add(new All(r,c)); } } Modified: trunk/src/dl-learner/org/dllearner/cli/Start.java =================================================================== --- trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/cli/Start.java 2008-02-11 15:03:50 UTC (rev 539) @@ -62,7 +62,7 @@ import org.dllearner.core.config.StringSetConfigOption; import org.dllearner.core.config.StringTupleListConfigOption; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Concept; import org.dllearner.core.dl.Individual; import org.dllearner.kb.KBFile; @@ -504,7 +504,7 @@ int stringLength = rs.getAtomicRoles().toString().length(); if (stringLength > maxLineLength) { System.out.println("roles[" + rs.getAtomicRoles().size() + "]: "); - for (AtomicRole r : rs.getAtomicRoles()) + for (ObjectProperty r : rs.getAtomicRoles()) System.out.println(" " + r); } else System.out.println("roles[" + rs.getAtomicRoles().size() + "]: " @@ -647,7 +647,7 @@ SortedSet<AtomicConcept> occurringConcepts = new TreeSet<AtomicConcept>( new ConceptComparator()); occurringConcepts.addAll(Helper.getAtomicConcepts(concept)); - SortedSet<AtomicRole> occurringRoles = new TreeSet<AtomicRole>( + SortedSet<ObjectProperty> occurringRoles = new TreeSet<ObjectProperty>( new RoleComparator()); occurringRoles.addAll(Helper.getAtomicRoles(concept)); @@ -662,7 +662,7 @@ // is used) for (AtomicConcept ac : rs.getAtomicConcepts()) occurringConcepts.remove(ac); - for (AtomicRole ar : rs.getAtomicRoles()) + for (ObjectProperty ar : rs.getAtomicRoles()) occurringRoles.remove(ar); boolean nonExistingConstructs = false; Modified: trunk/src/dl-learner/org/dllearner/core/Reasoner.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/Reasoner.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/Reasoner.java 2008-02-11 15:03:50 UTC (rev 539) @@ -25,7 +25,7 @@ import java.util.SortedSet; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Concept; import org.dllearner.core.dl.Individual; import org.dllearner.core.dl.RoleHierarchy; @@ -48,7 +48,7 @@ // => erstellt auch vereinfachte Sichten auf Subsumptionhierarchie // (siehe einfacher Traversal in Diplomarbeit) public void prepareSubsumptionHierarchy(Set<AtomicConcept> allowedConcepts); - public void prepareRoleHierarchy(Set<AtomicRole> allowedRoles) throws ReasoningMethodUnsupportedException; + public void prepareRoleHierarchy(Set<ObjectProperty> allowedRoles) throws ReasoningMethodUnsupportedException; public boolean subsumes(Concept superConcept, Concept subConcept) throws ReasoningMethodUnsupportedException; @@ -68,7 +68,7 @@ public SortedSet<Individual> retrieval(Concept concept) throws ReasoningMethodUnsupportedException; - public Map<Individual, SortedSet<Individual>> getRoleMembers(AtomicRole atomicRole) throws ReasoningMethodUnsupportedException; + public Map<Individual, SortedSet<Individual>> getRoleMembers(ObjectProperty atomicRole) throws ReasoningMethodUnsupportedException; public boolean instanceCheck(Concept concept, Individual individual) throws ReasoningMethodUnsupportedException; @@ -86,7 +86,7 @@ public Set<AtomicConcept> getAtomicConcepts(); - public Set<AtomicRole> getAtomicRoles(); + public Set<ObjectProperty> getAtomicRoles(); public SortedSet<Individual> getIndividuals(); } Modified: trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/ReasonerComponent.java 2008-02-11 15:03:50 UTC (rev 539) @@ -26,7 +26,7 @@ import java.util.TreeSet; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Concept; import org.dllearner.core.dl.Individual; import org.dllearner.core.dl.RoleHierarchy; @@ -69,7 +69,7 @@ throw new ReasoningMethodUnsupportedException(); } - public Map<Individual, SortedSet<Individual>> getRoleMembers(AtomicRole atomicRole) + public Map<Individual, SortedSet<Individual>> getRoleMembers(ObjectProperty atomicRole) throws ReasoningMethodUnsupportedException { throw new ReasoningMethodUnsupportedException(); } @@ -108,7 +108,7 @@ throw new ReasoningMethodUnsupportedException(); } - public void prepareRoleHierarchy(Set<AtomicRole> allowedRoles) throws ReasoningMethodUnsupportedException { + public void prepareRoleHierarchy(Set<ObjectProperty> allowedRoles) throws ReasoningMethodUnsupportedException { throw new ReasoningMethodUnsupportedException(); } Modified: trunk/src/dl-learner/org/dllearner/core/ReasoningService.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/ReasoningService.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/ReasoningService.java 2008-02-11 15:03:50 UTC (rev 539) @@ -28,7 +28,7 @@ import java.util.TreeSet; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Concept; import org.dllearner.core.dl.Individual; import org.dllearner.core.dl.RoleHierarchy; @@ -73,7 +73,7 @@ // Listenansicht private List<AtomicConcept> atomicConceptsList; - private List<AtomicRole> atomicRolesList; + private List<ObjectProperty> atomicRolesList; // private SortedSet<Concept> retrievalsSet = new TreeSet<Concept>(new ConceptComparator()); @@ -291,22 +291,22 @@ /** * Returns more general concepts in the subsumption hierarchy. * - * @see RoleHierarchy#getMoreGeneralRoles(AtomicRole) + * @see RoleHierarchy#getMoreGeneralRoles(ObjectProperty) * @param role Atomic concept, top, or bottom. * @return A set of more general concepts. */ - public SortedSet<AtomicRole> getMoreGeneralRoles(AtomicRole role) { + public SortedSet<ObjectProperty> getMoreGeneralRoles(ObjectProperty role) { return getRoleHierarchy().getMoreGeneralRoles(role); } /** * Returns more special concepts in the subsumption hierarchy. * - * @see RoleHierarchy#getMoreSpecialRoles(AtomicRole) + * @see RoleHierarchy#getMoreSpecialRoles(ObjectProperty) * @param role Atomic concept, top, or bottom. * @return A set of more special concepts. */ - public SortedSet<AtomicRole> getMoreSpecialRoles(AtomicRole role) { + public SortedSet<ObjectProperty> getMoreSpecialRoles(ObjectProperty role) { return getRoleHierarchy().getMoreSpecialRoles(role); } @@ -314,7 +314,7 @@ * @see RoleHierarchy#getMostGeneralRoles() * @return The most general roles. */ - public TreeSet<AtomicRole> getMostGeneralRoles() { + public TreeSet<ObjectProperty> getMostGeneralRoles() { return getRoleHierarchy().getMostGeneralRoles(); } @@ -322,7 +322,7 @@ * @see RoleHierarchy#getMostSpecialRoles() * @return The most special roles. */ - public TreeSet<AtomicRole> getMostSpecialRoles() { + public TreeSet<ObjectProperty> getMostSpecialRoles() { return getRoleHierarchy().getMostSpecialRoles(); } @@ -348,7 +348,7 @@ prepareRoleHierarchy(getAtomicRoles()); } - public void prepareRoleHierarchy(Set<AtomicRole> allowedRoles) { + public void prepareRoleHierarchy(Set<ObjectProperty> allowedRoles) { try { reasoner.prepareRoleHierarchy(allowedRoles); } catch (ReasoningMethodUnsupportedException e) { @@ -382,7 +382,7 @@ // gibt zu einer Rolle alle Elemente zur�ck // private, da es keine Standardoperation ist - public Map<Individual, SortedSet<Individual>> getRoleMembers(AtomicRole atomicRole) { + public Map<Individual, SortedSet<Individual>> getRoleMembers(ObjectProperty atomicRole) { reasoningStartTimeTmp = System.nanoTime(); Map<Individual, SortedSet<Individual>> result; try { @@ -401,7 +401,7 @@ return reasoner.getAtomicConcepts(); } - public Set<AtomicRole> getAtomicRoles() { + public Set<ObjectProperty> getAtomicRoles() { return reasoner.getAtomicRoles(); } @@ -419,9 +419,9 @@ return atomicConceptsList; } - public List<AtomicRole> getAtomicRolesList() { + public List<ObjectProperty> getAtomicRolesList() { if(atomicRolesList == null) - atomicRolesList = new LinkedList<AtomicRole>(getAtomicRoles()); + atomicRolesList = new LinkedList<ObjectProperty>(getAtomicRoles()); return atomicRolesList; } Modified: trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/config/CommonConfigMappings.java 2008-02-11 15:03:50 UTC (rev 539) @@ -24,7 +24,7 @@ import java.util.TreeSet; import org.dllearner.core.dl.AtomicConcept; -import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.ObjectProperty; import org.dllearner.core.dl.Individual; import org.dllearner.utilities.ConceptComparator; @@ -51,10 +51,10 @@ return set; } - public static SortedSet<AtomicRole> getAtomicRoleSet(Set<String> atomicRoles) { - SortedSet<AtomicRole> set = new TreeSet<AtomicRole>(); + public static SortedSet<ObjectProperty> getAtomicRoleSet(Set<String> atomicRoles) { + SortedSet<ObjectProperty> set = new TreeSet<ObjectProperty>(); for(String atomicRole : atomicRoles) - set.add(new AtomicRole(atomicRole)); + set.add(new ObjectProperty(atomicRole)); return set; } } Modified: trunk/src/dl-learner/org/dllearner/core/dl/All.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/All.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/All.java 2008-02-11 15:03:50 UTC (rev 539) @@ -5,7 +5,7 @@ public class All extends Quantification { - public All(Role role, Concept c) { + public All(ObjectPropertyExpression role, Concept c) { super(role, c); } Deleted: trunk/src/dl-learner/org/dllearner/core/dl/AtomicRole.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/AtomicRole.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/AtomicRole.java 2008-02-11 15:03:50 UTC (rev 539) @@ -1,51 +0,0 @@ -/** - * Copyright (C) 2007, Jens Lehmann - * - * This file is part of DL-Learner. - * - * DL-Learner is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * DL-Learner is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.dllearner.core.dl; - -import java.util.Map; - -import org.dllearner.utilities.Helper; - -/** - * Represents an atomic concept in a knowledge base / ontology, - * e.g. "hasChild". - * - * @author Jens Lehmann - * - */ -public class AtomicRole extends Role { - - public AtomicRole(String name) { - super(name); - } - - public int getLength() { - return 1; - } - - @Override - public String toString() { - return name; - } - - public String toString(String baseURI, Map<String,String> prefixes) { - return Helper.getAbbreviatedString(name, baseURI, prefixes); - } -} Modified: trunk/src/dl-learner/org/dllearner/core/dl/ConceptAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/ConceptAssertion.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/ConceptAssertion.java 2008-02-11 15:03:50 UTC (rev 539) @@ -22,7 +22,7 @@ import java.util.Map; /** - * Represents an concept assertion in a knowledge base / ontology, + * Represents a concept assertion in a knowledge base / ontology, * e.g. "heiko is a person", "heiko is a male person having one child". * * @author Jens Lehmann Added: trunk/src/dl-learner/org/dllearner/core/dl/DatatypeProperty.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/DatatypeProperty.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/dl/DatatypeProperty.java 2008-02-11 15:03:50 UTC (rev 539) @@ -0,0 +1,52 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.dl; + +import java.util.Map; + +import org.dllearner.utilities.Helper; + +/** + * @author Jens Lehmann + * + */ +public class DatatypeProperty implements Property { + + protected String name; + + public DatatypeProperty(String name) { + this.name=name; + } + + /* (non-Javadoc) + * @see org.dllearner.core.dl.KBElement#getLength() + */ + public int getLength() { + return 1; + } + + /* (non-Javadoc) + * @see org.dllearner.core.dl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + return Helper.getAbbreviatedString(name, baseURI, prefixes); + } + +} Added: trunk/src/dl-learner/org/dllearner/core/dl/DatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/DatatypePropertyAssertion.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/dl/DatatypePropertyAssertion.java 2008-02-11 15:03:50 UTC (rev 539) @@ -0,0 +1,59 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.dl; + +/** + * A datatype property assertion. + * + * @author Jens Lehmann + * + */ +public abstract class DatatypePropertyAssertion extends PropertyAssertion { + + protected DatatypeProperty datatypeProperty; + protected Individual individual; + + public DatatypePropertyAssertion(DatatypeProperty datatypeProperty, Individual individual) { + this.datatypeProperty = datatypeProperty; + this.individual = individual; + } + + /* (non-Javadoc) + * @see org.dllearner.core.dl.KBElement#getLength() + */ + public int getLength() { + return 3; + } + + /** + * @return the individual + */ + public Individual getIndividual() { + return individual; + } + + /** + * @return the datatypeProperty + */ + public DatatypeProperty getDatatypeProperty() { + return datatypeProperty; + } + +} Added: trunk/src/dl-learner/org/dllearner/core/dl/DoubleDatatypePropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/DoubleDatatypePropertyAssertion.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/dl/DoubleDatatypePropertyAssertion.java 2008-02-11 15:03:50 UTC (rev 539) @@ -0,0 +1,50 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.dl; + +import java.util.Map; + +/** + * @author Jens Lehmann + * + */ +public class DoubleDatatypePropertyAssertion extends DatatypePropertyAssertion { + + private double value; + + public DoubleDatatypePropertyAssertion(DatatypeProperty datatypeProperty, Individual individual, double value) { + super(datatypeProperty, individual); + this.value = value; + } + + + + /* (non-Javadoc) + * @see org.dllearner.core.dl.KBElement#toString(java.lang.String, java.util.Map) + */ + public String toString(String baseURI, Map<String, String> prefixes) { + return datatypeProperty.toString(baseURI, prefixes) + "(" + individual.toString(baseURI, prefixes) + "," + value +")"; + } + + public double getValue() { + return value; + } + +} Modified: trunk/src/dl-learner/org/dllearner/core/dl/Exists.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Exists.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/Exists.java 2008-02-11 15:03:50 UTC (rev 539) @@ -5,7 +5,7 @@ public class Exists extends Quantification { - public Exists(Role role, Concept c) { + public Exists(ObjectPropertyExpression role, Concept c) { super(role,c); } Modified: trunk/src/dl-learner/org/dllearner/core/dl/FunctionalRoleAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/FunctionalRoleAxiom.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/FunctionalRoleAxiom.java 2008-02-11 15:03:50 UTC (rev 539) @@ -4,13 +4,13 @@ public class FunctionalRoleAxiom extends RBoxAxiom { - private AtomicRole role; + private ObjectProperty role; - public FunctionalRoleAxiom(AtomicRole role) { + public FunctionalRoleAxiom(ObjectProperty role) { this.role = role; } - public Role getRole() { + public ObjectPropertyExpression getRole() { return role; } Modified: trunk/src/dl-learner/org/dllearner/core/dl/GreaterEqual.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/GreaterEqual.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/GreaterEqual.java 2008-02-11 15:03:50 UTC (rev 539) @@ -4,7 +4,7 @@ public class GreaterEqual extends NumberRestriction { - public GreaterEqual(int number, Role role, Concept c) { + public GreaterEqual(int number, ObjectPropertyExpression role, Concept c) { super(number,role,c); } Deleted: trunk/src/dl-learner/org/dllearner/core/dl/InverseRole.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/InverseRole.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/InverseRole.java 2008-02-11 15:03:50 UTC (rev 539) @@ -1,46 +0,0 @@ -/** - * Copyright (C) 2007, Jens Lehmann - * - * This file is part of DL-Learner. - * - * DL-Learner is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * DL-Learner is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ - -package org.dllearner.core.dl; - -import java.util.Map; - -import org.dllearner.utilities.Helper; - -/** - * An inverse role. - * - * @author Jens Lehmann - * - */ -public class InverseRole extends Role { - - public InverseRole(String name) { - super(name); - } - - public int getLength() { - return 2; - } - - public String toString(String baseURI, Map<String,String> prefixes) { - return Helper.getAbbreviatedString(name, baseURI, prefixes) + "-"; - } -} Modified: trunk/src/dl-learner/org/dllearner/core/dl/InverseRoleAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/InverseRoleAxiom.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/InverseRoleAxiom.java 2008-02-11 15:03:50 UTC (rev 539) @@ -4,19 +4,19 @@ public class InverseRoleAxiom extends RBoxAxiom { - private AtomicRole inverseRole; - private AtomicRole role; + private ObjectProperty inverseRole; + private ObjectProperty role; - public InverseRoleAxiom(AtomicRole inverseRole, AtomicRole role) { + public InverseRoleAxiom(ObjectProperty inverseRole, ObjectProperty role) { this.inverseRole = inverseRole; this.role = role; } - public AtomicRole getInverseRole() { + public ObjectProperty getInverseRole() { return inverseRole; } - public AtomicRole getRole() { + public ObjectProperty getRole() { return role; } Modified: trunk/src/dl-learner/org/dllearner/core/dl/KB.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/KB.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/KB.java 2008-02-11 15:03:50 UTC (rev 539) @@ -16,9 +16,9 @@ SortedSet<Individual> individuals = new TreeSet<Individual>(); for(Axiom axiom : abox) { - if(axiom instanceof RoleAssertion) { - individuals.add(((RoleAssertion)axiom).getIndividual1()); - individuals.add(((RoleAssertion)axiom).getIndividual2()); + if(axiom instanceof ObjectPropertyAssertion) { + individuals.add(((ObjectPropertyAssertion)axiom).getIndividual1()); + individuals.add(((ObjectPropertyAssertion)axiom).getIndividual2()); } else if(axiom instanceof ConceptAssertion) { individuals.add(((ConceptAssertion)axiom).getIndividual()); } @@ -27,12 +27,12 @@ return individuals; } - public Set<AtomicRole> findAllAtomicRoles() { + public Set<ObjectProperty> findAllAtomicRoles() { Set<String> roleNames = new HashSet<String>(); for(Axiom axiom : abox) { - if(axiom instanceof RoleAssertion) - roleNames.add(((RoleAssertion)axiom).getRole().getName()); + if(axiom instanceof ObjectPropertyAssertion) + roleNames.add(((ObjectPropertyAssertion)axiom).getRole().getName()); } for(Axiom axiom : tbox) { @@ -61,9 +61,9 @@ } } - Set<AtomicRole> ret = new HashSet<AtomicRole>(); + Set<ObjectProperty> ret = new HashSet<ObjectProperty>(); for(String name : roleNames) { - ret.add(new AtomicRole(name)); + ret.add(new ObjectProperty(name)); } return ret; } @@ -202,8 +202,8 @@ // alle direkt mit diesem Individual verbundenen Individuals finden TreeSet<Individual> connectedSet = new TreeSet<Individual>(); for(AssertionalAxiom axiom : abox) { - if(axiom instanceof RoleAssertion) { - RoleAssertion ra = (RoleAssertion)axiom; + if(axiom instanceof ObjectPropertyAssertion) { + ObjectPropertyAssertion ra = (ObjectPropertyAssertion)axiom; if(ra.getIndividual1().equals(individual)) connectedSet.add(ra.getIndividual2()); } Modified: trunk/src/dl-learner/org/dllearner/core/dl/LessEqual.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/LessEqual.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/LessEqual.java 2008-02-11 15:03:50 UTC (rev 539) @@ -4,7 +4,7 @@ public class LessEqual extends NumberRestriction { - public LessEqual(int number, Role role, Concept c) { + public LessEqual(int number, ObjectPropertyExpression role, Concept c) { super(number,role,c); } Modified: trunk/src/dl-learner/org/dllearner/core/dl/NumberRestriction.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/NumberRestriction.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/NumberRestriction.java 2008-02-11 15:03:50 UTC (rev 539) @@ -2,10 +2,10 @@ public abstract class NumberRestriction extends Concept { - protected Role role; + protected ObjectPropertyExpression role; protected int number; - public NumberRestriction(int number, Role role, Concept c) { + public NumberRestriction(int number, ObjectPropertyExpression role, Concept c) { addChild(c); this.role = role; this.number = number; @@ -19,7 +19,7 @@ return number; } - public Role getRole() { + public ObjectPropertyExpression getRole() { return role; } Copied: trunk/src/dl-learner/org/dllearner/core/dl/ObjectProperty.java (from rev 535, trunk/src/dl-learner/org/dllearner/core/dl/AtomicRole.java) =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/ObjectProperty.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/dl/ObjectProperty.java 2008-02-11 15:03:50 UTC (rev 539) @@ -0,0 +1,51 @@ +/** + * Copyright (C) 2007, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.dl; + +import java.util.Map; + +import org.dllearner.utilities.Helper; + +/** + * Represents an object property in a knowledge base / ontology, + * e.g. "hasChild". + * + * @author Jens Lehmann + * + */ +public class ObjectProperty extends ObjectPropertyExpression implements Property { + + public ObjectProperty(String name) { + super(name); + } + + public int getLength() { + return 1; + } + + @Override + public String toString() { + return name; + } + + public String toString(String baseURI, Map<String,String> prefixes) { + return Helper.getAbbreviatedString(name, baseURI, prefixes); + } +} Copied: trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyAssertion.java (from rev 535, trunk/src/dl-learner/org/dllearner/core/dl/RoleAssertion.java) =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyAssertion.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyAssertion.java 2008-02-11 15:03:50 UTC (rev 539) @@ -0,0 +1,62 @@ +/** + * Copyright (C) 2007, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.dl; + +import java.util.Map; + +/** + * Represents an role assertion in a knowledge base / ontology, + * e.g. "heiko is brother of stefan". + * + * @author Jens Lehmann + * + */ +public class ObjectPropertyAssertion extends PropertyAssertion { + + private ObjectProperty role; + private Individual individual1; + private Individual individual2; + + public ObjectPropertyAssertion(ObjectProperty role, Individual individual1, Individual individual2) { + this.role = role; + this.individual1 = individual1; + this.individual2 = individual2; + } + + public Individual getIndividual1() { + return individual1; + } + + public Individual getIndividual2() { + return individual2; + } + + public ObjectProperty getRole() { + return role; + } + + public int getLength() { + return 2 + role.getLength(); + } + + public String toString(String baseURI, Map<String,String> prefixes) { + return role.toString(baseURI, prefixes) + "(" + individual1.toString(baseURI, prefixes) + "," + individual2.toString(baseURI, prefixes) +")"; + } +} Copied: trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyExpression.java (from rev 535, trunk/src/dl-learner/org/dllearner/core/dl/Role.java) =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyExpression.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyExpression.java 2008-02-11 15:03:50 UTC (rev 539) @@ -0,0 +1,42 @@ +/** + * Copyright (C) 2007, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.dl; + +/** + * An object property expression is an object property construct, which + * can be used in axioms, e.g. complex class descriptions. It can be + * either an object property or an inverse of an object property. + * + * @author Jens Lehmann + * + */ +public abstract class ObjectPropertyExpression implements KBElement { + + protected String name; + + public ObjectPropertyExpression(String name) { + this.name = name; + } + + public String getName() { + return name; + } + +} Copied: trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyInverse.java (from rev 535, trunk/src/dl-learner/org/dllearner/core/dl/InverseRole.java) =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyInverse.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/dl/ObjectPropertyInverse.java 2008-02-11 15:03:50 UTC (rev 539) @@ -0,0 +1,52 @@ +/** + * Copyright (C) 2007, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ + +package org.dllearner.core.dl; + +import java.util.Map; + +import org.dllearner.utilities.Helper; + +/** + * Represents the inverse of a property expression. It can be used + * in axioms e.g. complex class descriptions. For instance: + * + * father = male AND isChildOf^-1 + * + * This way, you can refer to an inverse of an object property without + * actually giving it a name (you could name it isParentOf in this case). + * + * @author Jens Lehmann + * + */ +public class ObjectPropertyInverse extends ObjectPropertyExpression { + + public ObjectPropertyInverse(String name) { + super(name); + } + + public int getLength() { + return 2; + } + + public String toString(String baseURI, Map<String,String> prefixes) { + return Helper.getAbbreviatedString(name, baseURI, prefixes) + "-"; + } +} Added: trunk/src/dl-learner/org/dllearner/core/dl/Property.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Property.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/dl/Property.java 2008-02-11 15:03:50 UTC (rev 539) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.dl; + +/** + * @author Jens Lehmann + * + */ +public interface Property extends KBElement { + +} Added: trunk/src/dl-learner/org/dllearner/core/dl/PropertyAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/PropertyAssertion.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/core/dl/PropertyAssertion.java 2008-02-11 15:03:50 UTC (rev 539) @@ -0,0 +1,28 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.core.dl; + +/** + * @author Jens Lehmann + * + */ +public abstract class PropertyAssertion extends AssertionalAxiom { + +} Modified: trunk/src/dl-learner/org/dllearner/core/dl/Quantification.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Quantification.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/Quantification.java 2008-02-11 15:03:50 UTC (rev 539) @@ -2,14 +2,14 @@ public abstract class Quantification extends Concept { - Role role; + ObjectPropertyExpression role; - public Quantification(Role role, Concept c) { + public Quantification(ObjectPropertyExpression role, Concept c) { this.role = role; addChild(c); } - public Role getRole() { + public ObjectPropertyExpression getRole() { return role; } Deleted: trunk/src/dl-learner/org/dllearner/core/dl/Role.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/Role.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/Role.java 2008-02-11 15:03:50 UTC (rev 539) @@ -1,15 +0,0 @@ -package org.dllearner.core.dl; - -public abstract class Role implements KBElement { - - protected String name; - - public Role(String name) { - this.name = name; - } - - public String getName() { - return name; - } - -} Deleted: trunk/src/dl-learner/org/dllearner/core/dl/RoleAssertion.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/RoleAssertion.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/RoleAssertion.java 2008-02-11 15:03:50 UTC (rev 539) @@ -1,62 +0,0 @@ -/** - * Copyright (C) 2007, Jens Lehmann - * - * This file is part of DL-Learner. - * - * DL-Learner is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 3 of the License, or - * (at your option) any later version. - * - * DL-Learner is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program. If not, see <http://www.gnu.org/licenses/>. - * - */ -package org.dllearner.core.dl; - -import java.util.Map; - -/** - * Represents an role assertion in a knowledge base / ontology, - * e.g. "heiko is brother of stefan". - * - * @author Jens Lehmann - * - */ -public class RoleAssertion extends AssertionalAxiom { - - private AtomicRole role; - private Individual individual1; - private Individual individual2; - - public RoleAssertion(AtomicRole role, Individual individual1, Individual individual2) { - this.role = role; - this.individual1 = individual1; - this.individual2 = individual2; - } - - public Individual getIndividual1() { - return individual1; - } - - public Individual getIndividual2() { - return individual2; - } - - public AtomicRole getRole() { - return role; - } - - public int getLength() { - return 2 + role.getLength(); - } - - public String toString(String baseURI, Map<String,String> prefixes) { - return role.toString(baseURI, prefixes) + "(" + individual1.toString(baseURI, prefixes) + "," + individual2.toString(baseURI, prefixes) +")"; - } -} Modified: trunk/src/dl-learner/org/dllearner/core/dl/RoleHierarchy.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/RoleHierarchy.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/RoleHierarchy.java 2008-02-11 15:03:50 UTC (rev 539) @@ -38,17 +38,17 @@ public class RoleHierarchy { RoleComparator rc = new RoleComparator(); - TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyUp; - TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyDown; - TreeSet<AtomicRole> mostGeneralRoles = new TreeSet<AtomicRole>(rc); - TreeSet<AtomicRole> mostSpecialRoles = new TreeSet<AtomicRole>(rc); + TreeMap<ObjectProperty,TreeSet<ObjectProperty>> roleHierarchyUp; + TreeMap<ObjectProperty,TreeSet<ObjectProperty>> roleHierarchyDown; + TreeSet<ObjectProperty> mostGeneralRoles = new TreeSet<ObjectProperty>(rc); + TreeSet<ObjectProperty> mostSpecialRoles = new TreeSet<ObjectProperty>(rc); - public RoleHierarchy(Set<AtomicRole> atomicRoles, TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyUp , TreeMap<AtomicRole,TreeSet<AtomicRole>> roleHierarchyDown) { + public RoleHierarchy(Set<ObjectProperty> atomicRoles, TreeMap<ObjectProperty,TreeSet<ObjectProperty>> roleHierarchyUp , TreeMap<ObjectProperty,TreeSet<ObjectProperty>> roleHierarchyDown) { this.roleHierarchyUp = roleHierarchyUp; this.roleHierarchyDown = roleHierarchyDown; // find most general and most special roles - for(AtomicRole role : atomicRoles) { + for(ObjectProperty role : atomicRoles) { if(getMoreGeneralRoles(role).size()==0) mostGeneralRoles.add(role); if(getMoreSpecialRoles(role).size()==0) @@ -57,15 +57,15 @@ } @SuppressWarnings("unchecked") - public SortedSet<AtomicRole> getMoreGeneralRoles(AtomicRole role) { + public SortedSet<ObjectProperty> getMoreGeneralRoles(ObjectProperty role) { // we clone all concepts before returning them such that they cannot be // modified externally - return (TreeSet<AtomicRole>) roleHierarchyUp.get(role).clone(); + return (TreeSet<ObjectProperty>) roleHierarchyUp.get(role).clone(); } @SuppressWarnings("unchecked") - public SortedSet<AtomicRole> getMoreSpecialRoles(AtomicRole role) { - return (TreeSet<AtomicRole>) roleHierarchyDown.get(role).clone(); + public SortedSet<ObjectProperty> getMoreSpecialRoles(ObjectProperty role) { + return (TreeSet<ObjectProperty>) roleHierarchyDown.get(role).clone(); } @@ -73,20 +73,20 @@ @Override public String toString() { String str = ""; - for(AtomicRole role : mostGeneralRoles) { + for(ObjectProperty role : mostGeneralRoles) { str += toString(roleHierarchyDown, role, 0); } return str; } - private String toString(TreeMap<AtomicRole,TreeSet<AtomicRole>> hierarchy, AtomicRole role, int depth) { + private String toString(TreeMap<ObjectProperty,TreeSet<ObjectProperty>> hierarchy, ObjectProperty role, int depth) { String str = ""; for(int i=0; i<depth; i++) str += " "; str += role.toString() + "\n"; - Set<AtomicRole> tmp = hierarchy.get(role); + Set<ObjectProperty> tmp = hierarchy.get(role); if(tmp!=null) { - for(AtomicRole c : tmp) + for(ObjectProperty c : tmp) str += toString(hierarchy, c, depth+1); } return str; @@ -95,14 +95,14 @@ /** * @return The most general roles. */ - public TreeSet<AtomicRole> getMostGeneralRoles() { + public TreeSet<ObjectProperty> getMostGeneralRoles() { return mostGeneralRoles; } /** * @return The most special roles. */ - public TreeSet<AtomicRole> getMostSpecialRoles() { + public TreeSet<ObjectProperty> getMostSpecialRoles() { return mostSpecialRoles; } Modified: trunk/src/dl-learner/org/dllearner/core/dl/SubRoleAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/SubRoleAxiom.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/SubRoleAxiom.java 2008-02-11 15:03:50 UTC (rev 539) @@ -4,19 +4,19 @@ public class SubRoleAxiom extends RBoxAxiom { - private AtomicRole role; - private AtomicRole subRole; + private ObjectProperty role; + private ObjectProperty subRole; - public SubRoleAxiom(AtomicRole subRole, AtomicRole role) { + public SubRoleAxiom(ObjectProperty subRole, ObjectProperty role) { this.role = role; this.subRole = subRole; } - public AtomicRole getRole() { + public ObjectProperty getRole() { return role; } - public AtomicRole getSubRole() { + public ObjectProperty getSubRole() { return subRole; } Modified: trunk/src/dl-learner/org/dllearner/core/dl/SymmetricRoleAxiom.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/SymmetricRoleAxiom.java 2008-02-11 15:00:55 UTC (rev 538) +++ trunk/src/dl-learner/org/dllearner/core/dl/SymmetricRoleAxiom.java 2008-02-11 15:03:50 UTC (rev 539) @@ -4,13 +4,13 @@ public class SymmetricRoleAxiom extends RBoxAxiom { - private AtomicRole role; + private ObjectProperty role; - public SymmetricRoleAxiom(AtomicRole role) { + public SymmetricRoleAxiom(ObjectProperty role) { this.role = role; } - public AtomicRole getRole() { + public ObjectProperty getRole() { return role; } Modified: trunk/src/dl-learner/org/dllearner/core/dl/Transit... [truncated message content] |
From: <ton...@us...> - 2008-02-11 15:00:59
|
Revision: 538 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=538&view=rev Author: tonytacker Date: 2008-02-11 07:00:55 -0800 (Mon, 11 Feb 2008) Log Message: ----------- special option for positiveExamples, negativeExamples, allowedConcepts, ignoredConcepts, allowedRoles, ignoredRoles for StringSet Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-11 14:30:50 UTC (rev 537) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-11 15:00:55 UTC (rev 538) @@ -42,6 +42,8 @@ import org.dllearner.core.config.ConfigOption; 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; /** @@ -224,6 +226,31 @@ for (Individual ind : individuals) cBL.add(ind.getName()); } + // allowedConcepts or ignoredConcepts + if (configOption.getName().equalsIgnoreCase( + "allowedConcepts") + || configOption.getName().equalsIgnoreCase( + "ignoredConcepts")) { + // fill lists + Set<AtomicConcept> atomicsSet = config + .getReasoningService().getAtomicConcepts(); + LinkedList<AtomicConcept> atomicConcepts = new LinkedList<AtomicConcept>( + atomicsSet); + for (AtomicConcept ind : atomicConcepts) + cBL.add(ind.getName()); + } + // allowedRoles or ignoredRoles + if (configOption.getName().equalsIgnoreCase("allowedRoles") + || configOption.getName().equalsIgnoreCase( + "ignoredRoles")) { + // fill lists + Set<AtomicRole> atomicsSet = config + .getReasoningService().getAtomicRoles(); + LinkedList<AtomicRole> atomicRoles = new LinkedList<AtomicRole>( + atomicsSet); + for (AtomicRole ind : atomicRoles) + cBL.add(ind.getName()); + } } } // UNKNOWN @@ -279,7 +306,11 @@ */ private boolean isSpecial() { if (configOption.getName().equalsIgnoreCase("positiveExamples") - || configOption.getName().equalsIgnoreCase("negativeExamples")) + || configOption.getName().equalsIgnoreCase("negativeExamples") + || configOption.getName().equalsIgnoreCase("allowedConcepts") + || configOption.getName().equalsIgnoreCase("ignoredConcepts") + || configOption.getName().equalsIgnoreCase("allowedRoles") + || configOption.getName().equalsIgnoreCase("ignoredRoles")) return true; else return false; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ton...@us...> - 2008-02-11 14:30:58
|
Revision: 537 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=537&view=rev Author: tonytacker Date: 2008-02-11 06:30:50 -0800 (Mon, 11 Feb 2008) Log Message: ----------- cleaned LearningProblemPanel Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-11 14:18:59 UTC (rev 536) +++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-11 14:30:50 UTC (rev 537) @@ -21,22 +21,11 @@ */ import java.awt.BorderLayout; -import java.awt.GridBagLayout; -import java.awt.GridBagConstraints; -import java.awt.Dimension; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; -import java.util.HashSet; -import java.util.LinkedList; import java.util.List; -import java.util.Set; - import javax.swing.*; -import javax.swing.event.ListSelectionEvent; -import javax.swing.event.ListSelectionListener; - import org.dllearner.core.LearningProblem; -import org.dllearner.core.dl.Individual; /** * LearningProblemPanel @@ -53,16 +42,10 @@ private String[] lpBoxItems = {}; private JComboBox cb = new JComboBox(lpBoxItems); private JPanel choosePanel = new JPanel(); - private JPanel listPanel = new JPanel(); + private OptionPanel optionPanel; private JPanel initPanel = new JPanel(); - private JLabel posLabel = new JLabel("positive Examples"); - private JLabel negLabel = new JLabel("negative Examples"); - private JButton initButton, autoInitButton; + private JButton initButton, setButton; private int choosenClassIndex; - private List<Individual> individuals; - private JList posList = new JList(); - private JList negList = new JList(); - private OptionPanel optionPanel; LearningProblemPanel(final Config config, StartGUI startGUI) { super(new BorderLayout()); @@ -75,10 +58,10 @@ initButton.addActionListener(this); initPanel.add(initButton); initButton.setEnabled(true); - autoInitButton = new JButton("Set"); - autoInitButton.addActionListener(this); + setButton = new JButton("Set"); + setButton.addActionListener(this); choosePanel.add(cb); - choosePanel.add(autoInitButton); + choosePanel.add(setButton); cb.addActionListener(this); // add into comboBox @@ -90,112 +73,26 @@ // read choosen LearningProblem choosenClassIndex = cb.getSelectedIndex(); - // create a scrollable list of positive examples - posList = new JList(); - posList.setLayoutOrientation(JList.VERTICAL); - posList.setVisibleRowCount(-1); - JScrollPane posListScroller = new JScrollPane(posList); - posListScroller.setPreferredSize(new Dimension(300, 200)); - - // create a scrollable list of negative examples - negList = new JList(); - negList.setLayoutOrientation(JList.VERTICAL); - negList.setVisibleRowCount(-1); - JScrollPane negListScroller = new JScrollPane(negList); - negListScroller.setPreferredSize(new Dimension(300, 200)); - - // define GridBag - GridBagLayout gridbag = new GridBagLayout(); - listPanel.setLayout(gridbag); - GridBagConstraints constraints = new GridBagConstraints(); - constraints.fill = GridBagConstraints.BOTH; - constraints.anchor = GridBagConstraints.CENTER; - - buildConstraints(constraints, 0, 0, 1, 1, 100, 100); - gridbag.setConstraints(posLabel, constraints); - listPanel.add(posLabel); - - buildConstraints(constraints, 1, 0, 1, 1, 100, 100); - gridbag.setConstraints(negLabel, constraints); - listPanel.add(negLabel); - - buildConstraints(constraints, 0, 1, 1, 1, 100, 100); - gridbag.setConstraints(posListScroller, constraints); - listPanel.add(posListScroller); - - buildConstraints(constraints, 1, 1, 1, 1, 100, 100); - gridbag.setConstraints(negListScroller, constraints); - listPanel.add(negListScroller); - - add(listPanel, BorderLayout.CENTER); - - // listener for posList - posList.addListSelectionListener(new ListSelectionListener() { - public void valueChanged(ListSelectionEvent evt) { - if (evt.getValueIsAdjusting()) - return; - // detect witch examples have been selected - Set<String> posExampleSet = new HashSet<String>(); - int[] selectedIndices = posList.getSelectedIndices(); - for (int i : selectedIndices) - posExampleSet.add(individuals.get(i).toString()); - config.setPosExampleSet(posExampleSet); - config.getComponentManager().applyConfigEntry( - config.getLearningProblem(), "positiveExamples", - config.getPosExampleSet()); - updateOptionPanel(); - System.out.println("POSSSSS"); - } - }); - - // listener for negList - negList.addListSelectionListener(new ListSelectionListener() { - public void valueChanged(ListSelectionEvent evt) { - if (evt.getValueIsAdjusting()) - return; - // detect witch examples have been selected - Set<String> negExampleSet = new HashSet<String>(); - int[] selectedIndices = negList.getSelectedIndices(); - for (int i : selectedIndices) - negExampleSet.add(individuals.get(i).toString()); - config.setNegExampleSet(negExampleSet); - config.getComponentManager().applyConfigEntry( - config.getLearningProblem(), "negativeExamples", - config.getNegExampleSet()); - updateOptionPanel(); - System.out.println("POSSSSS"); - } - }); - optionPanel = new OptionPanel(config, config.getLearningProblem(), problems.get(choosenClassIndex)); - buildConstraints(constraints, 0, 2, 2, 1, 100, 100); - gridbag.setConstraints(optionPanel, constraints); - listPanel.add(optionPanel); - add(choosePanel, BorderLayout.PAGE_START); - add(listPanel, BorderLayout.CENTER); + add(optionPanel, BorderLayout.CENTER); add(initPanel, BorderLayout.PAGE_END); choosenClassIndex = cb.getSelectedIndex(); - //setLearningProblem(); + // setLearningProblem(); } public void actionPerformed(ActionEvent e) { - //System.out.println("index: " + cb.getSelectedIndex()); - // read selected LearningProblemClass - // choosenClassIndex = cb.getSelectedIndex(); if (choosenClassIndex != cb.getSelectedIndex()) { this.choosenClassIndex = cb.getSelectedIndex(); config.setInitLearningProblem(false); setLearningProblem(); - //System.out.println("new_index: " + cb.getSelectedIndex()); - } - if (e.getSource() == autoInitButton) + if (e.getSource() == setButton) setLearningProblem(); if (e.getSource() == initButton) @@ -203,40 +100,13 @@ } /** - * Define GridBagConstraints - */ - private void buildConstraints(GridBagConstraints gbc, int gx, int gy, - int gw, int gh, int wx, int wy) { - gbc.gridx = gx; - gbc.gridy = gy; - gbc.gridwidth = gw; - gbc.gridheight = gh; - gbc.weightx = wx; - gbc.weighty = wy; - } - - /** * after this, you can change widgets */ - public void setLearningProblem() { - // config.autoInit(); + private void setLearningProblem() { if (config.isInitReasoner()) { config.setLearningProblem(config.getComponentManager() .learningProblem(problems.get(choosenClassIndex), config.getReasoningService())); - // lists - if (config.getReasoningService() != null) { - // fill lists - Set<Individual> individualsSet = config.getReasoningService() - .getIndividuals(); - individuals = new LinkedList<Individual>(individualsSet); - DefaultListModel listModel = new DefaultListModel(); - for (Individual ind : individuals) { - listModel.addElement(ind); - } - posList.setModel(listModel); - negList.setModel(listModel); - } updateOptionPanel(); startGUI.updateTabColors(); } @@ -245,29 +115,19 @@ /** * after this, next tab can be used */ - public void init() { - if (/* !config.isInitLearningProblem() && */config.getReasoner() != null - && config.getLearningProblem() != null) { - config.getComponentManager().applyConfigEntry( - config.getLearningProblem(), "positiveExamples", - config.getPosExampleSet()); - config.getComponentManager().applyConfigEntry( - config.getLearningProblem(), "negativeExamples", - config.getNegExampleSet()); - + private void init() { + if (config.getReasoner() != null && config.getLearningProblem() != null) { config.getLearningProblem().init(); config.setInitLearningProblem(true); System.out.println("init LearningProblem"); startGUI.updateTabColors(); - } - // config.autoInit(); } /** * update OptionPanel with new selection */ - public void updateOptionPanel() { + private void updateOptionPanel() { // update OptionPanel optionPanel.update(config.getLearningProblem(), problems .get(choosenClassIndex)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ton...@us...> - 2008-02-11 14:19:03
|
Revision: 536 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=536&view=rev Author: tonytacker Date: 2008-02-11 06:18:59 -0800 (Mon, 11 Feb 2008) Log Message: ----------- widget stringset with special for positive/negative examples Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java trunk/src/dl-learner/org/dllearner/gui/RunPanel.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java Added: trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/gui/CheckBoxList.java 2008-02-11 14:18:59 UTC (rev 536) @@ -0,0 +1,101 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.gui; + +import javax.swing.*; + +import java.awt.BorderLayout; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; +import java.util.HashSet; +import java.util.LinkedList; +import java.util.Set; + +/** + * CheckBoxList + * + * a list of CheckBoxes + * + * @author Tilo Hielscher + */ +public class CheckBoxList extends JPanel { + private static final long serialVersionUID = -7119007550662195455L; + private JPanel checkBoxPanel = new JPanel(); + private LinkedList<JCheckBox> list = new LinkedList<JCheckBox>(); + private GridBagLayout gridbag = new GridBagLayout(); + private GridBagConstraints constraints = new GridBagConstraints(); + private Set<String> selectionSet = new HashSet<String>(); + + /** + * get a JPanel + */ + public CheckBoxList() { + checkBoxPanel.setLayout(gridbag); + add(checkBoxPanel, BorderLayout.CENTER); + constraints.anchor = GridBagConstraints.WEST; + } + + /** + * add new entry + * + * @param label + */ + public void add(String label) { + list.add(new JCheckBox(label)); + update(); + } + + /** + * return a set of selected items + */ + public Set<String> getSelections() { + selectionSet.clear(); // remove all + for (int i = 0; i < list.size(); i++) { + if (list.get(i).isSelected()) + this.selectionSet.add(list.get(i).getText()); + } + return this.selectionSet; + } + + /** + * update JCheckBox's + */ + private void update() { + checkBoxPanel.removeAll(); + for (int i = 0; i < list.size(); i++) { + buildConstraints(constraints, 0, i, 1, 1, 100, 100); + gridbag.setConstraints(list.get(i), constraints); + checkBoxPanel.add(list.get(i), constraints); + } + } + + /** + * Define GridBagConstraints + */ + private void buildConstraints(GridBagConstraints gbc, int gx, int gy, + int gw, int gh, int wx, int wy) { + gbc.gridx = gx; + gbc.gridy = gy; + gbc.gridwidth = gw; + gbc.gridheight = gh; + gbc.weightx = wx; + gbc.weighty = wy; + } +} \ No newline at end of file Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-10 17:52:40 UTC (rev 535) +++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-11 14:18:59 UTC (rev 536) @@ -183,7 +183,7 @@ } public void actionPerformed(ActionEvent e) { - System.out.println("index: " + cb.getSelectedIndex()); + //System.out.println("index: " + cb.getSelectedIndex()); // read selected LearningProblemClass // choosenClassIndex = cb.getSelectedIndex(); @@ -191,7 +191,7 @@ this.choosenClassIndex = cb.getSelectedIndex(); config.setInitLearningProblem(false); setLearningProblem(); - System.out.println("new_index: " + cb.getSelectedIndex()); + //System.out.println("new_index: " + cb.getSelectedIndex()); } Modified: trunk/src/dl-learner/org/dllearner/gui/RunPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-02-10 17:52:40 UTC (rev 535) +++ trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-02-11 14:18:59 UTC (rev 536) @@ -44,6 +44,11 @@ private ThreadRun thread; + private JPanel showPanel = new JPanel(); + private JPanel infoPanel = new JPanel(); + private JPanel testPanel = new JPanel(); + + RunPanel(Config config) { super(new BorderLayout()); @@ -59,16 +64,15 @@ infoArea = new JTextArea(20, 50); JScrollPane infoScroll = new JScrollPane(infoArea); - JPanel showPanel = new JPanel(); showPanel.add(runButton); showPanel.add(stopButton); showPanel.add(testButton); - JPanel infoPanel = new JPanel(); infoPanel.add(infoScroll); add(showPanel, BorderLayout.PAGE_START); add(infoPanel, BorderLayout.CENTER); + add(testPanel, BorderLayout.PAGE_END); } public void actionPerformed(ActionEvent e) { @@ -85,9 +89,7 @@ // config.getLearningAlgorithm().stop(); thread.exit(); } - if (e.getSource() == testButton - && config.getLearningAlgorithm() != null) { - config.getLearningAlgorithm().stop(); + if (e.getSource() == testButton) { } Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-10 17:52:40 UTC (rev 535) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-11 14:18:59 UTC (rev 536) @@ -42,6 +42,7 @@ import org.dllearner.core.config.ConfigOption; import org.dllearner.core.config.StringSetConfigOption; import org.dllearner.core.config.InvalidConfigOptionValueException; +import org.dllearner.core.dl.Individual; /** * WidgetPanelStringSet @@ -72,6 +73,9 @@ private JList stringList = new JList(); private DefaultListModel listModel = new DefaultListModel(); + private JButton setButton = new JButton("set"); + private CheckBoxList cBL = new CheckBoxList(); + public WidgetPanelStringSet(Config config, Component component, Class<? extends Component> componentOption, ConfigOption<?> configOption) { @@ -85,46 +89,54 @@ add(widgetPanel, BorderLayout.CENTER); showLabel(); // name of option and tooltip showThingToChange(); // textfield, setbutton - stringList.setModel(listModel); - + // ActionListeners addButton.addActionListener(this); removeButton.addActionListener(this); clearButton.addActionListener(this); + setButton.addActionListener(this); } - public JPanel getPanel() { - return this; - } - public void actionPerformed(ActionEvent e) { - Set<String> exampleSet = new HashSet<String>(); - // add to list - if (e.getSource() == addButton - && !listModel.contains(stringField.getText())) { - listModel.addElement(stringField.getText()); + if (!isSpecial()) { + // NORMAL LAYOUT + Set<String> exampleSet = new HashSet<String>(); + // add to list + if (e.getSource() == addButton + && !listModel.contains(stringField.getText())) { + listModel.addElement(stringField.getText()); + } + // remove selection + if (e.getSource() == removeButton) { + int[] selectedIndices = stringList.getSelectedIndices(); + int count = 0; // remove i.e. index 2 and 4: after delete 2, 4 + // is + // now index 3 + for (int i : selectedIndices) + listModel.remove(i - count++); + } + // clear list + if (e.getSource() == clearButton) { + listModel.clear(); + } + // update + // stringList.setModel(listModel); + for (int i = 0; i < listModel.size(); i++) { + if (!listModel.get(i).toString().equalsIgnoreCase("")) + exampleSet.add(listModel.get(i).toString()); + } + // set entry + value = exampleSet; + setEntry(); + } else { + // SPECIAL LAYOUT + // setButton + if (e.getSource() == setButton) { + value = cBL.getSelections(); + setEntry(); + } } - // remove selection - if (e.getSource() == removeButton) { - int[] selectedIndices = stringList.getSelectedIndices(); - int count = 0; // remove i.e. index 2 and 4: after delete 2, 4 is - // now index 3 - for (int i : selectedIndices) - listModel.remove(i - count++); - } - // clear list - if (e.getSource() == clearButton) { - listModel.clear(); - } - // update - // stringList.setModel(listModel); - for (int i = 0; i < listModel.size(); i++) { - if (!listModel.get(i).toString().equalsIgnoreCase("")) - exampleSet.add(listModel.get(i).toString()); - } - // set entry - value = exampleSet; - setEntry(); + } @Override @@ -150,6 +162,7 @@ value = (Set<String>) config.getComponentManager() .getConfigOptionValue(component, configOption.getName()); + // fill list if (value != null) { for (Iterator<String> iterator = value.iterator(); iterator @@ -159,35 +172,59 @@ } } } - buildConstraints(constraints, 0, 1, 1, 1, 100, 100); - gridbag.setConstraints(stringField, constraints); - widgetPanel.add(stringField, constraints); - - buildConstraints(constraints, 1, 1, 1, 1, 100, 100); - gridbag.setConstraints(addButton, constraints); - widgetPanel.add(addButton, constraints); - - // list - stringList.setModel(listModel); - stringList.setLayoutOrientation(JList.VERTICAL); - stringList.setVisibleRowCount(-1); - JScrollPane stringListScroller = new JScrollPane(stringList); - stringListScroller.setPreferredSize(new Dimension(280, 100)); - - buildConstraints(constraints, 0, 2, 1, 2, 100, 100); - gridbag.setConstraints(stringListScroller, constraints); - widgetPanel.add(stringListScroller, constraints); - - buildConstraints(constraints, 1, 2, 1, 1, 100, 100); - gridbag.setConstraints(removeButton, constraints); - widgetPanel.add(removeButton, constraints); - - buildConstraints(constraints, 1, 3, 1, 1, 100, 100); - gridbag.setConstraints(clearButton, constraints); - widgetPanel.add(clearButton, constraints); - - // widgetPanel.add(setButton); - // setButton.addActionListener(this); + if (!isSpecial()) { + // NORMAL LAYOUT + // stringField + buildConstraints(constraints, 0, 1, 1, 1, 100, 100); + gridbag.setConstraints(stringField, constraints); + widgetPanel.add(stringField, constraints); + // addButton + buildConstraints(constraints, 1, 1, 1, 1, 100, 100); + gridbag.setConstraints(addButton, constraints); + widgetPanel.add(addButton, constraints); + // list + stringList.setModel(listModel); + stringList.setLayoutOrientation(JList.VERTICAL); + stringList.setVisibleRowCount(-1); + JScrollPane stringListScroller = new JScrollPane(stringList); + stringListScroller + .setPreferredSize(new Dimension(280, 100)); + buildConstraints(constraints, 0, 2, 1, 2, 100, 100); + gridbag.setConstraints(stringListScroller, constraints); + widgetPanel.add(stringListScroller, constraints); + // removeButton + buildConstraints(constraints, 1, 2, 1, 1, 100, 100); + gridbag.setConstraints(removeButton, constraints); + widgetPanel.add(removeButton, constraints); + // clearButton + buildConstraints(constraints, 1, 3, 1, 1, 100, 100); + gridbag.setConstraints(clearButton, constraints); + widgetPanel.add(clearButton, constraints); + } else { + // SPECIAL LAYOUT + // ComboBoxList + buildConstraints(constraints, 0, 1, 1, 1, 100, 100); + gridbag.setConstraints(cBL, constraints); + widgetPanel.add(cBL, constraints); + // setButton + buildConstraints(constraints, 1, 1, 1, 1, 100, 100); + gridbag.setConstraints(setButton, constraints); + widgetPanel.add(setButton, constraints); + // DEFINE LIST + // positiveExamples or negativeExamples + if (configOption.getName().equalsIgnoreCase( + "positiveExamples") + || configOption.getName().equalsIgnoreCase( + "negativeExamples")) { + // fill lists + Set<Individual> individualsSet = config + .getReasoningService().getIndividuals(); + LinkedList<Individual> individuals = new LinkedList<Individual>( + individualsSet); + for (Individual ind : individuals) + cBL.add(ind.getName()); + } + } } // UNKNOWN else { @@ -237,4 +274,15 @@ gbc.weighty = wy; } + /** + * special layout returns true if 2nd layout should used + */ + private boolean isSpecial() { + if (configOption.getName().equalsIgnoreCase("positiveExamples") + || configOption.getName().equalsIgnoreCase("negativeExamples")) + return true; + else + return false; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2008-02-10 17:52:44
|
Revision: 535 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=535&view=rev Author: jenslehmann Date: 2008-02-10 09:52:40 -0800 (Sun, 10 Feb 2008) Log Message: ----------- started Prolog to OWL mapping for carcinogenesis data Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/core/dl/KB.java trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java trunk/src/dl-learner/org/dllearner/examples/PokerTransformer.java trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java trunk/src/dl-learner/org/dllearner/utilities/Files.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/examples/PokerCard.java trunk/src/dl-learner/org/dllearner/examples/PokerHand.java Removed Paths: ------------- trunk/src/dl-learner/org/dllearner/examples/Card.java trunk/src/dl-learner/org/dllearner/examples/Hand.java Modified: trunk/src/dl-learner/org/dllearner/core/dl/KB.java =================================================================== --- trunk/src/dl-learner/org/dllearner/core/dl/KB.java 2008-02-10 16:08:51 UTC (rev 534) +++ trunk/src/dl-learner/org/dllearner/core/dl/KB.java 2008-02-10 17:52:40 UTC (rev 535) @@ -134,6 +134,24 @@ return tbox; } + /** + * Convenience method, which adds an axiom to ABox, RBox, or + * TBox depending on whether it is an assertional, role, or + * terminological axiom. + * + * @param axiom Axiom to add. + */ + public void addAxiom(Axiom axiom) { + if(axiom instanceof AssertionalAxiom) + addABoxAxiom((AssertionalAxiom) axiom); + else if(axiom instanceof RBoxAxiom) + addRBoxAxiom((RBoxAxiom) axiom); + else if(axiom instanceof TerminologicalAxiom) + addTBoxAxiom((TerminologicalAxiom) axiom); + else + throw new Error(axiom + " has unsupported axiom type."); + } + public void addABoxAxiom(AssertionalAxiom axiom) { abox.add(axiom); } Modified: trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java =================================================================== --- trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-02-10 16:08:51 UTC (rev 534) +++ trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-02-10 17:52:40 UTC (rev 535) @@ -22,11 +22,25 @@ import java.io.File; import java.io.FileNotFoundException; import java.io.IOException; +import java.net.URI; +import java.util.ArrayList; +import java.util.LinkedList; +import java.util.List; +import org.dllearner.core.dl.AtomicConcept; +import org.dllearner.core.dl.AtomicRole; +import org.dllearner.core.dl.Axiom; +import org.dllearner.core.dl.Individual; +import org.dllearner.core.dl.KB; +import org.dllearner.core.dl.RoleAssertion; import org.dllearner.parser.ParseException; import org.dllearner.parser.PrologParser; +import org.dllearner.prolog.Atom; +import org.dllearner.prolog.Clause; import org.dllearner.prolog.Program; +import org.dllearner.reasoning.OWLAPIReasoner; import org.dllearner.utilities.Files; +import org.dllearner.utilities.Helper; /** * This class maps the carcinogenesis Prolog files to an OWL file. In a first @@ -34,23 +48,60 @@ * applying mapping Prolog clauses to OWL axioms through domain specific mapping * rules. * + * The carcinogenesis Prolog files are available here: + * http://web.comlab.ox.ac.uk/oucl/research/areas/machlearn/cancer.html + * + * .f files contain positive and .n files contain negative examples. pte1.n and + * pte.f contain the PTE-1 challenge examples. train.n and train.f contain other + * examples which can be used to train for PTE-1. + * + * The PTE-2 directory contains PTE-2 files, i.e. all substances referred to in + * those files are only those of the PTE-2 challenge. + * * @author Jens Lehmann * */ public class Carcinogenesis { + private static URI ontologyURI = URI.create("http://dl-learner.org/carcinogenesis"); + /** * @param args + * No arguments supported. */ public static void main(String[] args) { + String prologDirectory = "examples/carcinogenesis/prolog/"; + String[] files = new String[] { "ames.pl", "atoms.pl", "bonds.pl", "gentoxprops.pl", + "ind_nos.pl", "ind_pos.pl", "newgroups.pl", + // "train.b" => not a pure Prolog file but Progol/Aleph specific + }; + File owlFile = new File("examples/carcinogenesis/pte.owl"); + + Program program = null; + long startTime, duration; + String time; + try { - String prologFile = "examples/carcinogenesis/prolog/atoms.pl"; - File file = new File(prologFile); - String content = Files.readFile(file); + // reading files + System.out.print("Reading in carcinogenesis Prolog files ... "); + startTime = System.nanoTime(); + String content = ""; + for (String file : files) { + content += Files.readFile(new File(prologDirectory + file)); + } + duration = System.nanoTime() - startTime; + time = Helper.prettyPrintNanoSeconds(duration, false, false); + System.out.println("OK (" + time + ")."); + + // parsing files + System.out.print("Parsing Prolog files ... "); + startTime = System.nanoTime(); PrologParser pp = new PrologParser(); - Program program = pp.parseProgram(content); - System.out.println(program.toPLString()); + program = pp.parseProgram(content); + duration = System.nanoTime() - startTime; + time = Helper.prettyPrintNanoSeconds(duration, false, false); + System.out.println("OK (" + time + ")."); } catch (ParseException e) { e.printStackTrace(); } catch (FileNotFoundException e) { @@ -59,6 +110,66 @@ e.printStackTrace(); } + // mapping clauses to axioms + System.out.print("Mapping clauses to axioms ... "); + startTime = System.nanoTime(); + ArrayList<Clause> clauses = program.getClauses(); + KB kb = new KB(); + for (Clause clause : clauses) { + List<Axiom> axioms = mapClause(clause); + for (Axiom axiom : axioms) + kb.addAxiom(axiom); + } + duration = System.nanoTime() - startTime; + time = Helper.prettyPrintNanoSeconds(duration, false, false); + System.out.println("OK (" + time + ")."); + + // writing generated knowledge base + System.out.print("Writing OWL file ... "); + startTime = System.nanoTime(); + OWLAPIReasoner.exportKBToOWL(owlFile, kb, ontologyURI); + duration = System.nanoTime() - startTime; + time = Helper.prettyPrintNanoSeconds(duration, false, false); + System.out.println("OK (" + time + ")."); } + private static List<Axiom> mapClause(Clause clause) { + List<Axiom> axioms = new LinkedList<Axiom>(); + Atom head = clause.getHead(); + String headName = head.getName(); + // Body body = clause.getBody(); + // ArrayList<Literal> literals = body.getLiterals(); + if (headName.equals("atm")) { + // System.out.println(clause.toPLString()); + // System.out.println(clause); + String compoundName = head.getArgument(0).toPLString(); + String atomName = head.getArgument(1).toPLString(); + RoleAssertion ra = getRoleAssertion("hasAtom", compoundName, atomName); + axioms.add(ra); + } else { + + } + return axioms; + } + + private static RoleAssertion getRoleAssertion(String role, String i1, String i2) { + Individual ind1 = getIndividual(i1); + Individual ind2 = getIndividual(i2); + AtomicRole ar = getRole(role); + return new RoleAssertion(ar,ind1,ind2); + } + + private static Individual getIndividual(String name) { + return new Individual(ontologyURI + "#" + name); + } + + private static AtomicRole getRole(String name) { + return new AtomicRole(ontologyURI + "#" + name); + } + + @SuppressWarnings({"unused"}) + private static AtomicConcept getAtomicConcept(String name) { + return new AtomicConcept(ontologyURI + "#" + name); + } + } Deleted: trunk/src/dl-learner/org/dllearner/examples/Card.java =================================================================== --- trunk/src/dl-learner/org/dllearner/examples/Card.java 2008-02-10 16:08:51 UTC (rev 534) +++ trunk/src/dl-learner/org/dllearner/examples/Card.java 2008-02-10 17:52:40 UTC (rev 535) @@ -1,71 +0,0 @@ -package org.dllearner.examples; - -public class Card { - - private int suit; - private int rank; - - /** - * - * @param suit Ordinal (1-4) representing {Hearts, Spades, Diamonds, Clubs}. - * @param rank Numerical (1-13) representing (Ace, 2, 3, ... , Queen, King) - */ - public Card(int suit, int rank) { - this.suit = suit; - this.rank = rank; - } - - public String getSuitString() { - switch(suit) { - case 1: return "hearts"; - case 2: return "spades"; - case 3: return "diamonds"; - case 4: return "clubs"; - } - throw new Error("Unknown suit code " + suit); - } - - public String getRankString() { - switch(rank) { - case 1: return "ace"; - case 2: return "two"; - case 3: return "three"; - case 4: return "four"; - case 5: return "five"; - case 6: return "six"; - case 7: return "seven"; - case 8: return "eight"; - case 9: return "nine"; - case 10: return "ten"; - case 11: return "jack"; - case 12: return "queen"; - case 13: return "king"; - } - throw new Error("Unknown rank code " + rank); - } - - public boolean hasSameSuit(Card card) { - return (suit == card.getSuit()); - } - - public boolean hasSameRank(Card card) { - return (rank == card.getRank()); - } - - // prüft, ob übergebene Karte den nächsten Rank hat - public boolean hasNextRank(Card card) { - // Spezialfall Ass: Vorgänger von 2 und Nachfolger von König - if(rank+1 == card.getRank() || (rank==13 && card.getRank()==1)) - return true; - else - return false; - } - - public int getRank() { - return rank; - } - - public int getSuit() { - return suit; - } -} Deleted: trunk/src/dl-learner/org/dllearner/examples/Hand.java =================================================================== --- trunk/src/dl-learner/org/dllearner/examples/Hand.java 2008-02-10 16:08:51 UTC (rev 534) +++ trunk/src/dl-learner/org/dllearner/examples/Hand.java 2008-02-10 17:52:40 UTC (rev 535) @@ -1,38 +0,0 @@ -package org.dllearner.examples; - -public class Hand { - - private Card[] cards; - int handType; - - /** - * - * @param cards - * @param hand - * Ordinal (0-9) - * - * 0: Nothing in hand; not a recognized poker hand - * 1: One pair; one pair of equal ranks within five cards - * 2: Two pairs; two pairs of equal ranks within five cards - * 3: Three of a kind; three equal ranks within five cards - * 4: Straight; five cards, sequentially ranked with no gaps - * 5: Flush; five cards with the same suit - * 6: Full house; pair + different rank three of a kind - * 7: Four of a kind; four equal ranks within five cards - * 8: Straight flush; straight + flush - * 9: Royal flush; {Ace, King, Queen, Jack, Ten} + flush - */ - public Hand(Card[] cards, int hand) { - this.cards = cards; - this.handType = hand; - } - - public Card[] getCards() { - return cards; - } - - public int getHandType() { - return handType; - } - -} Copied: trunk/src/dl-learner/org/dllearner/examples/PokerCard.java (from rev 533, trunk/src/dl-learner/org/dllearner/examples/Card.java) =================================================================== --- trunk/src/dl-learner/org/dllearner/examples/PokerCard.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/examples/PokerCard.java 2008-02-10 17:52:40 UTC (rev 535) @@ -0,0 +1,76 @@ +package org.dllearner.examples; + +/** + * A poker card has one of 4 suits and 13 ranks. + * @author Jens Lehmann + * + */ +public class PokerCard { + + private int suit; + private int rank; + + /** + * + * @param suit Ordinal (1-4) representing {Hearts, Spades, Diamonds, Clubs}. + * @param rank Numerical (1-13) representing (Ace, 2, 3, ... , Queen, King) + */ + public PokerCard(int suit, int rank) { + this.suit = suit; + this.rank = rank; + } + + public String getSuitString() { + switch(suit) { + case 1: return "hearts"; + case 2: return "spades"; + case 3: return "diamonds"; + case 4: return "clubs"; + } + throw new Error("Unknown suit code " + suit); + } + + public String getRankString() { + switch(rank) { + case 1: return "ace"; + case 2: return "two"; + case 3: return "three"; + case 4: return "four"; + case 5: return "five"; + case 6: return "six"; + case 7: return "seven"; + case 8: return "eight"; + case 9: return "nine"; + case 10: return "ten"; + case 11: return "jack"; + case 12: return "queen"; + case 13: return "king"; + } + throw new Error("Unknown rank code " + rank); + } + + public boolean hasSameSuit(PokerCard card) { + return (suit == card.getSuit()); + } + + public boolean hasSameRank(PokerCard card) { + return (rank == card.getRank()); + } + + // prüft, ob übergebene Karte den nächsten Rank hat + public boolean hasNextRank(PokerCard card) { + // Spezialfall Ass: Vorgänger von 2 und Nachfolger von König + if(rank+1 == card.getRank() || (rank==13 && card.getRank()==1)) + return true; + else + return false; + } + + public int getRank() { + return rank; + } + + public int getSuit() { + return suit; + } +} Copied: trunk/src/dl-learner/org/dllearner/examples/PokerHand.java (from rev 533, trunk/src/dl-learner/org/dllearner/examples/Hand.java) =================================================================== --- trunk/src/dl-learner/org/dllearner/examples/PokerHand.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/examples/PokerHand.java 2008-02-10 17:52:40 UTC (rev 535) @@ -0,0 +1,44 @@ +package org.dllearner.examples; + +/** + * A poker hand consists of 5 cards. + * + * @author Jens Lehmann + * + */ +public class PokerHand { + + private PokerCard[] cards; + int handType; + + /** + * + * @param cards + * @param hand + * Ordinal (0-9) + * + * 0: Nothing in hand; not a recognized poker hand + * 1: One pair; one pair of equal ranks within five cards + * 2: Two pairs; two pairs of equal ranks within five cards + * 3: Three of a kind; three equal ranks within five cards + * 4: Straight; five cards, sequentially ranked with no gaps + * 5: Flush; five cards with the same suit + * 6: Full house; pair + different rank three of a kind + * 7: Four of a kind; four equal ranks within five cards + * 8: Straight flush; straight + flush + * 9: Royal flush; {Ace, King, Queen, Jack, Ten} + flush + */ + public PokerHand(PokerCard[] cards, int hand) { + this.cards = cards; + this.handType = hand; + } + + public PokerCard[] getCards() { + return cards; + } + + public int getHandType() { + return handType; + } + +} Modified: trunk/src/dl-learner/org/dllearner/examples/PokerTransformer.java =================================================================== --- trunk/src/dl-learner/org/dllearner/examples/PokerTransformer.java 2008-02-10 16:08:51 UTC (rev 534) +++ trunk/src/dl-learner/org/dllearner/examples/PokerTransformer.java 2008-02-10 17:52:40 UTC (rev 535) @@ -60,27 +60,27 @@ lineNumber++; } - List<Hand> hands = new LinkedList<Hand>(); + List<PokerHand> hands = new LinkedList<PokerHand>(); for(String s : pokerExamples) { // System.out.println(s); StringTokenizer st = new StringTokenizer(s,","); // 5 Karten einlesen - Card[] cards = new Card[5]; + PokerCard[] cards = new PokerCard[5]; for(int i=0; i<=4; i++) { String suit = st.nextToken(); String rank = st.nextToken(); - cards[i] = new Card(new Integer(suit),new Integer(rank)); + cards[i] = new PokerCard(new Integer(suit),new Integer(rank)); } // Klasse auslesen String handType = st.nextToken(); - Hand hand = new Hand(cards, new Integer(handType)); + PokerHand hand = new PokerHand(cards, new Integer(handType)); // prüfen, ob Deck schon existiert (nicht gerade effizient, // aber OK) boolean handExists = false; - for(Hand d : hands) { + for(PokerHand d : hands) { if(equalDecks(d,hand)) { handExists = true; break; @@ -112,7 +112,7 @@ // für jede Karte die entsprechende Ausgabe machen int handNumber = 0; - for(Hand deck : hands) { + for(PokerHand deck : hands) { String handID = "hand" + handNumber; // Ausgabe der Hand (damit für Reasoner klar ist, dass es @@ -120,10 +120,10 @@ write(fos, "deck("+handID+")."); int cardNumber = handNumber*5; - Card[] cards = deck.getCards(); + PokerCard[] cards = deck.getCards(); // for(Card card : deck.getCards()) { for(int i=0; i<5; i++) { - Card card = cards[i]; + PokerCard card = cards[i]; String cardID = "card" + cardNumber; // Ausgabe der Karte (damit klar ist, dass es sich um ein @@ -139,7 +139,7 @@ // sameSuit, nextRank und sameRank ausgeben for(int j=i+1; j<5; j++) { - Card otherCard = cards[j]; + PokerCard otherCard = cards[j]; String otherCardID = "card" + (handNumber*5+j); if(card.hasSameSuit(otherCard)) write(fos, "sameSuit("+cardID+","+otherCardID+")."); @@ -150,7 +150,7 @@ // nextRank ist nicht symmetrisch, deshalb müssen alle // 4 anderen Karten geprüft werden for(int j=0; j<5; j++) { - Card otherCard = cards[j]; + PokerCard otherCard = cards[j]; String otherCardID = "card" + (handNumber*5+j); if(card.hasNextRank(otherCard)) { // Spezialfall: Ass @@ -217,8 +217,8 @@ } } - public boolean equalDecks(Hand deck1, Hand deck2) { - Card[] deck1Cards = deck1.getCards(); + public boolean equalDecks(PokerHand deck1, PokerHand deck2) { + PokerCard[] deck1Cards = deck1.getCards(); for(int i=0; i<5; i++) { if(!isInCards(deck1Cards[i],deck2)) return false; @@ -226,8 +226,8 @@ return true; } - public boolean isInCards(Card card, Hand deck) { - Card[] cards = deck.getCards(); + public boolean isInCards(PokerCard card, PokerHand deck) { + PokerCard[] cards = deck.getCards(); for(int j=0; j<5; j++) { // Test auf Gleichheit if(card.getSuit()==cards[j].getSuit() && card.getRank()==cards[j].getRank()) @@ -236,8 +236,8 @@ return false; } - public boolean hasKing(Hand deck) { - Card[] cards = deck.getCards(); + public boolean hasKing(PokerHand deck) { + PokerCard[] cards = deck.getCards(); for(int j=0; j<5; j++) { if(cards[j].getRank()==13) return true; Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java =================================================================== --- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-02-10 16:08:51 UTC (rev 534) +++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-02-10 17:52:40 UTC (rev 535) @@ -19,6 +19,7 @@ */ package org.dllearner.reasoning; +import java.io.File; import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -83,6 +84,9 @@ import org.semanticweb.owl.model.OWLOntologyChangeException; import org.semanticweb.owl.model.OWLOntologyCreationException; import org.semanticweb.owl.model.OWLOntologyManager; +import org.semanticweb.owl.model.OWLOntologyStorageException; +import org.semanticweb.owl.model.UnknownOWLOntologyException; +import org.semanticweb.owl.util.SimpleURIMapper; /** * Mapping to OWL API reasoner interface. The OWL API currently @@ -521,6 +525,29 @@ return new AtomicConcept(owlClass.getURI().toString()); } + public static void exportKBToOWL(File owlOutputFile, KB kb, URI ontologyURI) { + OWLOntologyManager manager = OWLManager.createOWLOntologyManager(); + //URI ontologyURI = URI.create("http://example.com"); + URI physicalURI = owlOutputFile.toURI(); + SimpleURIMapper mapper = new SimpleURIMapper(ontologyURI, physicalURI); + manager.addURIMapper(mapper); + OWLOntology ontology; + try { + ontology = manager.createOntology(ontologyURI); + OWLAPIReasoner.fillOWLAPIOntology(manager, ontology, kb); + manager.saveOntology(ontology); + } catch (OWLOntologyCreationException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (UnknownOWLOntologyException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (OWLOntologyStorageException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + public static OWLObjectProperty getOWLAPIDescription(AtomicRole role) { return staticFactory.getOWLObjectProperty(URI.create(role.getName())); } Modified: trunk/src/dl-learner/org/dllearner/utilities/Files.java =================================================================== --- trunk/src/dl-learner/org/dllearner/utilities/Files.java 2008-02-10 16:08:51 UTC (rev 534) +++ trunk/src/dl-learner/org/dllearner/utilities/Files.java 2008-02-10 17:52:40 UTC (rev 535) @@ -20,13 +20,11 @@ package org.dllearner.utilities; import java.io.BufferedReader; -import java.io.DataInputStream; import java.io.File; -import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; +import java.io.FileReader; import java.io.IOException; -import java.io.InputStreamReader; /** * @author Jens Lehmann @@ -42,15 +40,14 @@ * @return Content of the file. */ public static String readFile(File file) throws FileNotFoundException, IOException { - FileInputStream fstream = new FileInputStream(file); - DataInputStream in = new DataInputStream(fstream); - BufferedReader br = new BufferedReader(new InputStreamReader(in)); + BufferedReader br = new BufferedReader(new FileReader(file)); String line; StringBuffer content = new StringBuffer(); while ((line = br.readLine()) != null) { content.append(line); + content.append(System.getProperty("line.separator")); } - in.close(); + br.close(); return content.toString(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2008-02-10 16:08:56
|
Revision: 534 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=534&view=rev Author: jenslehmann Date: 2008-02-10 08:08:51 -0800 (Sun, 10 Feb 2008) Log Message: ----------- extended list support of Prolog parser Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/parser/PrologParser.java trunk/src/dl-learner/org/dllearner/parser/prolog.jj Modified: trunk/src/dl-learner/org/dllearner/parser/PrologParser.java =================================================================== --- trunk/src/dl-learner/org/dllearner/parser/PrologParser.java 2008-02-10 10:54:40 UTC (rev 533) +++ trunk/src/dl-learner/org/dllearner/parser/PrologParser.java 2008-02-10 16:08:51 UTC (rev 534) @@ -255,7 +255,7 @@ final public org.dllearner.prolog.List list() throws ParseException { java.util.ArrayList content = null; - org.dllearner.prolog.Term head; + org.dllearner.prolog.Term head, tmp; org.dllearner.prolog.List l; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { case 24: @@ -264,12 +264,12 @@ break; default: jj_la1[7] = jj_gen; - if (jj_2_7(3)) { + if (jj_2_8(3)) { jj_consume_token(25); head = term(); jj_consume_token(26); {if (true) return new org.dllearner.prolog.List(head, null);} - } else if (jj_2_8(3)) { + } else if (jj_2_9(3)) { jj_consume_token(25); head = term(); jj_consume_token(27); @@ -277,8 +277,31 @@ jj_consume_token(26); {if (true) return new org.dllearner.prolog.List(head, l);} } else { - jj_consume_token(-1); - throw new ParseException(); + switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { + case 25: + content = new java.util.ArrayList(); + jj_consume_token(25); + label_4: + while (true) { + if (jj_2_7(2)) { + ; + } else { + break label_4; + } + tmp = term(); + content.add(tmp); + jj_consume_token(21); + } + tmp = term(); + content.add(tmp); + jj_consume_token(26); + {if (true) return org.dllearner.prolog.List.compose(content);} + break; + default: + jj_la1[8] = jj_gen; + jj_consume_token(-1); + throw new ParseException(); + } } } throw new Error("Missing return statement in function"); @@ -340,27 +363,40 @@ finally { jj_save(7, xla); } } - final private boolean jj_3R_4() { + final private boolean jj_2_9(int xla) { + jj_la = xla; jj_lastpos = jj_scanpos = token; + try { return !jj_3_9(); } + catch(LookaheadSuccess ls) { return true; } + finally { jj_save(8, xla); } + } + + final private boolean jj_3R_5() { if (jj_scan_token(OPERATOR)) return true; return false; } - final private boolean jj_3R_12() { - if (jj_3R_14()) return true; + final private boolean jj_3_7() { + if (jj_3R_9()) return true; + if (jj_scan_token(21)) return true; return false; } - final private boolean jj_3R_11() { + final private boolean jj_3R_13() { + if (jj_3R_15()) return true; + return false; + } + + final private boolean jj_3R_12() { if (jj_scan_token(STRINGCONSTANT)) return true; return false; } - final private boolean jj_3R_10() { + final private boolean jj_3R_11() { if (jj_scan_token(DOUBLE)) return true; return false; } - final private boolean jj_3R_9() { + final private boolean jj_3R_10() { if (jj_scan_token(VAR)) return true; return false; } @@ -370,28 +406,40 @@ return false; } + final private boolean jj_3R_18() { + if (jj_scan_token(25)) return true; + Token xsp; + while (true) { + xsp = jj_scanpos; + if (jj_3_7()) { jj_scanpos = xsp; break; } + } + if (jj_3R_9()) return true; + if (jj_scan_token(26)) return true; + return false; + } + final private boolean jj_3_5() { if (jj_scan_token(IDENTIFIER)) return true; if (jj_scan_token(22)) return true; - if (jj_3R_13()) return true; + if (jj_3R_14()) return true; if (jj_scan_token(23)) return true; return false; } - final private boolean jj_3R_5() { + final private boolean jj_3R_6() { Token xsp; xsp = jj_scanpos; if (jj_3_5()) { jj_scanpos = xsp; if (jj_3_6()) { jj_scanpos = xsp; - if (jj_3R_9()) { - jj_scanpos = xsp; if (jj_3R_10()) { jj_scanpos = xsp; if (jj_3R_11()) { jj_scanpos = xsp; - if (jj_3R_12()) return true; + if (jj_3R_12()) { + jj_scanpos = xsp; + if (jj_3R_13()) return true; } } } @@ -400,81 +448,84 @@ return false; } - final private boolean jj_3_8() { + final private boolean jj_3_9() { if (jj_scan_token(25)) return true; - if (jj_3R_8()) return true; + if (jj_3R_9()) return true; if (jj_scan_token(27)) return true; - if (jj_3R_14()) return true; + if (jj_3R_15()) return true; if (jj_scan_token(26)) return true; return false; } - final private boolean jj_3_7() { + final private boolean jj_3_8() { if (jj_scan_token(25)) return true; - if (jj_3R_8()) return true; + if (jj_3R_9()) return true; if (jj_scan_token(26)) return true; return false; } - final private boolean jj_3R_16() { + final private boolean jj_3R_17() { if (jj_scan_token(24)) return true; return false; } - final private boolean jj_3R_14() { + final private boolean jj_3R_15() { Token xsp; xsp = jj_scanpos; - if (jj_3R_16()) { + if (jj_3R_17()) { jj_scanpos = xsp; - if (jj_3_7()) { + if (jj_3_8()) { jj_scanpos = xsp; - if (jj_3_8()) return true; + if (jj_3_9()) { + jj_scanpos = xsp; + if (jj_3R_18()) return true; } } + } return false; } final private boolean jj_3_4() { - if (jj_3R_5()) return true; + if (jj_3R_6()) return true; return false; } - final private boolean jj_3R_15() { + final private boolean jj_3R_16() { if (jj_scan_token(21)) return true; - if (jj_3R_8()) return true; + if (jj_3R_9()) return true; return false; } final private boolean jj_3_3() { - if (jj_3R_5()) return true; - if (jj_3R_7()) return true; + if (jj_3R_6()) return true; + if (jj_3R_8()) return true; return false; } final private boolean jj_3_2() { - if (jj_3R_5()) return true; if (jj_3R_6()) return true; - if (jj_3R_5()) return true; + if (jj_3R_7()) return true; + if (jj_3R_6()) return true; return false; } - final private boolean jj_3R_13() { - if (jj_3R_8()) return true; + final private boolean jj_3R_14() { + if (jj_3R_9()) return true; Token xsp; while (true) { xsp = jj_scanpos; - if (jj_3R_15()) { jj_scanpos = xsp; break; } + if (jj_3R_16()) { jj_scanpos = xsp; break; } } return false; } final private boolean jj_3_1() { - if (jj_3R_4()) return true; if (jj_3R_5()) return true; + if (jj_3R_6()) return true; return false; } - final private boolean jj_3R_8() { + final private boolean jj_3R_9() { Token xsp; xsp = jj_scanpos; if (jj_3_1()) { @@ -490,12 +541,12 @@ return false; } - final private boolean jj_3R_7() { + final private boolean jj_3R_8() { if (jj_scan_token(OPERATOR)) return true; return false; } - final private boolean jj_3R_6() { + final private boolean jj_3R_7() { if (jj_scan_token(OPERATOR)) return true; return false; } @@ -509,15 +560,15 @@ public boolean lookingAhead = false; private boolean jj_semLA; private int jj_gen; - final private int[] jj_la1 = new int[8]; + final private int[] jj_la1 = new int[9]; static private int[] jj_la1_0; static { jj_la1_0(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0x2000,0x80000,0x200000,0x400000,0x2080,0x3001900,0x200000,0x1000000,}; + jj_la1_0 = new int[] {0x2000,0x80000,0x200000,0x400000,0x2080,0x3001900,0x200000,0x1000000,0x2000000,}; } - final private JJCalls[] jj_2_rtns = new JJCalls[8]; + final private JJCalls[] jj_2_rtns = new JJCalls[9]; private boolean jj_rescan = false; private int jj_gc = 0; @@ -530,7 +581,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 8; i++) jj_la1[i] = -1; + for (int i = 0; i < 9; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -543,7 +594,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 8; i++) jj_la1[i] = -1; + for (int i = 0; i < 9; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -553,7 +604,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 8; i++) jj_la1[i] = -1; + for (int i = 0; i < 9; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -563,7 +614,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 8; i++) jj_la1[i] = -1; + for (int i = 0; i < 9; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -572,7 +623,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 8; i++) jj_la1[i] = -1; + for (int i = 0; i < 9; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -581,7 +632,7 @@ token = new Token(); jj_ntk = -1; jj_gen = 0; - for (int i = 0; i < 8; i++) jj_la1[i] = -1; + for (int i = 0; i < 9; i++) jj_la1[i] = -1; for (int i = 0; i < jj_2_rtns.length; i++) jj_2_rtns[i] = new JJCalls(); } @@ -697,7 +748,7 @@ la1tokens[jj_kind] = true; jj_kind = -1; } - for (int i = 0; i < 8; i++) { + for (int i = 0; i < 9; i++) { if (jj_la1[i] == jj_gen) { for (int j = 0; j < 32; j++) { if ((jj_la1_0[i] & (1<<j)) != 0) { @@ -731,7 +782,7 @@ final private void jj_rescan_token() { jj_rescan = true; - for (int i = 0; i < 8; i++) { + for (int i = 0; i < 9; i++) { try { JJCalls p = jj_2_rtns[i]; do { @@ -746,6 +797,7 @@ case 5: jj_3_6(); break; case 6: jj_3_7(); break; case 7: jj_3_8(); break; + case 8: jj_3_9(); break; } } p = p.next; Modified: trunk/src/dl-learner/org/dllearner/parser/prolog.jj =================================================================== --- trunk/src/dl-learner/org/dllearner/parser/prolog.jj 2008-02-10 10:54:40 UTC (rev 533) +++ trunk/src/dl-learner/org/dllearner/parser/prolog.jj 2008-02-10 16:08:51 UTC (rev 534) @@ -208,10 +208,13 @@ org.dllearner.prolog.List list() : { java.util.ArrayList content = null; - org.dllearner.prolog.Term head; + org.dllearner.prolog.Term head, tmp; org.dllearner.prolog.List l; }{ "[]" { return new org.dllearner.prolog.List(); } | LOOKAHEAD(3) "[" head = term() "]" { return new org.dllearner.prolog.List(head, null); } | LOOKAHEAD(3) "[" head = term() "|" l = list() "]" { return new org.dllearner.prolog.List(head, l); } -} + | {content = new java.util.ArrayList(); } + "[" ( LOOKAHEAD(2) tmp=term() {content.add(tmp);} ",")* tmp=term() {content.add(tmp);} "]" + { return org.dllearner.prolog.List.compose(content); } +} \ No newline at end of file This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ton...@us...> - 2008-02-10 10:54:49
|
Revision: 533 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=533&view=rev Author: tonytacker Date: 2008-02-10 02:54:40 -0800 (Sun, 10 Feb 2008) Log Message: ----------- new layout for StringSet without specials (i.e. positive/negative examples) Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-09 10:10:22 UTC (rev 532) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelStringSet.java 2008-02-10 10:54:40 UTC (rev 533) @@ -22,6 +22,8 @@ import java.awt.BorderLayout; import java.awt.Dimension; +import java.awt.GridBagConstraints; +import java.awt.GridBagLayout; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import java.awt.Color; @@ -33,6 +35,7 @@ import javax.swing.JPanel; import javax.swing.JButton; import javax.swing.JScrollPane; +import javax.swing.JTextField; import org.dllearner.core.Component; import org.dllearner.core.config.ConfigEntry; @@ -52,9 +55,16 @@ private static final long serialVersionUID = 7832726987046601916L; private Config config; private ConfigOption<?> configOption; + private GridBagLayout gridbag = new GridBagLayout(); + private GridBagConstraints constraints = new GridBagConstraints(); + private JLabel nameLabel; private JPanel widgetPanel = new JPanel(); - private JButton changeButton = new JButton("Change"); + private JButton addButton = new JButton("add"); + private JButton removeButton = new JButton("remove"); + private JButton clearButton = new JButton("clear"); + private JTextField stringField = new JTextField(25); + private Component component; private Class<? extends Component> componentOption; @@ -62,18 +72,25 @@ private JList stringList = new JList(); private DefaultListModel listModel = new DefaultListModel(); - public WidgetPanelStringSet(Config config, Component component, Class<? extends Component> componentOption, ConfigOption<?> configOption) { + this.config = config; this.configOption = configOption; this.component = component; this.componentOption = componentOption; + widgetPanel.setLayout(gridbag); + add(widgetPanel, BorderLayout.CENTER); showLabel(); // name of option and tooltip showThingToChange(); // textfield, setbutton - add(widgetPanel, BorderLayout.CENTER); + + stringList.setModel(listModel); + + addButton.addActionListener(this); + removeButton.addActionListener(this); + clearButton.addActionListener(this); } public JPanel getPanel() { @@ -81,16 +98,43 @@ } public void actionPerformed(ActionEvent e) { - if (e.getSource() == changeButton) { - setEntry(); + Set<String> exampleSet = new HashSet<String>(); + // add to list + if (e.getSource() == addButton + && !listModel.contains(stringField.getText())) { + listModel.addElement(stringField.getText()); } + // remove selection + if (e.getSource() == removeButton) { + int[] selectedIndices = stringList.getSelectedIndices(); + int count = 0; // remove i.e. index 2 and 4: after delete 2, 4 is + // now index 3 + for (int i : selectedIndices) + listModel.remove(i - count++); + } + // clear list + if (e.getSource() == clearButton) { + listModel.clear(); + } + // update + // stringList.setModel(listModel); + for (int i = 0; i < listModel.size(); i++) { + if (!listModel.get(i).toString().equalsIgnoreCase("")) + exampleSet.add(listModel.get(i).toString()); + } + // set entry + value = exampleSet; + setEntry(); } @Override protected void showLabel() { nameLabel = new JLabel(configOption.getName()); nameLabel.setToolTipText(configOption.getDescription()); - widgetPanel.add(nameLabel); + buildConstraints(constraints, 0, 0, 1, 1, 100, 100); + constraints.anchor = GridBagConstraints.WEST; + gridbag.setConstraints(nameLabel, constraints); + widgetPanel.add(nameLabel, constraints); } @SuppressWarnings("unchecked") @@ -115,23 +159,46 @@ } } } + buildConstraints(constraints, 0, 1, 1, 1, 100, 100); + gridbag.setConstraints(stringField, constraints); + widgetPanel.add(stringField, constraints); + + buildConstraints(constraints, 1, 1, 1, 1, 100, 100); + gridbag.setConstraints(addButton, constraints); + widgetPanel.add(addButton, constraints); + + // list stringList.setModel(listModel); stringList.setLayoutOrientation(JList.VERTICAL); stringList.setVisibleRowCount(-1); JScrollPane stringListScroller = new JScrollPane(stringList); - stringListScroller.setPreferredSize(new Dimension(200, 100)); - widgetPanel.add(stringListScroller); - widgetPanel.add(changeButton); - changeButton.addActionListener(this); + stringListScroller.setPreferredSize(new Dimension(280, 100)); + + buildConstraints(constraints, 0, 2, 1, 2, 100, 100); + gridbag.setConstraints(stringListScroller, constraints); + widgetPanel.add(stringListScroller, constraints); + + buildConstraints(constraints, 1, 2, 1, 1, 100, 100); + gridbag.setConstraints(removeButton, constraints); + widgetPanel.add(removeButton, constraints); + + buildConstraints(constraints, 1, 3, 1, 1, 100, 100); + gridbag.setConstraints(clearButton, constraints); + widgetPanel.add(clearButton, constraints); + + // widgetPanel.add(setButton); + // setButton.addActionListener(this); } // UNKNOWN else { JLabel notImplementedLabel = new JLabel("not a set of strings"); notImplementedLabel.setForeground(Color.RED); + buildConstraints(constraints, 0, 1, 1, 1, 100, 100); + gridbag.setConstraints(notImplementedLabel, constraints); widgetPanel.add(notImplementedLabel); } } else { // configOption == NULL - JLabel noConfigOptionLabel = new JLabel("no instance (StringSet)"); + JLabel noConfigOptionLabel = new JLabel("no init (StringSet)"); noConfigOptionLabel.setForeground(Color.MAGENTA); widgetPanel.add(noConfigOptionLabel); } @@ -149,12 +216,25 @@ specialOption, value); config.getComponentManager().applyConfigEntry(component, specialEntry); - System.out.println("set StringSet: " + configOption.getName() + " = " - + value); + System.out.println("set StringSet: " + configOption.getName() + + " = " + value); } catch (InvalidConfigOptionValueException s) { s.printStackTrace(); } } + /** + * Define GridBagConstraints + */ + private void buildConstraints(GridBagConstraints gbc, int gx, int gy, + int gw, int gh, int wx, int wy) { + gbc.gridx = gx; + gbc.gridy = gy; + gbc.gridwidth = gw; + gbc.gridheight = gh; + gbc.weightx = wx; + gbc.weighty = wy; + } + } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ton...@us...> - 2008-02-09 10:10:27
|
Revision: 532 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=532&view=rev Author: tonytacker Date: 2008-02-09 02:10:22 -0800 (Sat, 09 Feb 2008) Log Message: ----------- bugfix Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java Modified: trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-09 09:50:41 UTC (rev 531) +++ trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-09 10:10:22 UTC (rev 532) @@ -87,7 +87,7 @@ // choosenClassIndex = cb.getSelectedIndex(); if (choosenClassIndex != cb.getSelectedIndex()) { choosenClassIndex = cb.getSelectedIndex(); - config.setInitLearningProblem(false); + config.setInitLearningAlgorithm(false); setLearningAlgorithm(); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ton...@us...> - 2008-02-09 09:50:43
|
Revision: 531 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=531&view=rev Author: tonytacker Date: 2008-02-09 01:50:41 -0800 (Sat, 09 Feb 2008) Log Message: ----------- bugfix Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/Config.java trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java trunk/src/dl-learner/org/dllearner/gui/StartGUI.java Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-02-09 09:26:59 UTC (rev 530) +++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-02-09 09:50:41 UTC (rev 531) @@ -181,7 +181,7 @@ /** * set true if you run LearningAlgorithm.init */ - protected void setLearningAlgorithm(Boolean is) { + protected void setInitLearningAlgorithm(Boolean is) { isInit[3] = is; } Modified: trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-09 09:26:59 UTC (rev 530) +++ trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-09 09:50:41 UTC (rev 531) @@ -121,7 +121,7 @@ public void init() { if (config.getLearningProblem() != null) { config.getLearningAlgorithm().init(); - config.setLearningAlgorithm(true); + config.setInitLearningAlgorithm(true); System.out.println("init LearningAlgorithm"); startGUI.updateTabColors(); } Modified: trunk/src/dl-learner/org/dllearner/gui/StartGUI.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-02-09 09:26:59 UTC (rev 530) +++ trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-02-09 09:50:41 UTC (rev 531) @@ -36,7 +36,6 @@ * StartGUI * * @author Tilo Hielscher - * */ public class StartGUI extends JFrame implements ActionListener { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <ton...@us...> - 2008-02-09 09:27:05
|
Revision: 530 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=530&view=rev Author: tonytacker Date: 2008-02-09 01:26:59 -0800 (Sat, 09 Feb 2008) Log Message: ----------- removed autoinit(), add colored tabs Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/gui/Config.java trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java trunk/src/dl-learner/org/dllearner/gui/RunPanel.java trunk/src/dl-learner/org/dllearner/gui/StartGUI.java trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java Modified: trunk/src/dl-learner/org/dllearner/gui/Config.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-02-08 10:25:23 UTC (rev 529) +++ trunk/src/dl-learner/org/dllearner/gui/Config.java 2008-02-09 09:26:59 UTC (rev 530) @@ -185,6 +185,7 @@ isInit[3] = is; } + @Deprecated protected void autoInit() { // Knowledge Source if (!this.isInitKnowledgeSource() && this.getKnowledgeSource() != null Modified: trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-02-08 10:25:23 UTC (rev 529) +++ trunk/src/dl-learner/org/dllearner/gui/KnowledgeSourcePanel.java 2008-02-09 09:26:59 UTC (rev 530) @@ -37,25 +37,27 @@ private static final long serialVersionUID = -7678275020058043937L; + private Config config; + private StartGUI startGUI; private JButton initButton; private String[] kbBoxItems = {}; private JComboBox cb = new JComboBox(kbBoxItems); private JPanel choosePanel = new JPanel(); private JPanel initPanel = new JPanel(); - private Config config; private int choosenClassIndex; private List<Class<? extends KnowledgeSource>> sources; private OptionPanel optionPanel; - KnowledgeSourcePanel(final Config config) { + KnowledgeSourcePanel(final Config config, StartGUI startGUI) { super(new BorderLayout()); this.config = config; + this.startGUI = startGUI; sources = config.getComponentManager().getKnowledgeSources(); initButton = new JButton("Init KnowledgeSource"); initButton.addActionListener(this); - initButton.setEnabled(false); + initButton.setEnabled(true); // add to comboBox for (int i = 0; i < sources.size(); i++) { @@ -104,12 +106,15 @@ * after this, next tab can be used */ public void init() { -/* if (config.getKnowledgeSource() != null && config.getURI() != null) { + if (/* + * !config.isInitKnowledgeSource() && + */config.getKnowledgeSource() != null && config.getURI() != null) { config.getKnowledgeSource().init(); config.setInitKnowledgeSource(true); System.out.println("init KnowledgeSource"); + startGUI.updateTabColors(); } -*/ config.autoInit(); + // config.autoInit(); } /** Modified: trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-08 10:25:23 UTC (rev 529) +++ trunk/src/dl-learner/org/dllearner/gui/LearningAlgorithmPanel.java 2008-02-09 09:26:59 UTC (rev 530) @@ -37,7 +37,9 @@ public class LearningAlgorithmPanel extends JPanel implements ActionListener { private static final long serialVersionUID = 8721490771860452959L; + private Config config; + private StartGUI startGUI; private List<Class<? extends LearningAlgorithm>> learners; private JPanel choosePanel = new JPanel(); private OptionPanel optionPanel; @@ -47,17 +49,18 @@ private JComboBox cb = new JComboBox(cbItems); private int choosenClassIndex; - LearningAlgorithmPanel(Config config) { + LearningAlgorithmPanel(Config config, StartGUI startGUI) { super(new BorderLayout()); this.config = config; + this.startGUI = startGUI; learners = config.getComponentManager().getLearningAlgorithms(); initButton = new JButton("Init LearingAlgorithm"); initButton.addActionListener(this); initPanel.add(initButton); - initButton.setEnabled(false); - autoInitButton = new JButton("AutoInit"); + initButton.setEnabled(true); + autoInitButton = new JButton("Set"); autoInitButton.addActionListener(this); // add into comboBox @@ -91,7 +94,7 @@ if (e.getSource() == autoInitButton) setLearningAlgorithm(); - if (e.getSource() == initButton && config.isInitLearningProblem()) + if (e.getSource() == initButton) init(); } @@ -99,9 +102,10 @@ * after this, you can change widgets */ public void setLearningAlgorithm() { - config.autoInit(); - if (config.isInitLearningProblem() - && config.getLearningProblem() != null + // config.autoInit(); + if (/* + * config.isInitLearningProblem() && + */config.getLearningProblem() != null && config.getReasoningService() != null) { config.setLearningAlgorithm(config.getComponentManager() .learningAlgorithm(learners.get(choosenClassIndex), @@ -115,11 +119,13 @@ * after this, next tab can be used */ public void init() { - /* - * if (config.isInitLearningProblem()) { - * config.getLearningAlgorithm().init(); System.out.println("init - * LearningAlgorithm"); } - */config.autoInit(); + if (config.getLearningProblem() != null) { + config.getLearningAlgorithm().init(); + config.setLearningAlgorithm(true); + System.out.println("init LearningAlgorithm"); + startGUI.updateTabColors(); + } + // config.autoInit(); } /** Modified: trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-08 10:25:23 UTC (rev 529) +++ trunk/src/dl-learner/org/dllearner/gui/LearningProblemPanel.java 2008-02-09 09:26:59 UTC (rev 530) @@ -47,6 +47,8 @@ private static final long serialVersionUID = -3819627680918930203L; + private Config config; + private StartGUI startGUI; private List<Class<? extends LearningProblem>> problems; private String[] lpBoxItems = {}; private JComboBox cb = new JComboBox(lpBoxItems); @@ -62,19 +64,18 @@ private JList negList = new JList(); private OptionPanel optionPanel; - private Config config; - - LearningProblemPanel(final Config config) { + LearningProblemPanel(final Config config, StartGUI startGUI) { super(new BorderLayout()); this.config = config; + this.startGUI = startGUI; problems = config.getComponentManager().getLearningProblems(); initButton = new JButton("Init LearningProblem"); initButton.addActionListener(this); initPanel.add(initButton); - initButton.setEnabled(false); - autoInitButton = new JButton("AutoInit"); + initButton.setEnabled(true); + autoInitButton = new JButton("Set"); autoInitButton.addActionListener(this); choosePanel.add(cb); choosePanel.add(autoInitButton); @@ -143,6 +144,7 @@ config.getLearningProblem(), "positiveExamples", config.getPosExampleSet()); updateOptionPanel(); + System.out.println("POSSSSS"); } }); @@ -161,6 +163,7 @@ config.getLearningProblem(), "negativeExamples", config.getNegExampleSet()); updateOptionPanel(); + System.out.println("POSSSSS"); } }); @@ -176,19 +179,22 @@ add(initPanel, BorderLayout.PAGE_END); choosenClassIndex = cb.getSelectedIndex(); - setLearningProblem(); + //setLearningProblem(); } public void actionPerformed(ActionEvent e) { + System.out.println("index: " + cb.getSelectedIndex()); + // read selected LearningProblemClass // choosenClassIndex = cb.getSelectedIndex(); if (choosenClassIndex != cb.getSelectedIndex()) { - choosenClassIndex = cb.getSelectedIndex(); + this.choosenClassIndex = cb.getSelectedIndex(); config.setInitLearningProblem(false); setLearningProblem(); + System.out.println("new_index: " + cb.getSelectedIndex()); + } - if (e.getSource() == autoInitButton) setLearningProblem(); @@ -213,7 +219,7 @@ * after this, you can change widgets */ public void setLearningProblem() { - config.autoInit(); + // config.autoInit(); if (config.isInitReasoner()) { config.setLearningProblem(config.getComponentManager() .learningProblem(problems.get(choosenClassIndex), @@ -232,6 +238,7 @@ negList.setModel(listModel); } updateOptionPanel(); + startGUI.updateTabColors(); } } @@ -239,15 +246,22 @@ * after this, next tab can be used */ public void init() { -/* if (config.isInitReasoner()) { + if (/* !config.isInitLearningProblem() && */config.getReasoner() != null + && config.getLearningProblem() != null) { config.getComponentManager().applyConfigEntry( + config.getLearningProblem(), "positiveExamples", + config.getPosExampleSet()); + config.getComponentManager().applyConfigEntry( config.getLearningProblem(), "negativeExamples", config.getNegExampleSet()); + config.getLearningProblem().init(); config.setInitLearningProblem(true); System.out.println("init LearningProblem"); + startGUI.updateTabColors(); + } -*/ config.autoInit(); + // config.autoInit(); } /** Modified: trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-02-08 10:25:23 UTC (rev 529) +++ trunk/src/dl-learner/org/dllearner/gui/ReasonerPanel.java 2008-02-09 09:26:59 UTC (rev 530) @@ -39,27 +39,29 @@ private static final long serialVersionUID = -7678275020058043937L; + private Config config; + private StartGUI startGUI; private List<Class<? extends ReasonerComponent>> reasoners; private JPanel choosePanel = new JPanel(); private JPanel initPanel = new JPanel(); private OptionPanel optionPanel; private JButton initButton, autoInitButton; - private Config config; private String[] cbItems = {}; private JComboBox cb = new JComboBox(cbItems); private int choosenClassIndex; - ReasonerPanel(final Config config) { + ReasonerPanel(final Config config, StartGUI startGUI) { super(new BorderLayout()); this.config = config; + this.startGUI = startGUI; reasoners = config.getComponentManager().getReasonerComponents(); initButton = new JButton("Init Reasoner"); initButton.addActionListener(this); initPanel.add(initButton); - initButton.setEnabled(false); - autoInitButton = new JButton("AutoInit"); + initButton.setEnabled(true); + autoInitButton = new JButton("Set"); autoInitButton.addActionListener(this); choosePanel.add(cb); @@ -90,6 +92,7 @@ if (choosenClassIndex != cb.getSelectedIndex()) { choosenClassIndex = cb.getSelectedIndex(); config.setInitReasoner(false); + setReasoner(); } @@ -104,12 +107,13 @@ * after this, you can change widgets */ public void setReasoner() { - config.autoInit(); + // config.autoInit(); if (config.isInitKnowledgeSource()) { config.setReasoner(config.getComponentManager().reasoner( reasoners.get(choosenClassIndex), config.getKnowledgeSource())); updateOptionPanel(); + startGUI.updateTabColors(); } } @@ -117,7 +121,19 @@ * after this, next tab can be used */ public void init() { - config.autoInit(); + if (/* !config.isInitReasoner() && */config.getKnowledgeSource() != null + && config.getReasoner() != null) { + config.getReasoner().init(); + System.out.println("init Reasoner"); + // set ReasoningService + config.setReasoningService(config.getComponentManager() + .reasoningService(config.getReasoner())); + System.out.println("init ReasoningService"); + config.setInitReasoner(true); + startGUI.updateTabColors(); + + } + // config.autoInit(); } /** Modified: trunk/src/dl-learner/org/dllearner/gui/RunPanel.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-02-08 10:25:23 UTC (rev 529) +++ trunk/src/dl-learner/org/dllearner/gui/RunPanel.java 2008-02-09 09:26:59 UTC (rev 530) @@ -73,7 +73,7 @@ public void actionPerformed(ActionEvent e) { if (e.getSource() == runButton && config.getLearningAlgorithm() != null) { - config.autoInit(); + //config.autoInit(); thread = new ThreadRun(config); thread.start(); // Concept solution = Modified: trunk/src/dl-learner/org/dllearner/gui/StartGUI.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-02-08 10:25:23 UTC (rev 529) +++ trunk/src/dl-learner/org/dllearner/gui/StartGUI.java 2008-02-09 09:26:59 UTC (rev 530) @@ -21,7 +21,9 @@ */ import javax.swing.*; +import javax.swing.event.*; +import java.awt.Color; import java.awt.event.ActionEvent; import java.awt.event.ActionListener; @@ -44,11 +46,11 @@ private Config config = new Config(); - private JPanel tab1; - private JPanel tab2; - private JPanel tab3; - private JPanel tab4; - private JPanel tab5; + private KnowledgeSourcePanel tab0; + private ReasonerPanel tab1; + private LearningProblemPanel tab2; + private LearningAlgorithmPanel tab3; + private RunPanel tab4; private JMenuBar menuBar = new JMenuBar(); private JMenu menuFile = new JMenu("File"); @@ -61,16 +63,16 @@ this.setLocationByPlatform(true); this.setSize(800, 600); - tab1 = new KnowledgeSourcePanel(config); - tab2 = new ReasonerPanel(config); - tab3 = new LearningProblemPanel(config); - tab4 = new LearningAlgorithmPanel(config); - tab5 = new RunPanel(config); - tabPane.addTab("Knowledge Source", tab1); - tabPane.addTab("Reasoner", tab2); - tabPane.addTab("Learning Problem", tab3); - tabPane.addTab("Learning Algorithm", tab4); - tabPane.addTab("Run", tab5); + tab0 = new KnowledgeSourcePanel(config, this); + tab1 = new ReasonerPanel(config, this); + tab2 = new LearningProblemPanel(config, this); + tab3 = new LearningAlgorithmPanel(config, this); + tab4 = new RunPanel(config); + tabPane.addTab("Knowledge Source", tab0); + tabPane.addTab("Reasoner", tab1); + tabPane.addTab("Learning Problem", tab2); + tabPane.addTab("Learning Algorithm", tab3); + tabPane.addTab("Run", tab4); this.setJMenuBar(menuBar); menuBar.add(menuFile); @@ -81,6 +83,16 @@ this.add(tabPane); this.setVisible(true); + updateTabColors(); + + // Register a change listener + tabPane.addChangeListener(new ChangeListener() { + // This method is called whenever the selected tab changes + public void stateChanged(ChangeEvent evt) { + + updateTabColors(); + } + }); } public static void main(String[] args) { @@ -104,4 +116,25 @@ } } + public void updateTabColors() { + if (config.isInitKnowledgeSource()) + tabPane.setForegroundAt(0, Color.BLACK); + else + tabPane.setForegroundAt(0, Color.RED); + if (config.isInitReasoner()) + tabPane.setForegroundAt(1, Color.BLACK); + else + tabPane.setForegroundAt(1, Color.RED); + if (config.isInitLearningProblem()) + tabPane.setForegroundAt(2, Color.BLACK); + else + tabPane.setForegroundAt(2, Color.RED); + if (config.isInitLearningAlgorithm()) { + tabPane.setForegroundAt(3, Color.BLACK); + tabPane.setForegroundAt(4, Color.BLACK); + } else { + tabPane.setForegroundAt(3, Color.RED); + tabPane.setForegroundAt(4, Color.RED); + } + } } Modified: trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java =================================================================== --- trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-02-08 10:25:23 UTC (rev 529) +++ trunk/src/dl-learner/org/dllearner/gui/WidgetPanelBoolean.java 2008-02-09 09:26:59 UTC (rev 530) @@ -120,7 +120,7 @@ widgetPanel.add(notImplementedLabel); } } else { // configOption == NULL - JLabel noConfigOptionLabel = new JLabel("no instance (Boolean)"); + JLabel noConfigOptionLabel = new JLabel("no init (Boolean)"); noConfigOptionLabel.setForeground(Color.MAGENTA); widgetPanel.add(noConfigOptionLabel); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2008-02-08 10:25:27
|
Revision: 529 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=529&view=rev Author: jenslehmann Date: 2008-02-08 02:25:23 -0800 (Fri, 08 Feb 2008) Log Message: ----------- added support for negative and decimal numbers Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java trunk/src/dl-learner/org/dllearner/parser/PrologParser.java trunk/src/dl-learner/org/dllearner/parser/PrologParserConstants.java trunk/src/dl-learner/org/dllearner/parser/PrologParserTokenManager.java trunk/src/dl-learner/org/dllearner/parser/prolog.jj Modified: trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java =================================================================== --- trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-02-08 09:04:00 UTC (rev 528) +++ trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-02-08 10:25:23 UTC (rev 529) @@ -25,6 +25,7 @@ import org.dllearner.parser.ParseException; import org.dllearner.parser.PrologParser; +import org.dllearner.prolog.Program; import org.dllearner.utilities.Files; /** @@ -48,7 +49,8 @@ File file = new File(prologFile); String content = Files.readFile(file); PrologParser pp = new PrologParser(); - pp.parseProgram(content); + Program program = pp.parseProgram(content); + System.out.println(program.toPLString()); } catch (ParseException e) { e.printStackTrace(); } catch (FileNotFoundException e) { Modified: trunk/src/dl-learner/org/dllearner/parser/PrologParser.java =================================================================== --- trunk/src/dl-learner/org/dllearner/parser/PrologParser.java 2008-02-08 09:04:00 UTC (rev 528) +++ trunk/src/dl-learner/org/dllearner/parser/PrologParser.java 2008-02-08 10:25:23 UTC (rev 529) @@ -62,15 +62,15 @@ org.dllearner.prolog.Body body = null; head = atom(); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case 18: - jj_consume_token(18); + case 19: + jj_consume_token(19); body = body(); break; default: jj_la1[1] = jj_gen; ; } - jj_consume_token(19); + jj_consume_token(20); {if (true) return new org.dllearner.prolog.Clause(head, body);} throw new Error("Missing return statement in function"); } @@ -83,14 +83,14 @@ label_2: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case 20: + case 21: ; break; default: jj_la1[2] = jj_gen; break label_2; } - jj_consume_token(20); + jj_consume_token(21); l = literal(); b.addLiteral(l); } @@ -103,10 +103,10 @@ java.util.ArrayList arguments = new java.util.ArrayList() ; atom = jj_consume_token(IDENTIFIER); switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case 21: - jj_consume_token(21); + case 22: + jj_consume_token(22); arguments = termList(); - jj_consume_token(22); + jj_consume_token(23); break; default: jj_la1[3] = jj_gen; @@ -171,11 +171,12 @@ Token f; java.util.ArrayList arguments = null; org.dllearner.prolog.Term l; + org.dllearner.prolog.Number n; if (jj_2_5(2)) { f = jj_consume_token(IDENTIFIER); - jj_consume_token(21); + jj_consume_token(22); arguments = termList(); - jj_consume_token(22); + jj_consume_token(23); {if (true) return new org.dllearner.prolog.Function(f.image, arguments);} } else if (jj_2_6(2)) { f = jj_consume_token(IDENTIFIER); @@ -186,16 +187,16 @@ v = jj_consume_token(VAR); {if (true) return new org.dllearner.prolog.Variable(v.image);} break; - case NUMBER: - v = jj_consume_token(NUMBER); + case DOUBLE: + v = jj_consume_token(DOUBLE); {if (true) return new org.dllearner.prolog.Number(v.image);} break; case STRINGCONSTANT: v = jj_consume_token(STRINGCONSTANT); {if (true) return new org.dllearner.prolog.StringConstant(v.image);} break; - case 23: case 24: + case 25: l = list(); {if (true) return l;} break; @@ -237,14 +238,14 @@ label_3: while (true) { switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case 20: + case 21: ; break; default: jj_la1[6] = jj_gen; break label_3; } - jj_consume_token(20); + jj_consume_token(21); t = term(); l.add(t); } @@ -257,23 +258,23 @@ org.dllearner.prolog.Term head; org.dllearner.prolog.List l; switch ((jj_ntk==-1)?jj_ntk():jj_ntk) { - case 23: - jj_consume_token(23); + case 24: + jj_consume_token(24); {if (true) return new org.dllearner.prolog.List();} break; default: jj_la1[7] = jj_gen; if (jj_2_7(3)) { - jj_consume_token(24); + jj_consume_token(25); head = term(); - jj_consume_token(25); + jj_consume_token(26); {if (true) return new org.dllearner.prolog.List(head, null);} } else if (jj_2_8(3)) { - jj_consume_token(24); + jj_consume_token(25); head = term(); + jj_consume_token(27); + l = list(); jj_consume_token(26); - l = list(); - jj_consume_token(25); {if (true) return new org.dllearner.prolog.List(head, l);} } else { jj_consume_token(-1); @@ -355,7 +356,7 @@ } final private boolean jj_3R_10() { - if (jj_scan_token(NUMBER)) return true; + if (jj_scan_token(DOUBLE)) return true; return false; } @@ -369,20 +370,11 @@ return false; } - final private boolean jj_3_8() { - if (jj_scan_token(24)) return true; - if (jj_3R_8()) return true; - if (jj_scan_token(26)) return true; - if (jj_3R_14()) return true; - if (jj_scan_token(25)) return true; - return false; - } - final private boolean jj_3_5() { if (jj_scan_token(IDENTIFIER)) return true; - if (jj_scan_token(21)) return true; + if (jj_scan_token(22)) return true; if (jj_3R_13()) return true; - if (jj_scan_token(22)) return true; + if (jj_scan_token(23)) return true; return false; } @@ -408,15 +400,24 @@ return false; } + final private boolean jj_3_8() { + if (jj_scan_token(25)) return true; + if (jj_3R_8()) return true; + if (jj_scan_token(27)) return true; + if (jj_3R_14()) return true; + if (jj_scan_token(26)) return true; + return false; + } + final private boolean jj_3_7() { - if (jj_scan_token(24)) return true; + if (jj_scan_token(25)) return true; if (jj_3R_8()) return true; - if (jj_scan_token(25)) return true; + if (jj_scan_token(26)) return true; return false; } final private boolean jj_3R_16() { - if (jj_scan_token(23)) return true; + if (jj_scan_token(24)) return true; return false; } @@ -439,7 +440,7 @@ } final private boolean jj_3R_15() { - if (jj_scan_token(20)) return true; + if (jj_scan_token(21)) return true; if (jj_3R_8()) return true; return false; } @@ -514,7 +515,7 @@ jj_la1_0(); } private static void jj_la1_0() { - jj_la1_0 = new int[] {0x1000,0x40000,0x100000,0x200000,0x1080,0x1800d00,0x100000,0x800000,}; + jj_la1_0 = new int[] {0x2000,0x80000,0x200000,0x400000,0x2080,0x3001900,0x200000,0x1000000,}; } final private JJCalls[] jj_2_rtns = new JJCalls[8]; private boolean jj_rescan = false; @@ -691,7 +692,7 @@ public ParseException generateParseException() { jj_expentries.removeAllElements(); - boolean[] la1tokens = new boolean[27]; + boolean[] la1tokens = new boolean[28]; if (jj_kind >= 0) { la1tokens[jj_kind] = true; jj_kind = -1; @@ -705,7 +706,7 @@ } } } - for (int i = 0; i < 27; i++) { + for (int i = 0; i < 28; i++) { if (la1tokens[i]) { jj_expentry = new int[1]; jj_expentry[0] = i; Modified: trunk/src/dl-learner/org/dllearner/parser/PrologParserConstants.java =================================================================== --- trunk/src/dl-learner/org/dllearner/parser/PrologParserConstants.java 2008-02-08 09:04:00 UTC (rev 528) +++ trunk/src/dl-learner/org/dllearner/parser/PrologParserConstants.java 2008-02-08 10:25:23 UTC (rev 529) @@ -6,16 +6,17 @@ int EOF = 0; int SINGLE_LINE_COMMENT = 6; int NOT = 7; - int NUMBER = 8; - int DIGIT = 9; - int STRINGCONSTANT = 10; - int VAR = 11; - int IDENTIFIER = 12; - int OPERATOR = 13; - int ANYCHAR = 14; - int LOCASE = 15; - int HICASE = 16; - int SPECIALCHAR = 17; + int DOUBLE = 8; + int NUMBER = 9; + int DIGIT = 10; + int STRINGCONSTANT = 11; + int VAR = 12; + int IDENTIFIER = 13; + int OPERATOR = 14; + int ANYCHAR = 15; + int LOCASE = 16; + int HICASE = 17; + int SPECIALCHAR = 18; int DEFAULT = 0; @@ -28,6 +29,7 @@ "\"\\f\"", "<SINGLE_LINE_COMMENT>", "\"not\"", + "<DOUBLE>", "<NUMBER>", "<DIGIT>", "<STRINGCONSTANT>", Modified: trunk/src/dl-learner/org/dllearner/parser/PrologParserTokenManager.java =================================================================== --- trunk/src/dl-learner/org/dllearner/parser/PrologParserTokenManager.java 2008-02-08 09:04:00 UTC (rev 528) +++ trunk/src/dl-learner/org/dllearner/parser/PrologParserTokenManager.java 2008-02-08 10:25:23 UTC (rev 529) @@ -12,16 +12,16 @@ case 0: if ((active0 & 0x80L) != 0L) { - jjmatchedKind = 12; - return 18; + jjmatchedKind = 13; + return 28; } return -1; case 1: if ((active0 & 0x80L) != 0L) { - jjmatchedKind = 12; + jjmatchedKind = 13; jjmatchedPos = 1; - return 18; + return 28; } return -1; default : @@ -51,24 +51,24 @@ switch(curChar) { case 40: - return jjStopAtPos(0, 21); + return jjStopAtPos(0, 22); case 41: - return jjStopAtPos(0, 22); + return jjStopAtPos(0, 23); case 44: + return jjStopAtPos(0, 21); + case 46: return jjStopAtPos(0, 20); - case 46: - return jjStopAtPos(0, 19); case 58: - return jjMoveStringLiteralDfa1_0(0x40000L); + return jjMoveStringLiteralDfa1_0(0x80000L); case 91: - jjmatchedKind = 24; - return jjMoveStringLiteralDfa1_0(0x800000L); + jjmatchedKind = 25; + return jjMoveStringLiteralDfa1_0(0x1000000L); case 93: - return jjStopAtPos(0, 25); + return jjStopAtPos(0, 26); case 110: return jjMoveStringLiteralDfa1_0(0x80L); case 124: - return jjStopAtPos(0, 26); + return jjStopAtPos(0, 27); default : return jjMoveNfa_0(0, 0); } @@ -83,12 +83,12 @@ switch(curChar) { case 45: - if ((active0 & 0x40000L) != 0L) - return jjStopAtPos(1, 18); + if ((active0 & 0x80000L) != 0L) + return jjStopAtPos(1, 19); break; case 93: - if ((active0 & 0x800000L) != 0L) - return jjStopAtPos(1, 23); + if ((active0 & 0x1000000L) != 0L) + return jjStopAtPos(1, 24); break; case 111: return jjMoveStringLiteralDfa2_0(active0, 0x80L); @@ -110,7 +110,7 @@ { case 116: if ((active0 & 0x80L) != 0L) - return jjStartNfaWithStates_0(2, 7, 18); + return jjStartNfaWithStates_0(2, 7, 28); break; default : break; @@ -154,7 +154,7 @@ { int[] nextStates; int startsAt = 0; - jjnewStateCnt = 18; + jjnewStateCnt = 28; int i = 1; jjstateSet[0] = startState; int j, kind = 0x7fffffff; @@ -169,18 +169,18 @@ { switch(jjstateSet[--i]) { - case 18: + case 28: if ((0x53ff2c0000000000L & l) != 0L) { - if (kind > 13) - kind = 13; - jjCheckNAdd(17); + if (kind > 14) + kind = 14; + jjCheckNAdd(16); } if ((0x3ff000000000000L & l) != 0L) { - if (kind > 12) - kind = 12; - jjCheckNAdd(15); + if (kind > 13) + kind = 13; + jjCheckNAdd(14); } break; case 0: @@ -188,24 +188,26 @@ { if (kind > 8) kind = 8; - jjCheckNAdd(5); + jjCheckNAddStates(0, 3); } else if ((0x50002c0000000000L & l) != 0L) { - if (kind > 13) - kind = 13; - jjCheckNAdd(17); + if (kind > 14) + kind = 14; + jjCheckNAdd(16); } else if (curChar == 34) - jjCheckNAddTwoStates(10, 11); + jjCheckNAddTwoStates(9, 10); else if (curChar == 39) - jjCheckNAddTwoStates(7, 8); + jjCheckNAddTwoStates(6, 7); else if (curChar == 37) - jjCheckNAddStates(0, 2); + jjCheckNAddStates(4, 6); + if (curChar == 45) + jjCheckNAddTwoStates(18, 21); break; case 1: if ((0xffffffffffffdbffL & l) != 0L) - jjCheckNAddStates(0, 2); + jjCheckNAddStates(4, 6); break; case 2: if ((0x2400L & l) != 0L && kind > 6) @@ -220,64 +222,125 @@ jjstateSet[jjnewStateCnt++] = 3; break; case 5: - if ((0x3ff000000000000L & l) == 0L) - break; - if (kind > 8) - kind = 8; - jjCheckNAdd(5); + if (curChar == 39) + jjCheckNAddTwoStates(6, 7); break; case 6: - if (curChar == 39) - jjCheckNAddTwoStates(7, 8); + if ((0xffffff7fffffdbffL & l) != 0L) + jjCheckNAddTwoStates(6, 7); break; case 7: - if ((0xffffff7fffffdbffL & l) != 0L) - jjCheckNAddTwoStates(7, 8); + if (curChar == 39 && kind > 11) + kind = 11; break; case 8: - if (curChar == 39 && kind > 10) - kind = 10; + if (curChar == 34) + jjCheckNAddTwoStates(9, 10); break; case 9: - if (curChar == 34) - jjCheckNAddTwoStates(10, 11); + if ((0xffffff7fffffdbffL & l) != 0L) + jjCheckNAddTwoStates(9, 10); break; case 10: - if ((0xffffff7fffffdbffL & l) != 0L) - jjCheckNAddTwoStates(10, 11); - break; - case 11: - if (curChar == 34 && kind > 10) - kind = 10; - break; - case 13: - if ((0x3ff000000000000L & l) == 0L) - break; - if (kind > 11) + if (curChar == 34 && kind > 11) kind = 11; - jjstateSet[jjnewStateCnt++] = 13; break; - case 15: + case 12: if ((0x3ff000000000000L & l) == 0L) break; if (kind > 12) kind = 12; - jjCheckNAdd(15); + jjstateSet[jjnewStateCnt++] = 12; break; - case 16: - if ((0x50002c0000000000L & l) == 0L) + case 14: + if ((0x3ff000000000000L & l) == 0L) break; if (kind > 13) kind = 13; - jjCheckNAdd(17); + jjCheckNAdd(14); break; - case 17: + case 15: + if ((0x50002c0000000000L & l) == 0L) + break; + if (kind > 14) + kind = 14; + jjCheckNAdd(16); + break; + case 16: if ((0x53ff2c0000000000L & l) == 0L) break; - if (kind > 13) - kind = 13; - jjCheckNAdd(17); + if (kind > 14) + kind = 14; + jjCheckNAdd(16); break; + case 17: + if (curChar == 45) + jjCheckNAddTwoStates(18, 21); + break; + case 18: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(18, 19); + break; + case 19: + if (curChar != 46) + break; + if (kind > 8) + kind = 8; + jjCheckNAdd(20); + break; + case 20: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 8) + kind = 8; + jjCheckNAdd(20); + break; + case 21: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 8) + kind = 8; + jjCheckNAdd(21); + break; + case 22: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 8) + kind = 8; + jjCheckNAddStates(0, 3); + break; + case 23: + if ((0x3ff000000000000L & l) != 0L) + jjCheckNAddTwoStates(23, 24); + break; + case 24: + if (curChar != 46) + break; + if (kind > 8) + kind = 8; + jjCheckNAdd(25); + break; + case 25: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 8) + kind = 8; + jjCheckNAdd(25); + break; + case 26: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 8) + kind = 8; + jjCheckNAdd(26); + break; + case 27: + if ((0x3ff000000000000L & l) == 0L) + break; + if (kind > 9) + kind = 9; + jjCheckNAdd(27); + break; default : break; } } while(i != startsAt); @@ -289,93 +352,93 @@ { switch(jjstateSet[--i]) { - case 18: + case 28: if ((0x7fffffec7fffffeL & l) != 0L) { - if (kind > 13) - kind = 13; - jjCheckNAdd(17); + if (kind > 14) + kind = 14; + jjCheckNAdd(16); } if ((0x7fffffe87fffffeL & l) != 0L) { - if (kind > 12) - kind = 12; - jjCheckNAdd(15); + if (kind > 13) + kind = 13; + jjCheckNAdd(14); } break; case 0: if ((0x7fffffe40000000L & l) != 0L) { - if (kind > 13) - kind = 13; - jjCheckNAdd(17); + if (kind > 14) + kind = 14; + jjCheckNAdd(16); } else if ((0x87fffffeL & l) != 0L) { - if (kind > 11) - kind = 11; - jjCheckNAdd(13); + if (kind > 12) + kind = 12; + jjCheckNAdd(12); } if ((0x7fffffe00000000L & l) != 0L) { - if (kind > 12) - kind = 12; - jjCheckNAdd(15); + if (kind > 13) + kind = 13; + jjCheckNAdd(14); } break; case 1: - jjAddStates(0, 2); + jjAddStates(4, 6); break; - case 7: + case 6: if ((0xffffffffefffffffL & l) != 0L) - jjAddStates(3, 4); + jjAddStates(7, 8); break; - case 10: + case 9: if ((0xffffffffefffffffL & l) != 0L) - jjAddStates(5, 6); + jjAddStates(9, 10); break; - case 12: + case 11: if ((0x87fffffeL & l) == 0L) break; - if (kind > 11) - kind = 11; - jjCheckNAdd(13); - break; - case 13: - if ((0x7fffffe87fffffeL & l) == 0L) - break; - if (kind > 11) - kind = 11; - jjCheckNAdd(13); - break; - case 14: - if ((0x7fffffe00000000L & l) == 0L) - break; if (kind > 12) kind = 12; - jjCheckNAdd(15); + jjCheckNAdd(12); break; - case 15: + case 12: if ((0x7fffffe87fffffeL & l) == 0L) break; if (kind > 12) kind = 12; - jjCheckNAdd(15); + jjCheckNAdd(12); break; - case 16: - if ((0x7fffffe40000000L & l) == 0L) + case 13: + if ((0x7fffffe00000000L & l) == 0L) break; if (kind > 13) kind = 13; - jjCheckNAdd(17); + jjCheckNAdd(14); break; - case 17: - if ((0x7fffffec7fffffeL & l) == 0L) + case 14: + if ((0x7fffffe87fffffeL & l) == 0L) break; if (kind > 13) kind = 13; - jjCheckNAdd(17); + jjCheckNAdd(14); break; + case 15: + if ((0x7fffffe40000000L & l) == 0L) + break; + if (kind > 14) + kind = 14; + jjCheckNAdd(16); + break; + case 16: + if ((0x7fffffec7fffffeL & l) == 0L) + break; + if (kind > 14) + kind = 14; + jjCheckNAdd(16); + break; default : break; } } while(i != startsAt); @@ -390,15 +453,15 @@ { case 1: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(0, 2); + jjAddStates(4, 6); break; - case 7: + case 6: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(3, 4); + jjAddStates(7, 8); break; - case 10: + case 9: if ((jjbitVec0[i2] & l2) != 0L) - jjAddStates(5, 6); + jjAddStates(9, 10); break; default : break; } @@ -411,24 +474,24 @@ kind = 0x7fffffff; } ++curPos; - if ((i = jjnewStateCnt) == (startsAt = 18 - (jjnewStateCnt = startsAt))) + if ((i = jjnewStateCnt) == (startsAt = 28 - (jjnewStateCnt = startsAt))) return curPos; try { curChar = input_stream.readChar(); } catch(java.io.IOException e) { return curPos; } } } static final int[] jjnextStates = { - 1, 2, 4, 7, 8, 10, 11, + 23, 24, 26, 27, 1, 2, 4, 6, 7, 9, 10, }; public static final String[] jjstrLiteralImages = { "", null, null, null, null, null, null, "\156\157\164", null, null, null, null, -null, null, null, null, null, null, "\72\55", "\56", "\54", "\50", "\51", +null, null, null, null, null, null, null, "\72\55", "\56", "\54", "\50", "\51", "\133\135", "\133", "\135", "\174", }; public static final String[] lexStateNames = { "DEFAULT", }; static final long[] jjtoToken = { - 0x7fc3d81L, + 0xff87b81L, }; static final long[] jjtoSkip = { 0x7eL, @@ -437,8 +500,8 @@ 0x40L, }; protected SimpleCharStream input_stream; -private final int[] jjrounds = new int[18]; -private final int[] jjstateSet = new int[36]; +private final int[] jjrounds = new int[28]; +private final int[] jjstateSet = new int[56]; protected char curChar; public PrologParserTokenManager(SimpleCharStream stream){ if (SimpleCharStream.staticFlag) @@ -460,7 +523,7 @@ { int i; jjround = 0x80000001; - for (i = 18; i-- > 0;) + for (i = 28; i-- > 0;) jjrounds[i] = 0x80000000; } public void ReInit(SimpleCharStream stream, int lexState) Modified: trunk/src/dl-learner/org/dllearner/parser/prolog.jj =================================================================== --- trunk/src/dl-learner/org/dllearner/parser/prolog.jj 2008-02-08 09:04:00 UTC (rev 528) +++ trunk/src/dl-learner/org/dllearner/parser/prolog.jj 2008-02-08 10:25:23 UTC (rev 529) @@ -84,7 +84,12 @@ TOKEN : /* constants */ { - < NUMBER: (<DIGIT>)+> + < DOUBLE: + "-" (<DIGIT>)+ "." (<DIGIT>)* | + (<DIGIT>)+ "." (<DIGIT>)* | + "-" (<DIGIT>)+ | + (<DIGIT>)+ > + | < NUMBER: (<DIGIT>)+> | < #DIGIT: ["0" - "9"] > | < STRINGCONSTANT: ("'" (~["'","\\","\n","\r"])* "'" | "\"" (~["'","\\","\n","\r"])* "\"" ) > } @@ -161,16 +166,16 @@ Token f; java.util.ArrayList arguments = null; org.dllearner.prolog.Term l; + org.dllearner.prolog.Number n; }{ LOOKAHEAD(2) f = <IDENTIFIER> "(" arguments = termList() ")" { return new org.dllearner.prolog.Function(f.image, arguments); } | LOOKAHEAD(2) f = <IDENTIFIER> { return new org.dllearner.prolog.PrologConstant(f.image); } | v = <VAR> { return new org.dllearner.prolog.Variable(v.image); } - | v = <NUMBER> { return new org.dllearner.prolog.Number(v.image); } + | v = <DOUBLE> { return new org.dllearner.prolog.Number(v.image); } | v = <STRINGCONSTANT> { return new org.dllearner.prolog.StringConstant(v.image); } | l = list() { return l; } } - String prefixOp() : { Token f; }{ This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <jen...@us...> - 2008-02-08 09:04:02
|
Revision: 528 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=528&view=rev Author: jenslehmann Date: 2008-02-08 01:04:00 -0800 (Fri, 08 Feb 2008) Log Message: ----------- wrote Prolog parser test (found problems with negative numbers) Modified Paths: -------------- trunk/src/dl-learner/org/dllearner/utilities/Files.java Added Paths: ----------- trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java Added: trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java =================================================================== --- trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java (rev 0) +++ trunk/src/dl-learner/org/dllearner/examples/Carcinogenesis.java 2008-02-08 09:04:00 UTC (rev 528) @@ -0,0 +1,62 @@ +/** + * Copyright (C) 2007-2008, Jens Lehmann + * + * This file is part of DL-Learner. + * + * DL-Learner is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 3 of the License, or + * (at your option) any later version. + * + * DL-Learner is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see <http://www.gnu.org/licenses/>. + * + */ +package org.dllearner.examples; + +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; + +import org.dllearner.parser.ParseException; +import org.dllearner.parser.PrologParser; +import org.dllearner.utilities.Files; + +/** + * This class maps the carcinogenesis Prolog files to an OWL file. In a first + * step, a Prolog parser is used to read all files. The main step involves + * applying mapping Prolog clauses to OWL axioms through domain specific mapping + * rules. + * + * @author Jens Lehmann + * + */ +public class Carcinogenesis { + + /** + * @param args + */ + public static void main(String[] args) { + + try { + String prologFile = "examples/carcinogenesis/prolog/atoms.pl"; + File file = new File(prologFile); + String content = Files.readFile(file); + PrologParser pp = new PrologParser(); + pp.parseProgram(content); + } catch (ParseException e) { + e.printStackTrace(); + } catch (FileNotFoundException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + + } + +} Modified: trunk/src/dl-learner/org/dllearner/utilities/Files.java =================================================================== --- trunk/src/dl-learner/org/dllearner/utilities/Files.java 2008-02-08 08:59:26 UTC (rev 527) +++ trunk/src/dl-learner/org/dllearner/utilities/Files.java 2008-02-08 09:04:00 UTC (rev 528) @@ -19,10 +19,14 @@ */ package org.dllearner.utilities; +import java.io.BufferedReader; +import java.io.DataInputStream; import java.io.File; +import java.io.FileInputStream; import java.io.FileNotFoundException; import java.io.FileOutputStream; import java.io.IOException; +import java.io.InputStreamReader; /** * @author Jens Lehmann @@ -31,6 +35,26 @@ public class Files { /** + * Reads in a file. + * + * @param file + * The file to read. + * @return Content of the file. + */ + public static String readFile(File file) throws FileNotFoundException, IOException { + FileInputStream fstream = new FileInputStream(file); + DataInputStream in = new DataInputStream(fstream); + BufferedReader br = new BufferedReader(new InputStreamReader(in)); + String line; + StringBuffer content = new StringBuffer(); + while ((line = br.readLine()) != null) { + content.append(line); + } + in.close(); + return content.toString(); + } + + /** * Creates a new file with the given content or replaces the content of a * file. * @@ -74,7 +98,7 @@ e.printStackTrace(); } } - + public static void clearFile(File file) { createFile(file, ""); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |