From: <jen...@us...> - 2011-09-02 08:51:47
|
Revision: 3224 http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3224&view=rev Author: jenslehmann Date: 2011-09-02 08:51:39 +0000 (Fri, 02 Sep 2011) Log Message: ----------- work on config option documentation Modified Paths: -------------- trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java trunk/components-core/src/main/java/org/dllearner/core/config/ConfigHelper.java trunk/components-core/src/main/java/org/dllearner/core/config/ConfigOption.java trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown.java trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown2.java trunk/components-core/src/main/java/org/dllearner/refinementoperators/OperatorInverter.java trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiDown.java trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiUp.java trunk/components-core/src/main/java/org/dllearner/refinementoperators/RefinementOperator.java trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDown.java trunk/interfaces/doc/configOptions.html trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java trunk/scripts/src/main/java/org/dllearner/scripts/DocumentationHTMLGenerator.java Modified: trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -29,6 +29,7 @@ import org.apache.commons.collections15.BidiMap; import org.apache.commons.collections15.bidimap.DualHashBidiMap; +import org.dllearner.refinementoperators.RefinementOperator; /** * Component manager for the new (as of 2011) annotation based configuration @@ -241,14 +242,20 @@ if(LearningAlgorithm.class.isAssignableFrom(component)) { types.add(LearningAlgorithm.class); } + if(AxiomLearningAlgorithm.class.isAssignableFrom(component)) { + types.add(AxiomLearningAlgorithm.class); + } + if(ClassExpressionLearningAlgorithm.class.isAssignableFrom(component)) { + types.add(ClassExpressionLearningAlgorithm.class); + } if(LearningProblem.class.isAssignableFrom(component)) { types.add(LearningProblem.class); } if(ReasonerComponent.class.isAssignableFrom(component)) { types.add(ReasonerComponent.class); } - if(AxiomLearningAlgorithm.class.isAssignableFrom(component)) { - types.add(AxiomLearningAlgorithm.class); + if(RefinementOperator.class.isAssignableFrom(component)) { + types.add(RefinementOperator.class); } return types; } Modified: trunk/components-core/src/main/java/org/dllearner/core/config/ConfigHelper.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/core/config/ConfigHelper.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/components-core/src/main/java/org/dllearner/core/config/ConfigHelper.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -163,6 +163,23 @@ return options; } + /** + * Returns all config options for the given component. + * @param component + * @return + */ + public static Map<ConfigOption,Class<?>> getConfigOptionTypes(Class<? extends Component> component){ + Map<ConfigOption,Class<?>> optionTypes = new HashMap<ConfigOption,Class<?>>(); + Field[] fields = component.getDeclaredFields(); + for(Field f : fields){ + ConfigOption option = f.getAnnotation(ConfigOption.class); + if(option != null){ + optionTypes.put(option, f.getType()); + } + } + return optionTypes; + } + /* * returns the declared fields for the class and its superclass. */ Modified: trunk/components-core/src/main/java/org/dllearner/core/config/ConfigOption.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/core/config/ConfigOption.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/components-core/src/main/java/org/dllearner/core/config/ConfigOption.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -20,8 +20,10 @@ package org.dllearner.core.config; import java.beans.PropertyEditor; +import java.lang.annotation.ElementType; import java.lang.annotation.Retention; import java.lang.annotation.RetentionPolicy; +import java.lang.annotation.Target; /** * @@ -32,6 +34,7 @@ * @author Lorenz Bühmann */ @Retention(RetentionPolicy.RUNTIME) +@Target(ElementType.FIELD) public @interface ConfigOption { /** @@ -49,7 +52,9 @@ /** * An implementation of the Property Editor to use. * - * TODO: This might not be needed in the future. + * @deprecated We currently do not encourage specifying the + * property editor, because they might not be needed if we find a way + * of auto-detecting appropriate editors. * * @return */ @@ -57,7 +62,9 @@ Class<? extends PropertyEditor> propertyEditorClass() default PropertyEditor.class; /** - * Returns whether this option is required for initializing the component. + * Returns whether this option is required for initializing the component. + * + * Maybe soon deprecated: Please put @Required in the corresponding set method in addition. * @return True if the option is required and false otherwise. */ boolean required() default false; Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -35,6 +35,7 @@ import org.dllearner.algorithms.el.ELDescriptionNode; import org.dllearner.algorithms.el.ELDescriptionTree; import org.dllearner.core.AbstractReasonerComponent; +import org.dllearner.core.ComponentInitException; import org.dllearner.core.owl.Description; import org.dllearner.core.owl.Intersection; import org.dllearner.core.owl.NamedClass; @@ -293,6 +294,12 @@ return i; } + + @Override + public void init() throws ComponentInitException { + // TODO Auto-generated method stub + + } // private void computeMg(Description index) { // // compute the applicable properties if this has not been done yet Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown2.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown2.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/ELDown2.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -42,6 +42,7 @@ import org.dllearner.algorithms.el.TreeAndRoleSet; import org.dllearner.algorithms.el.TreeAndRoleSetComparator; import org.dllearner.core.AbstractReasonerComponent; +import org.dllearner.core.ComponentInitException; import org.dllearner.core.owl.Description; import org.dllearner.core.owl.Intersection; import org.dllearner.core.owl.NamedClass; @@ -602,5 +603,11 @@ } return false; } + + @Override + public void init() throws ComponentInitException { + // TODO Auto-generated method stub + + } } Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/OperatorInverter.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/refinementoperators/OperatorInverter.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/OperatorInverter.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -23,6 +23,7 @@ import java.util.Set; import java.util.TreeSet; +import org.dllearner.core.ComponentInitException; import org.dllearner.core.owl.Description; import org.dllearner.core.owl.Negation; import org.dllearner.utilities.owl.ConceptComparator; @@ -92,5 +93,11 @@ } return negatedDescription; } + + @Override + public void init() throws ComponentInitException { + // TODO Auto-generated method stub + + } } Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiDown.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiDown.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiDown.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -27,6 +27,7 @@ import java.util.TreeSet; import org.dllearner.core.AbstractReasonerComponent; +import org.dllearner.core.ComponentInitException; import org.dllearner.core.owl.ObjectAllRestriction; import org.dllearner.core.owl.NamedClass; import org.dllearner.core.owl.Nothing; @@ -262,4 +263,10 @@ throw new RuntimeException(); } + @Override + public void init() throws ComponentInitException { + // TODO Auto-generated method stub + + } + } Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiUp.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiUp.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/PsiUp.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -27,6 +27,7 @@ import java.util.TreeSet; import org.dllearner.core.AbstractReasonerComponent; +import org.dllearner.core.ComponentInitException; import org.dllearner.core.owl.ObjectAllRestriction; import org.dllearner.core.owl.NamedClass; import org.dllearner.core.owl.Nothing; @@ -238,4 +239,10 @@ throw new RuntimeException(); } + @Override + public void init() throws ComponentInitException { + // TODO Auto-generated method stub + + } + } Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/RefinementOperator.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/refinementoperators/RefinementOperator.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/RefinementOperator.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -22,6 +22,7 @@ import java.util.List; import java.util.Set; +import org.dllearner.core.Component; import org.dllearner.core.owl.Description; /** @@ -34,7 +35,7 @@ * @author Jens Lehmann * */ -public interface RefinementOperator { +public interface RefinementOperator extends Component { /** * Standard refinement operation. Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDown.java =================================================================== --- trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDown.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDown.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -30,6 +30,7 @@ import java.util.TreeSet; import org.dllearner.core.AbstractReasonerComponent; +import org.dllearner.core.ComponentInitException; import org.dllearner.core.owl.BooleanValueRestriction; import org.dllearner.core.owl.DatatypeProperty; import org.dllearner.core.owl.ObjectAllRestriction; @@ -680,4 +681,10 @@ return retSet; } + @Override + public void init() throws ComponentInitException { + // TODO Auto-generated method stub + + } + } Modified: trunk/interfaces/doc/configOptions.html =================================================================== --- trunk/interfaces/doc/configOptions.html 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/interfaces/doc/configOptions.html 2011-09-02 08:51:39 UTC (rev 3224) @@ -17,140 +17,214 @@ </head><body> <h1>DL-Learner Components</h1> <p>Filter components by implemented interfaces:</p> -<ul><a href="#" onClick="showAllCat()">show all</a><li><a href="#" onClick="showOnlyCat('KnowledgeSource')">KnowledgeSource</a></li><li><a href="#" onClick="showOnlyCat('ReasonerComponent')">ReasonerComponent</a></li><li><a href="#" onClick="showOnlyCat('LearningProblem')">LearningProblem</a></li><li><a href="#" onClick="showOnlyCat('LearningAlgorithm')">LearningAlgorithm</a><ul><li><a href="#" onClick="showOnlyCat('AxiomLearningAlgorithm')">AxiomLearningAlgorithm</a></li></ul></li></ul><p>Click on a component to get an overview on its configuration options.</p><ul> -<div class="LearningAlgorithm"><li><a href="#org.dllearner.algorithms.celoe.CELOE">CELOE</a></li></div> +<ul><a href="#" onClick="showAllCat()">show all</a><li><a href="#" onClick="showOnlyCat('KnowledgeSource')">KnowledgeSource</a></li><li><a href="#" onClick="showOnlyCat('ReasonerComponent')">ReasonerComponent</a></li><li><a href="#" onClick="showOnlyCat('LearningProblem')">LearningProblem</a></li><li><a href="#" onClick="showOnlyCat('LearningAlgorithm')">LearningAlgorithm</a><ul><li><a href="#" onClick="showOnlyCat('AxiomLearningAlgorithm')">AxiomLearningAlgorithm</a></li><li><a href="#" onClick="showOnlyCat('ClassExpressionLearningAlgorithm')">ClassExpressionLearningAlgorithm</a></li></ul></li><li><a href="#" onClick="showOnlyCat('RefinementOperator')">RefinementOperator</a></li><li><a href="#" onClick="showOnlyCat('OtherComponent')">other</a></li></ul><p>Click on a component to get an overview on its configuration options.</p><ul> +<div class="LearningAlgorithm ClassExpressionLearningAlgorithm"><li><a href="#org.dllearner.algorithms.BruteForceLearner">Brute Force Learner</a></li></div> +<div class="LearningAlgorithm ClassExpressionLearningAlgorithm"><li><a href="#org.dllearner.algorithms.celoe.CELOE">CELOE</a></li></div> +<div class="LearningProblem"><li><a href="#org.dllearner.learningproblems.ClassLearningProblem">ClassLearningProblem</a></li></div> +<div class="KnowledgeSource"><li><a href="#org.dllearner.kb.KBFile">KB file</a></li></div> +<div class="ReasonerComponent"><li><a href="#org.dllearner.reasoning.OWLAPIReasoner">OWL API Reasoner</a></li></div> +<div class="LearningAlgorithm ClassExpressionLearningAlgorithm"><li><a href="#org.dllearner.algorithms.ocel.OCEL">OWL Class Expression Learner</a></li></div> +<div class="KnowledgeSource"><li><a href="#org.dllearner.kb.OWLFile">OWL File</a></li></div> +<div class="LearningProblem"><li><a href="#org.dllearner.learningproblems.PosNegLPStandard">PosNegLPStandard</a></li></div> +<div class="LearningAlgorithm ClassExpressionLearningAlgorithm"><li><a href="#org.dllearner.algorithms.RandomGuesser">Random Guesser</a></li></div> +<div class="KnowledgeSource"><li><a href="#org.dllearner.kb.SparqlEndpointKS">SPARQL endpoint</a></li></div> +<div class="KnowledgeSource"><li><a href="#org.dllearner.kb.sparql.SparqlKnowledgeSource">SPARQL endpoint fragment</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.SubDataPropertyOfAxiomLearner">data subPropertyOf axiom learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.DataPropertyDomainAxiomLearner">dataproperty domain axiom learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.DataPropertyRangeAxiomLearner">dataproperty range learner</a></li></div> -<div class="LearningAlgorithm"><li><a href="#org.dllearner.algorithms.DisjointClassesLearner">disjoint classes learner</a></li></div> +<div class="LearningAlgorithm AxiomLearningAlgorithm ClassExpressionLearningAlgorithm"><li><a href="#org.dllearner.algorithms.DisjointClassesLearner">disjoint classes learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.DisjointDataPropertyAxiomLearner">disjoint dataproperty axiom learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.DisjointObjectPropertyAxiomLearner">disjoint objectproperty axiom learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.EquivalentDataPropertyAxiomLearner">equivalent dataproperty axiom learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.EquivalentObjectPropertyAxiomLearner">equivalent objectproperty axiom learner</a></li></div> +<div class="ReasonerComponent"><li><a href="#org.dllearner.reasoning.FastInstanceChecker">fast instance checker</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.FunctionalDataPropertyAxiomLearner">functional dataproperty axiom learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.FunctionalObjectPropertyAxiomLearner">functional objectproperty axiom learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.InverseFunctionalObjectPropertyAxiomLearner">inversefunctional objectproperty axiom learner</a></li></div> +<div class="OtherComponent"><li><a href="#org.dllearner.algorithms.ocel.MultiHeuristic">multiple criteria heuristic</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.SubObjectPropertyOfAxiomLearner">object subPropertyOf axiom learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.ObjectPropertyDomainAxiomLearner">objectproperty domain axiom learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.ObjectPropertyRangeAxiomLearner">objectproperty range learner</a></li></div> -<div class="LearningAlgorithm"><li><a href="#org.dllearner.algorithms.SimpleSubclassLearner">simple subclass learner</a></li></div> +<div class="LearningProblem"><li><a href="#org.dllearner.learningproblems.PosOnlyLP">positive only learning problem</a></li></div> +<div class="RefinementOperator"><li><a href="#org.dllearner.refinementoperators.RhoDRDown">rho refinement operator</a></li></div> +<div class="LearningAlgorithm AxiomLearningAlgorithm ClassExpressionLearningAlgorithm"><li><a href="#org.dllearner.algorithms.SimpleSubclassLearner">simple subclass learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.SymmetricObjectPropertyAxiomLearner">symmetric objectproperty axiom learner</a></li></div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><li><a href="#org.dllearner.algorithms.properties.TransitiveObjectPropertyAxiomLearner">transitive objectproperty axiom learner</a></li></div> </ul> -<div class="LearningAlgorithm"><a name="org.dllearner.algorithms.celoe.CELOE"><h2>CELOE</h2></a> -<p>short name: celoe<br />version: 1.0<br />implements: LearningAlgorithm<br />description: CELOE is an adapted and extended version of the OCEL algorithm applied for the ontology engineering use case. See http://jens-lehmann.org/files/2011/celoe.pdf for reference.<br /></p>This component does not have configuration options.</div> +<div class="LearningAlgorithm ClassExpressionLearningAlgorithm"><a name="org.dllearner.algorithms.BruteForceLearner"><h2>Brute Force Learner</h2></a> +<p>short name: bruteForce<br />version: 0.8<br />implements: LearningAlgorithm, ClassExpressionLearningAlgorithm<br /></p>This component does not have configuration options.</div> +<div class="LearningAlgorithm ClassExpressionLearningAlgorithm"><a name="org.dllearner.algorithms.celoe.CELOE"><h2>CELOE</h2></a> +<p>short name: celoe<br />version: 1.0<br />implements: LearningAlgorithm, ClassExpressionLearningAlgorithm<br />description: CELOE is an adapted and extended version of the OCEL algorithm applied for the ontology engineering use case. See http://jens-lehmann.org/files/2011/celoe.pdf for reference.<br /></p>This component does not have configuration options.</div> +<div class="LearningProblem"><a name="org.dllearner.learningproblems.ClassLearningProblem"><h2>ClassLearningProblem</h2></a> +<p>short name: clp<br />version: 0.6<br />implements: LearningProblem<br /></p>This component does not have configuration options.</div> +<div class="KnowledgeSource"><a name="org.dllearner.kb.KBFile"><h2>KB file</h2></a> +<p>short name: kbfile<br />version: 0.8<br />implements: KnowledgeSource<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> +<tr><td>url</td><td>URL pointer to the KB file</td><td> String</td><td></td><td> false</td></tr> +</tbody></table> +</div> +<div class="ReasonerComponent"><a name="org.dllearner.reasoning.OWLAPIReasoner"><h2>OWL API Reasoner</h2></a> +<p>short name: oar<br />version: 0.8<br />implements: ReasonerComponent<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> +<tr><td>owlLinkURL</td><td>The URL to the owl server</td><td> String</td><td></td><td> false</td></tr> +<tr><td>reasonerType</td><td>The name of the OWL APIReasoner to use {"fact", "hermit", "owllink", "pellet"}</td><td> String</td><td>pellet</td><td> false</td></tr> +</tbody></table> +</div> +<div class="LearningAlgorithm ClassExpressionLearningAlgorithm"><a name="org.dllearner.algorithms.ocel.OCEL"><h2>OWL Class Expression Learner</h2></a> +<p>short name: ocel<br />version: 1.2<br />implements: LearningAlgorithm, ClassExpressionLearningAlgorithm<br /></p>This component does not have configuration options.</div> +<div class="KnowledgeSource"><a name="org.dllearner.kb.OWLFile"><h2>OWL File</h2></a> +<p>short name: owlfile<br />version: 0.9<br />implements: KnowledgeSource<br /></p>This component does not have configuration options.</div> +<div class="LearningProblem"><a name="org.dllearner.learningproblems.PosNegLPStandard"><h2>PosNegLPStandard</h2></a> +<p>short name: posNegStandard<br />version: 0.8<br />implements: LearningProblem<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> +<tr><td>accuracyMethod</td><td>Specifies, which method/function to use for computing accuracy.</td><td> String</td><td>predacc</td><td> false</td></tr> +<tr><td>approxDelta</td><td>The Approximate Delta</td><td> double</td><td>0.05</td><td> false</td></tr> +<tr><td>useApproximations</td><td>Use Approximations</td><td> boolean</td><td>false</td><td> false</td></tr> +</tbody></table> +</div> +<div class="LearningAlgorithm ClassExpressionLearningAlgorithm"><a name="org.dllearner.algorithms.RandomGuesser"><h2>Random Guesser</h2></a> +<p>short name: randomGuesser<br />version: 0.8<br />implements: LearningAlgorithm, ClassExpressionLearningAlgorithm<br /></p>This component does not have configuration options.</div> +<div class="KnowledgeSource"><a name="org.dllearner.kb.SparqlEndpointKS"><h2>SPARQL endpoint</h2></a> +<p>short name: sparql<br />version: 0.2<br />implements: KnowledgeSource<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> +<tr><td>namedGraphs</td><td>no description available</td><td> List</td><td>[]</td><td> false</td></tr> +<tr><td>url</td><td>no description available</td><td> URL</td><td></td><td> true</td></tr> +<tr><td>defaultGraphs</td><td>no description available</td><td> List</td><td>[]</td><td> false</td></tr> +</tbody></table> +</div> +<div class="KnowledgeSource"><a name="org.dllearner.kb.sparql.SparqlKnowledgeSource"><h2>SPARQL endpoint fragment</h2></a> +<p>short name: sparqlfrag<br />version: 0.5<br />implements: KnowledgeSource<br /></p>This component does not have configuration options.</div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.SubDataPropertyOfAxiomLearner"><h2>data subPropertyOf axiom learner</h2></a> <p>short name: dplsubprop<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> -<tr><td>propertyToDescribe</td><td></td><td> DataProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>propertyToDescribe</td><td></td><td> DatatypeProperty</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.DataPropertyDomainAxiomLearner"><h2>dataproperty domain axiom learner</h2></a> <p>short name: dpldomain<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> -<tr><td>propertyToDescribe</td><td></td><td> DataProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>propertyToDescribe</td><td></td><td> DatatypeProperty</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.DataPropertyRangeAxiomLearner"><h2>dataproperty range learner</h2></a> <p>short name: dblrange<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> -<tr><td>propertyToDescribe</td><td></td><td> DataProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>propertyToDescribe</td><td></td><td> DatatypeProperty</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> -<div class="LearningAlgorithm"><a name="org.dllearner.algorithms.DisjointClassesLearner"><h2>disjoint classes learner</h2></a> -<p>short name: cldisjoint<br />version: 0.1<br />implements: LearningAlgorithm<br /></p>This component does not have configuration options.</div> +<div class="LearningAlgorithm AxiomLearningAlgorithm ClassExpressionLearningAlgorithm"><a name="org.dllearner.algorithms.DisjointClassesLearner"><h2>disjoint classes learner</h2></a> +<p>short name: cldisjoint<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm, ClassExpressionLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> +<tr><td>classToDescribe</td><td></td><td> NamedClass</td><td></td><td> false</td></tr> +</tbody></table> +</div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.DisjointDataPropertyAxiomLearner"><h2>disjoint dataproperty axiom learner</h2></a> <p>short name: dpldisjoint<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> -<tr><td>propertyToDescribe</td><td></td><td> DataProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>propertyToDescribe</td><td></td><td> DatatypeProperty</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.DisjointObjectPropertyAxiomLearner"><h2>disjoint objectproperty axiom learner</h2></a> <p>short name: opldisjoint<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> <tr><td>propertyToDescribe</td><td></td><td> ObjectProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.EquivalentDataPropertyAxiomLearner"><h2>equivalent dataproperty axiom learner</h2></a> <p>short name: dplequiv<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> -<tr><td>propertyToDescribe</td><td></td><td> DataProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>propertyToDescribe</td><td></td><td> DatatypeProperty</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.EquivalentObjectPropertyAxiomLearner"><h2>equivalent objectproperty axiom learner</h2></a> <p>short name: oplequiv<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> <tr><td>propertyToDescribe</td><td></td><td> ObjectProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> +<div class="ReasonerComponent"><a name="org.dllearner.reasoning.FastInstanceChecker"><h2>fast instance checker</h2></a> +<p>short name: fic<br />version: 0.9<br />implements: ReasonerComponent<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> +<tr><td>forAllRetrievalSemantics</td><td>This option controls how to interpret the all quantifier in forall r.C. The standard option isto return all those which do not have an r-filler not in C. The domain semantics is to use thosewhich are in the domain of r and do not have an r-filler not in C. The forallExists semantics is touse those which have at least one r-filler and do not have an r-filler not in C.</td><td> String</td><td>standard</td><td> false</td></tr> +<tr><td>defaultNegation</td><td>Whether to use default negation, i.e. an instance not being in a class means that it is in the negation of the class.</td><td> boolean</td><td>true</td><td> false</td></tr> +</tbody></table> +</div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.FunctionalDataPropertyAxiomLearner"><h2>functional dataproperty axiom learner</h2></a> <p>short name: dplfunc<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> -<tr><td>propertyToDescribe</td><td></td><td> DataProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>propertyToDescribe</td><td></td><td> DatatypeProperty</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.FunctionalObjectPropertyAxiomLearner"><h2>functional objectproperty axiom learner</h2></a> <p>short name: oplfunc<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> <tr><td>propertyToDescribe</td><td></td><td> ObjectProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.InverseFunctionalObjectPropertyAxiomLearner"><h2>inversefunctional objectproperty axiom learner</h2></a> <p>short name: oplinvfunc<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> <tr><td>propertyToDescribe</td><td></td><td> ObjectProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> +<div class="OtherComponent"><a name="org.dllearner.algorithms.ocel.MultiHeuristic"><h2>multiple criteria heuristic</h2></a> +<p>short name: multiheuristic<br />version: 0.7<br />implements: OtherComponent<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> +<tr><td>negativeWeight</td><td>no description available</td><td> double</td><td>1.0</td><td> false</td></tr> +<tr><td>gainBonusFactor</td><td>no description available</td><td> double</td><td>0.5</td><td> false</td></tr> +<tr><td>startNodeBonus</td><td>no description available</td><td> double</td><td>0.1</td><td> false</td></tr> +<tr><td>negationPenalty</td><td>no description available</td><td> int</td><td>0</td><td> false</td></tr> +<tr><td>nodeChildPenalty</td><td>no description available</td><td> double</td><td>0.0001</td><td> false</td></tr> +<tr><td>expansionPenaltyFactor</td><td>no description available</td><td> double</td><td>0.02</td><td> false</td></tr> +</tbody></table> +</div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.SubObjectPropertyOfAxiomLearner"><h2>object subPropertyOf axiom learner</h2></a> <p>short name: oplsubprop<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> <tr><td>propertyToDescribe</td><td></td><td> ObjectProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.ObjectPropertyDomainAxiomLearner"><h2>objectproperty domain axiom learner</h2></a> <p>short name: opldomain<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> <tr><td>propertyToDescribe</td><td></td><td> ObjectProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.ObjectPropertyRangeAxiomLearner"><h2>objectproperty range learner</h2></a> <p>short name: oplrange<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> <tr><td>propertyToDescribe</td><td></td><td> ObjectProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> -<div class="LearningAlgorithm"><a name="org.dllearner.algorithms.SimpleSubclassLearner"><h2>simple subclass learner</h2></a> -<p>short name: clsub<br />version: 0.1<br />implements: LearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> +<div class="LearningProblem"><a name="org.dllearner.learningproblems.PosOnlyLP"><h2>positive only learning problem</h2></a> +<p>short name: posonlylp<br />version: 0.6<br />implements: LearningProblem<br /></p>This component does not have configuration options.</div> +<div class="RefinementOperator"><a name="org.dllearner.refinementoperators.RhoDRDown"><h2>rho refinement operator</h2></a> +<p>short name: rho<br />version: 0.8<br />implements: RefinementOperator<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> +<tr><td>instanceBasedDisjoints</td><td>no description available</td><td> boolean</td><td>true</td><td> false</td></tr> +<tr><td>useAllConstructor</td><td>no description available</td><td> boolean</td><td>true</td><td> false</td></tr> +<tr><td>disjointChecks</td><td>no description available</td><td> boolean</td><td>true</td><td> false</td></tr> +<tr><td>applyExistsFilter</td><td>no description available</td><td> boolean</td><td>true</td><td> false</td></tr> +<tr><td>useHasValueConstructor</td><td>no description available</td><td> boolean</td><td>false</td><td> false</td></tr> +<tr><td>applyAllFilter</td><td>no description available</td><td> boolean</td><td>true</td><td> false</td></tr> +<tr><td>useStringDatatypes</td><td>no description available</td><td> boolean</td><td>false</td><td> false</td></tr> +<tr><td>useBooleanDatatypes</td><td>no description available</td><td> boolean</td><td>true</td><td> false</td></tr> +<tr><td>useDoubleDatatypes</td><td>no description available</td><td> boolean</td><td>true</td><td> false</td></tr> +<tr><td>useExistsConstructor</td><td>no description available</td><td> boolean</td><td>true</td><td> false</td></tr> +<tr><td>dropDisjuncts</td><td>no description available</td><td> boolean</td><td>false</td><td> false</td></tr> +<tr><td>useNegation</td><td>no description available</td><td> boolean</td><td>true</td><td> false</td></tr> +<tr><td>useCardinalityRestrictions</td><td>no description available</td><td> boolean</td><td>true</td><td> false</td></tr> +</tbody></table> +</div> +<div class="LearningAlgorithm AxiomLearningAlgorithm ClassExpressionLearningAlgorithm"><a name="org.dllearner.algorithms.SimpleSubclassLearner"><h2>simple subclass learner</h2></a> +<p>short name: clsub<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm, ClassExpressionLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> <tr><td>classToDescribe</td><td></td><td> NamedClass</td><td></td><td> true</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td>10</td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.SymmetricObjectPropertyAxiomLearner"><h2>symmetric objectproperty axiom learner</h2></a> <p>short name: oplsymm<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> <tr><td>propertyToDescribe</td><td></td><td> ObjectProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> <div class="LearningAlgorithm AxiomLearningAlgorithm"><a name="org.dllearner.algorithms.properties.TransitiveObjectPropertyAxiomLearner"><h2>transitive objectproperty axiom learner</h2></a> <p>short name: opltrans<br />version: 0.1<br />implements: LearningAlgorithm, AxiomLearningAlgorithm<br /></p><table id="hor-minimalist-a"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody> <tr><td>propertyToDescribe</td><td></td><td> ObjectProperty</td><td></td><td> false</td></tr> -<tr><td>maxExecutionTimeInSeconds</td><td></td><td> Integer</td><td></td><td> false</td></tr> -<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> Integer</td><td></td><td> false</td></tr> +<tr><td>maxFetchedRows</td><td>The maximum number of rows fetched from the endpoint to approximate the result.</td><td> int</td><td></td><td> false</td></tr> </tbody></table> </div> </body></html> \ No newline at end of file Modified: trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java =================================================================== --- trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -254,8 +254,7 @@ SPARQLTasks st = new SPARQLTasks(se); if(resource == null) { - System.out.println("TEST"); - + // loop over all entities and call appropriate algorithms Set<NamedClass> classes = st.getAllClasses(); int entities = 0; Modified: trunk/scripts/src/main/java/org/dllearner/scripts/DocumentationHTMLGenerator.java =================================================================== --- trunk/scripts/src/main/java/org/dllearner/scripts/DocumentationHTMLGenerator.java 2011-09-02 08:50:29 UTC (rev 3223) +++ trunk/scripts/src/main/java/org/dllearner/scripts/DocumentationHTMLGenerator.java 2011-09-02 08:51:39 UTC (rev 3224) @@ -70,7 +70,10 @@ sb.append("<li><a href=\"#\" onClick=\"showOnlyCat('ReasonerComponent')\">ReasonerComponent</a></li>"); sb.append("<li><a href=\"#\" onClick=\"showOnlyCat('LearningProblem')\">LearningProblem</a></li>"); sb.append("<li><a href=\"#\" onClick=\"showOnlyCat('LearningAlgorithm')\">LearningAlgorithm</a>"); - sb.append("<ul><li><a href=\"#\" onClick=\"showOnlyCat('AxiomLearningAlgorithm')\">AxiomLearningAlgorithm</a></li></ul></li>"); + sb.append("<ul><li><a href=\"#\" onClick=\"showOnlyCat('AxiomLearningAlgorithm')\">AxiomLearningAlgorithm</a></li>"); + sb.append("<li><a href=\"#\" onClick=\"showOnlyCat('ClassExpressionLearningAlgorithm')\">ClassExpressionLearningAlgorithm</a></li></ul></li>"); + sb.append("<li><a href=\"#\" onClick=\"showOnlyCat('RefinementOperator')\">RefinementOperator</a></li>"); + sb.append("<li><a href=\"#\" onClick=\"showOnlyCat('OtherComponent')\">other</a></li>"); sb.append("</ul>"); // general explanations @@ -100,13 +103,14 @@ sb.append("</p>"); // generate table for configuration options - List<ConfigOption> options = ConfigHelper.getConfigOptions(comp); + Map<ConfigOption,Class<?>> options = ConfigHelper.getConfigOptionTypes(comp); if(options.isEmpty()) { sb.append("This component does not have configuration options."); } else { sb.append("<table id=\"hor-minimalist-a\"><thead><tr><th>option name</th><th>description</th><th>type</th><th>default value</th><th>required?</th></tr></thead><tbody>\n"); - for(ConfigOption option : options) { - sb.append("<tr><td>" + option.name() + "</td><td>" + option.description() + "</td><td> " + getOptionType(option) + "</td><td>" + option.defaultValue() + "</td><td> " + option.required() + "</td></tr>\n"); + for(Entry<ConfigOption,Class<?>> entry : options.entrySet()) { + ConfigOption option = entry.getKey(); + sb.append("<tr><td>" + option.name() + "</td><td>" + option.description() + "</td><td> " + entry.getValue().getSimpleName() + "</td><td>" + option.defaultValue() + "</td><td> " + option.required() + "</td></tr>\n"); } sb.append("</tbody></table>\n"); } @@ -147,10 +151,10 @@ // this is a hack, because we just assume that every PropertyEditor is named // as TypeEditor (e.g. ObjectPropertyEditor); however that hack does not too much harm here - private static String getOptionType(ConfigOption option) { - String name = option.propertyEditorClass().getSimpleName(); - return name.substring(0, name.length()-6); - } +// private static String getOptionType(ConfigOption option) { +// String name = option.propertyEditorClass().getSimpleName(); +// return name.substring(0, name.length()-6); +// } private static String getCoreTypes(Class<? extends Component> comp) { List<Class<? extends Component>> types = AnnComponentManager.getCoreComponentTypes(comp); @@ -158,7 +162,12 @@ for(Class<?extends Component> type : types) { str += " " + type.getSimpleName(); } - return str.substring(1); + // not every component belongs to one of the core types + if(str.length()==0) { + return "OtherComponent"; + } else { + return str.substring(1); + } } public static void main(String[] args) { This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |