Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1172] trunk/src/dl-learner/org/dllearner
|
From: <jen...@us...> - 2008-09-08 09:24:46
|
Revision: 1172
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1172&view=rev
Author: jenslehmann
Date: 2008-09-08 09:24:41 +0000 (Mon, 08 Sep 2008)
Log Message:
-----------
Some changes and documentation for component config options.
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java
trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java
trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
trunk/src/dl-learner/org/dllearner/core/config/BooleanConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/CommonConfigOptions.java
trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/DoubleConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/IntegerConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/StringConfigOption.java
trunk/src/dl-learner/org/dllearner/core/config/StringSetConfigOption.java
trunk/src/dl-learner/org/dllearner/kb/KBFile.java
trunk/src/dl-learner/org/dllearner/kb/OWLFile.java
trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java
trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyLP.java
trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java
trunk/src/dl-learner/org/dllearner/test/junit/ExampleTests.java
Modified: trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/algorithms/BruteForceLearner.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -36,7 +36,6 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.IntegerConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.config.ConfigOption.Tags;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Intersection;
import org.dllearner.core.owl.NamedClass;
@@ -92,7 +91,7 @@
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
- options.add(new IntegerConfigOption("maxLength", "maximum length of generated concepts", 7, Tags.NORMAL));
+ options.add(new IntegerConfigOption("maxLength", "maximum length of generated concepts", 7));
options.add(CommonConfigOptions.getReturnType());
return options;
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/algorithms/DBpediaNavigationSuggestor.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -36,7 +36,6 @@
import org.dllearner.core.config.DoubleConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.config.ConfigOption.Tags;
import org.dllearner.core.owl.Description;
import org.dllearner.learningproblems.PosNegDefinitionLP;
import org.dllearner.learningproblems.PosNegLP;
@@ -120,7 +119,7 @@
options.add(CommonConfigOptions.guaranteeXgoodDescriptions());
options.add(CommonConfigOptions.getLogLevel());
//TODO make a commonconfig Option out of this
- DoubleConfigOption noisePercentage = new DoubleConfigOption("noisePercentage", "the (approximated) percentage of noise within the examples",0.0,Tags.NORMAL);
+ DoubleConfigOption noisePercentage = new DoubleConfigOption("noisePercentage", "the (approximated) percentage of noise within the examples",0.0);
noisePercentage.setLowerLimit(0);
noisePercentage.setUpperLimit(100);
options.add(noisePercentage);
Modified: trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/algorithms/RandomGuesser.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -34,7 +34,6 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.IntegerConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
-import org.dllearner.core.config.ConfigOption.Tags;
import org.dllearner.core.owl.Description;
public class RandomGuesser extends LearningAlgorithm {
@@ -66,8 +65,8 @@
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
- options.add(new IntegerConfigOption("numberOfTrees", "number of randomly generated concepts/trees", 5, Tags.NORMAL));
- options.add(new IntegerConfigOption("maxDepth", "maximum depth of generated concepts/trees", 5, Tags.NORMAL));
+ options.add(new IntegerConfigOption("numberOfTrees", "number of randomly generated concepts/trees", 5));
+ options.add(new IntegerConfigOption("maxDepth", "maximum depth of generated concepts/trees", 5));
return options;
}
Modified: trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/algorithms/refexamples/ExampleBasedROLComponent.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -44,7 +44,6 @@
import org.dllearner.core.config.IntegerConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.config.ConfigOption.Tags;
import org.dllearner.core.configuration.ExampleBasedROLComponentConfigurator;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.NamedClass;
@@ -204,10 +203,10 @@
options.add(CommonConfigOptions.minExecutionTimeInSeconds());
options.add(CommonConfigOptions.guaranteeXgoodDescriptions());
options.add(CommonConfigOptions.getLogLevel());
- options.add(new BooleanConfigOption("usePropernessChecks", "specifies whether to check for equivalence (i.e. discard equivalent refinements)",usePropernessChecksDefault,Tags.NORMAL));
+ options.add(new BooleanConfigOption("usePropernessChecks", "specifies whether to check for equivalence (i.e. discard equivalent refinements)",usePropernessChecksDefault));
options.add(new IntegerConfigOption("maxPosOnlyExpansion", "specifies how often a node in the search tree of a posonly learning problem needs to be expanded before it is" +
- " considered as solution candidate",maxPosOnlyExpansionDefault,Tags.NORMAL));
- DoubleConfigOption noisePercentage = new DoubleConfigOption("noisePercentage", "the (approximated) percentage of noise within the examples",noisePercentageDefault,Tags.NORMAL);
+ " considered as solution candidate",maxPosOnlyExpansionDefault));
+ DoubleConfigOption noisePercentage = new DoubleConfigOption("noisePercentage", "the (approximated) percentage of noise within the examples",noisePercentageDefault);
noisePercentage.setLowerLimit(0);
noisePercentage.setUpperLimit(100);
options.add(noisePercentage);
Modified: trunk/src/dl-learner/org/dllearner/core/config/BooleanConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/BooleanConfigOption.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/core/config/BooleanConfigOption.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -26,13 +26,6 @@
*/
public class BooleanConfigOption extends ConfigOption<Boolean> {
-
-
- public BooleanConfigOption(String name, String description, Boolean defaultValue, Tags... tags) {
- super(name, description, defaultValue, tags);
-
- }
-
public BooleanConfigOption(String name, String description, Boolean defaultValue) {
super(name, description, defaultValue);
Modified: trunk/src/dl-learner/org/dllearner/core/config/CommonConfigOptions.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/CommonConfigOptions.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/core/config/CommonConfigOptions.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -19,7 +19,6 @@
*/
package org.dllearner.core.config;
-import org.dllearner.core.config.ConfigOption.Tags;
/**
@@ -59,7 +58,7 @@
}
public static DoubleConfigOption getPercentPerLenghtUnitOption(double defaultValue) {
- DoubleConfigOption option = new DoubleConfigOption("percentPerLenghtUnit", "describes the reduction in classification accuracy in percent one is willing to accept for reducing the length of the concept by one", defaultValue, Tags.NORMAL);
+ DoubleConfigOption option = new DoubleConfigOption("percentPerLenghtUnit", "describes the reduction in classification accuracy in percent one is willing to accept for reducing the length of the concept by one", defaultValue);
option.setLowerLimit(0.0);
option.setUpperLimit(1.0);
return option;
Modified: trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/core/config/ConfigOption.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2007, Jens Lehmann
+ * Copyright (C) 2007-2008, Jens Lehmann
*
* This file is part of DL-Learner.
*
@@ -29,57 +29,79 @@
* Note: Currently, handling the type of a configuration option is not
* straightforward to implement, because Java Generics information is erased at
* runtime. This will be fixed in Java 7, in particular JSR 308, which is due at
- * approx. the end of 2008.
+ * approx. the beginning of 2009.
*
+ * @param <T> The type of the config option, e.g. Integer, String etc.
* @author Jens Lehmann
*
*/
public abstract class ConfigOption<T> {
+ /**
+ * Name of this option.
+ */
protected String name;
+ /**
+ * A short description explaining the effect of this option.
+ */
protected String description;
+ /**
+ * The default value of this option.
+ */
protected T defaultValue;
- public enum Tags {NORMAL, MANDATORY, REINIT}
+ /**
+ * Specifies whether this option is mandatory for a component,
+ * e.g. if a value other than the default value needs to be given.
+ */
+ protected boolean mandatory = false;
- protected boolean mandatory = false;
- protected boolean reinitNecessary = false;
+ /**
+ * Specifies whether a change of the value of the option requires
+ * running the init method of the component again. For some options
+ * (e.g. url of an OWL file component) a new run of init is needed,
+ * while others can be changed without the need to re-init the
+ * component.
+ */
+ protected boolean requiresInit = false;
+ /**
+ * Calls this(name, description, null, false, true).
+ * @param name Name of config option.
+ * @param description Explanation of option.
+ */
public ConfigOption(String name, String description) {
- this(name, description, null);
+ this(name, description, null, false, true);
}
- public ConfigOption(String name, String description, T defaultValue, Tags ...tags ) {
+ /**
+ * Calls this(name, description, defaultValue, false, true).
+ * @param name Name of config option.
+ * @param description Explanation of option.
+ * @param defaultValue Standard value of option.
+ */
+ public ConfigOption(String name, String description, T defaultValue) {
+ this(name, description, defaultValue, false, true);
+ }
+
+ /**
+ * Constructs a component configuration option.
+ * @param name Name of config option.
+ * @param description Explanation of option.
+ * @param defaultValue Standard value of option.
+ * @param mandatory Specifies whether assigning a value to the option is required.
+ * @param requiresInit Says whether init() has to be called again when the option is changed.
+ */
+ public ConfigOption(String name, String description, T defaultValue, boolean mandatory, boolean requiresInit) {
this.name = name;
this.description = description;
this.defaultValue = defaultValue;
- boolean normal = false;
- for(Tags t:tags){
- if (t.equals(Tags.NORMAL)){
- normal =true;
- }
- }
- for(Tags t:tags){
- if(normal){
- ;//DO Nothing
- }
- else if (t.equals(Tags.MANDATORY)){
- this.mandatory = true;
- } else if (t.equals(Tags.REINIT)){
- this.reinitNecessary = true;
- }
- }
-
+ this.mandatory = mandatory;
+ this.requiresInit = requiresInit;
}
- public ConfigOption(String name, String description, T defaultValue ) {
- this.name = name;
- this.description = description;
- this.defaultValue = defaultValue;
- }
-
public String getName() {
return name;
}
@@ -114,8 +136,8 @@
* says, if this option requires that the componnent is reinitialized with init()
* @return
*/
- public boolean isReinitNecessary() {
- return reinitNecessary;
+ public boolean requiresInit() {
+ return requiresInit;
}
/**
@@ -146,7 +168,27 @@
return getClass().toString();
}
+ /**
+ * @param defaultValue the defaultValue to set
+ */
+ public void setDefaultValue(T defaultValue) {
+ this.defaultValue = defaultValue;
+ }
+
+ /**
+ * @param mandatory the mandatory to set
+ */
+ public void setMandatory(boolean mandatory) {
+ this.mandatory = mandatory;
+ }
+ /**
+ * @param requiresInit the requiresInit to set
+ */
+ public void setRequiresInit(boolean requiresInit) {
+ this.requiresInit = requiresInit;
+ }
+
@Override
public String toString() {
return "option name: " + name + "\ndescription: " + description + "\nvalues: "
Modified: trunk/src/dl-learner/org/dllearner/core/config/DoubleConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/DoubleConfigOption.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/core/config/DoubleConfigOption.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -32,14 +32,6 @@
private double lowerLimit = Double.MIN_VALUE;
private double upperLimit = Double.MAX_VALUE;
-
-
-
- public DoubleConfigOption(String name, String description, Double defaultValue, Tags... tags) {
- super(name, description, defaultValue, tags);
-
- }
-
public DoubleConfigOption(String name, String description, Double defaultValue) {
super(name, description, defaultValue);
Modified: trunk/src/dl-learner/org/dllearner/core/config/IntegerConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/IntegerConfigOption.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/core/config/IntegerConfigOption.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -32,13 +32,6 @@
private int lowerLimit = Integer.MIN_VALUE;
private int upperLimit = Integer.MAX_VALUE;
-
-
- public IntegerConfigOption(String name, String description, Integer defaultValue, Tags... tags) {
- super(name, description, defaultValue, tags);
-
- }
-
public IntegerConfigOption(String name, String description, Integer defaultValue) {
super(name, description, defaultValue);
Modified: trunk/src/dl-learner/org/dllearner/core/config/StringConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/StringConfigOption.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/core/config/StringConfigOption.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -34,23 +34,18 @@
private Set<String> allowedValues = new TreeSet<String>();
-
-
-
-
- public StringConfigOption(String name, String description, String defaultValue, Tags... tags) {
- super(name, description, defaultValue, tags);
+ public StringConfigOption(String name, String description) {
+ super(name, description);
- }
-
+ }
+
public StringConfigOption(String name, String description, String defaultValue) {
super(name, description, defaultValue);
}
- public StringConfigOption(String name, String description) {
- super(name, description);
-
+ public StringConfigOption(String name, String description, String defaultValue, boolean mandatory, boolean requiresInit) {
+ super(name, description, defaultValue, mandatory, requiresInit);
}
/* (non-Javadoc)
Modified: trunk/src/dl-learner/org/dllearner/core/config/StringSetConfigOption.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/config/StringSetConfigOption.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/core/config/StringSetConfigOption.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -1,5 +1,5 @@
/**
- * Copyright (C) 2007, Jens Lehmann
+ * Copyright (C) 2007-2008, Jens Lehmann
*
* This file is part of DL-Learner.
*
@@ -31,22 +31,19 @@
*/
public class StringSetConfigOption extends ConfigOption<Set<String>> {
-
-
- public StringSetConfigOption(String name, String description, Set<String> defaultValue, Tags... tags) {
- super(name, description, defaultValue, tags);
+ public StringSetConfigOption(String name, String description) {
+ super(name, description);
- }
-
+ }
+
public StringSetConfigOption(String name, String description, Set<String> defaultValue) {
super(name, description, defaultValue);
}
- public StringSetConfigOption(String name, String description) {
- super(name, description);
-
- }
+ public StringSetConfigOption(String name, String description, Set<String> defaultValue, boolean mandatory, boolean requiresInit) {
+ super(name, description, defaultValue, mandatory, requiresInit);
+ }
/* (non-Javadoc)
* @see org.dllearner.core.config.ConfigOption#getValueTypeAsJavaString()
Modified: trunk/src/dl-learner/org/dllearner/kb/KBFile.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/KBFile.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/kb/KBFile.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -33,7 +33,6 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.config.ConfigOption.Tags;
import org.dllearner.core.configuration.KBFileConfigurator;
import org.dllearner.core.owl.KB;
import org.dllearner.parser.KBParser;
@@ -93,8 +92,8 @@
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
- options.add(new StringConfigOption("filename", "pointer to the KB file on local file system",null, Tags.MANDATORY, Tags.REINIT));
- options.add(new StringConfigOption("url", "URL pointer to the KB file",null, Tags.REINIT));
+ options.add(new StringConfigOption("filename", "pointer to the KB file on local file system",null, true, true));
+ options.add(new StringConfigOption("url", "URL pointer to the KB file",null, false, true));
return options;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/OWLFile.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/OWLFile.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/kb/OWLFile.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -33,7 +33,6 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.config.ConfigOption.Tags;
import org.dllearner.core.configuration.OWLFileConfigurator;
import org.dllearner.core.owl.KB;
import org.dllearner.reasoning.OWLAPIDIGConverter;
@@ -61,7 +60,7 @@
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
- options.add(new StringConfigOption("url", "URL pointing to the OWL file", null, Tags.MANDATORY ));
+ options.add(new StringConfigOption("url", "URL pointing to the OWL file", null, true, false));
return options;
}
Modified: trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/kb/sparql/SparqlKnowledgeSource.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -45,7 +45,6 @@
import org.dllearner.core.config.StringConfigOption;
import org.dllearner.core.config.StringSetConfigOption;
import org.dllearner.core.config.StringTupleListConfigOption;
-import org.dllearner.core.config.ConfigOption.Tags;
import org.dllearner.core.configuration.SparqlKnowledgeSourceConfigurator;
import org.dllearner.core.owl.KB;
import org.dllearner.kb.aquisitors.SparqlTupleAquisitor;
@@ -164,9 +163,9 @@
// Endpoint"));
options
.add(new StringSetConfigOption("instances",
- "relevant instances e.g. positive and negative examples in a learning problem",null,Tags.MANDATORY));
+ "relevant instances e.g. positive and negative examples in a learning problem",null,true,false));
options.add(new IntegerConfigOption("recursionDepth",
- "recursion depth of KB fragment selection", 1, Tags.NORMAL));
+ "recursion depth of KB fragment selection", 1));
options.add(new StringConfigOption("predefinedFilter",
"the mode of the SPARQL Filter, use one of YAGO,SKOS,YAGOSKOS , YAGOSPECIALHIERARCHY, TEST"));
options.add(new StringConfigOption("predefinedEndpoint",
@@ -192,17 +191,17 @@
"Specifies whether the extracted NTriples are converted to RDF and deleted.",
true));
options.add(new BooleanConfigOption("useLits",
- "use Literals in SPARQL query", true, Tags.NORMAL));
+ "use Literals in SPARQL query", true));
options
.add(new BooleanConfigOption(
"getAllSuperClasses",
"If true then all superclasses are retrieved until the most general class (owl:Thing) is reached.",
- true, Tags.NORMAL));
+ true));
//options.add(new BooleanConfigOption("learnDomain",
// "learns the Domain for a Role"));
options.add(new BooleanConfigOption("useCache",
- "If true a Cache is used",true, Tags.NORMAL));
+ "If true a Cache is used",true));
//options.add(new BooleanConfigOption("learnRange",
// "learns the Range for a Role"));
//options.add(new StringConfigOption("role",
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegLP.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -34,7 +34,6 @@
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.config.StringConfigOption;
import org.dllearner.core.config.StringSetConfigOption;
-import org.dllearner.core.config.ConfigOption.Tags;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
import org.dllearner.utilities.Helper;
@@ -86,13 +85,13 @@
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
options.add(new StringSetConfigOption("positiveExamples",
- "positive examples",null, Tags.MANDATORY));
+ "positive examples",null, true, false));
options.add(new StringSetConfigOption("negativeExamples",
- "negative examples",null, Tags.MANDATORY));
+ "negative examples",null, true, false));
options.add(new BooleanConfigOption("useRetrievalForClassficiation",
- "Specifies whether to use retrieval or instance checks for testing a concept.", false, Tags.NORMAL));
+ "Specifies whether to use retrieval or instance checks for testing a concept.", false));
options.add(CommonConfigOptions.getPercentPerLenghtUnitOption(0.05));
- StringConfigOption multiInstanceChecks = new StringConfigOption("useMultiInstanceChecks", "See UseMultiInstanceChecks enum.","twoChecks",Tags.NORMAL);
+ StringConfigOption multiInstanceChecks = new StringConfigOption("useMultiInstanceChecks", "See UseMultiInstanceChecks enum.","twoChecks");
multiInstanceChecks.setAllowedValues(new String[] {"never", "twoChecks", "oneCheck"});
options.add(multiInstanceChecks);
return options;
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyLP.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosOnlyLP.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -31,7 +31,6 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.config.StringSetConfigOption;
-import org.dllearner.core.config.ConfigOption.Tags;
import org.dllearner.core.owl.Individual;
/**
@@ -66,7 +65,7 @@
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
options.add(new StringSetConfigOption("positiveExamples",
- "positive examples", null, Tags.MANDATORY));
+ "positive examples", null, true, false));
return options;
}
Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -44,7 +44,6 @@
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
import org.dllearner.core.config.StringConfigOption;
-import org.dllearner.core.config.ConfigOption.Tags;
import org.dllearner.core.configuration.OWLAPIReasonerConfigurator;
import org.dllearner.core.owl.Constant;
import org.dllearner.core.owl.Datatype;
@@ -152,7 +151,7 @@
public static Collection<ConfigOption<?>> createConfigOptions() {
Collection<ConfigOption<?>> options = new LinkedList<ConfigOption<?>>();
- StringConfigOption type = new StringConfigOption("reasonerType", "FaCT++ or Pellet, which means \"pellet\" or \"fact\"", "pellet", Tags.NORMAL);
+ StringConfigOption type = new StringConfigOption("reasonerType", "FaCT++ or Pellet, which means \"pellet\" or \"fact\"", "pellet");
type.setAllowedValues(new String[] {"fact", "pellet"});
// closure option? see:
// http://owlapi.svn.sourceforge.net/viewvc/owlapi/owl1_1/trunk/tutorial/src/main/java/uk/ac/manchester/owl/tutorial/examples/ClosureAxiomsExample.java?view=markup
Modified: trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/scripts/ConfigJavaGenerator.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -195,7 +195,7 @@
imports.addAll(option.getJavaImports());
vars.add(fillVariableDefTemplate(optionName, type, defaultValue));
- setters.add(fillSetterTemplate(className, comment, optionName, type, option.isReinitNecessary()));
+ setters.add(fillSetterTemplate(className, comment, optionName, type, option.requiresInit()));
getters.add(fillGetterTemplate(comment, optionName, type));
// System.out.println(option);
// componentOptions.get(component)) {
Modified: trunk/src/dl-learner/org/dllearner/test/junit/ExampleTests.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/junit/ExampleTests.java 2008-09-05 14:53:16 UTC (rev 1171)
+++ trunk/src/dl-learner/org/dllearner/test/junit/ExampleTests.java 2008-09-08 09:24:41 UTC (rev 1172)
@@ -82,6 +82,7 @@
ignore.add("./examples/sparql/SKOSTEST_local.conf"); // Out of Memory Error
ignore.add("./examples/sparql/scrobble.conf"); // HTTP 502 Proxy Error
ignore.add("./examples/family-benchmark/Cousin.conf"); // Out of Memory Error
+ ignore.add("./examples/sparql/SilentBobWorking2.conf"); // Out of Memory Error
for (String path : confFiles.keySet()) {
for (String file : confFiles.get(path)) {
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
