Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1348] trunk
|
From: <Jen...@us...> - 2008-10-07 13:03:55
|
Revision: 1348
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1348&view=rev
Author: JensLehmann
Date: 2008-10-07 13:00:54 +0000 (Tue, 07 Oct 2008)
Log Message:
-----------
fixed some warnings
Modified Paths:
--------------
trunk/examples/krk/test_ZERO_against_1to16.conf
trunk/src/dl-learner/org/dllearner/core/ComponentManager.java
trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java
trunk/src/dl-learner/org/dllearner/scripts/WikipediaCategoryCleaner.java
trunk/src/dl-learner/org/dllearner/test/junit/ExampleTests.java
trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java
Modified: trunk/examples/krk/test_ZERO_against_1to16.conf
===================================================================
--- trunk/examples/krk/test_ZERO_against_1to16.conf 2008-10-07 10:27:14 UTC (rev 1347)
+++ trunk/examples/krk/test_ZERO_against_1to16.conf 2008-10-07 13:00:54 UTC (rev 1348)
@@ -1,7 +1,12 @@
/**
+ * You need to generate the OWL background knowledge file,
+ * otherwise this example won't work!
+ */
+/**
+
**/
Modified: trunk/src/dl-learner/org/dllearner/core/ComponentManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/core/ComponentManager.java 2008-10-07 10:27:14 UTC (rev 1347)
+++ trunk/src/dl-learner/org/dllearner/core/ComponentManager.java 2008-10-07 13:00:54 UTC (rev 1348)
@@ -42,7 +42,7 @@
import java.util.TreeSet;
import org.apache.log4j.Logger;
-import org.dllearner.cli.Start;
+import org.dllearner.cli.ConfMapper;
import org.dllearner.core.config.ConfigEntry;
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.config.InvalidConfigOptionValueException;
@@ -85,6 +85,8 @@
private static Map<Class<? extends Component>, Map<String, ConfigOption<?>>> componentOptionsByName;
private static Map<Class<? extends LearningAlgorithm>, Collection<Class<? extends LearningProblem>>> algorithmProblemsMapping;
+ private ConfMapper confMapper = new ConfMapper();
+
// list of default values of config options
// private static Map<ConfigOption<?>,Object> configOptionDefaults;
@@ -532,15 +534,8 @@
private String getComponentConfigString(Class<? extends Component> component) {
String componentDescription = "component: " + invokeStaticMethod(component, "getName") + " (" + component.getName() + ")";
String str = componentDescription + "\n";
- String cli = Start.getCLIMapping(component.getSuperclass().getSimpleName()+"");
- String usage ="";
-
- Map<Class<? extends Component>, String> m=Start.createComponentPrefixMapping();
- for (Class<? extends Component> c : m.keySet()) {
- if(c.getCanonicalName().equals(component.getCanonicalName())) {
- usage=m.get(c);
- }
- }
+ String cli = confMapper.getComponentTypeString(component);
+ String usage = confMapper.getComponentString(component);
for(int i=0; i<componentDescription.length(); i++) {
str += "=";
Modified: trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java 2008-10-07 10:27:14 UTC (rev 1347)
+++ trunk/src/dl-learner/org/dllearner/kb/extraction/InstanceNode.java 2008-10-07 13:00:54 UTC (rev 1348)
@@ -30,10 +30,8 @@
import org.dllearner.kb.manipulator.Manipulator;
import org.dllearner.utilities.datastructures.RDFNodeTuple;
import org.dllearner.utilities.owl.OWLVocabulary;
-import org.semanticweb.owl.model.OWLAnnotationAxiom;
import org.semanticweb.owl.model.OWLAxiom;
import org.semanticweb.owl.model.OWLClass;
-import org.semanticweb.owl.model.OWLCommentAnnotation;
import org.semanticweb.owl.model.OWLDataFactory;
import org.semanticweb.owl.model.OWLDataProperty;
import org.semanticweb.owl.model.OWLIndividual;
Modified: trunk/src/dl-learner/org/dllearner/scripts/WikipediaCategoryCleaner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/WikipediaCategoryCleaner.java 2008-10-07 10:27:14 UTC (rev 1347)
+++ trunk/src/dl-learner/org/dllearner/scripts/WikipediaCategoryCleaner.java 2008-10-07 13:00:54 UTC (rev 1348)
@@ -29,7 +29,6 @@
import java.util.SortedSet;
import java.util.TreeSet;
-import org.apache.log4j.ConsoleAppender;
import org.apache.log4j.FileAppender;
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
@@ -249,6 +248,7 @@
Files.createFile(new File(file), content);
}
+ @SuppressWarnings("unused")
private static void collectResults(WikipediaCategoryTasks wikiTasks) {
//logger.setLevel(Level.DEBUG);
SetManipulation.printSet("fullpos", wikiTasks.getFullPositiveSet(), logger);
@@ -382,7 +382,7 @@
}
-
+ @SuppressWarnings("unused")
private static void printIntermediateResults(
SortedSet<String> fullSet,
SortedSet<String> correctIndividuals,
@@ -427,7 +427,7 @@
e.printStackTrace();
}
- ConsoleAppender consoleAppender = new ConsoleAppender(layout);
+// ConsoleAppender consoleAppender = new ConsoleAppender(layout);
logger.removeAllAppenders();
//logger.addAppender(consoleAppender);
logger.addAppender(fileAppender);
@@ -448,6 +448,7 @@
}
+ @SuppressWarnings("unused")
private static void findCat(){
String q = "SELECT DISTINCT ?cat WHERE { ?a <http://www.w3.org/2004/02/skos/core#subject> ?cat }";
//System.out.println(q);
Modified: trunk/src/dl-learner/org/dllearner/test/junit/ExampleTests.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/junit/ExampleTests.java 2008-10-07 10:27:14 UTC (rev 1347)
+++ trunk/src/dl-learner/org/dllearner/test/junit/ExampleTests.java 2008-10-07 13:00:54 UTC (rev 1348)
@@ -79,6 +79,7 @@
Set<String> ignore = new TreeSet<String>();
// "standard" ignores (no problem to keep those)
ignore.add("./examples/krk/complete_no_draw.conf"); // refers to an OWL file, which has to be auto-generated
+ ignore.add("./examples/krk/test_ZERO_against_1to16.conf"); // see above
// ignored due to errors
ignore.add("./examples/sparql/govtrack.conf"); // HTTP 500 Server error
Modified: trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-10-07 10:27:14 UTC (rev 1347)
+++ trunk/src/dl-learner/org/dllearner/tools/protege/OWLClassDescriptionEditorWithDLLearnerTab.java 2008-10-07 13:00:54 UTC (rev 1348)
@@ -49,11 +49,8 @@
/**
* Added a new Tab for the DL-Learner GUI.
*
- * @author Matthew Horridge and Christian Koetteritzsch<br>
- * The University Of Manchester<br>
- * Bio-Health Informatics Group<br>
- * Date: 15-Feb-2007<br>
- * <br>
+ * @author Matthew Horridge
+ * @author Christian Koetteritzsch
*/
public class OWLClassDescriptionEditorWithDLLearnerTab extends
AbstractOWLFrameSectionRowObjectEditor<OWLDescription> implements
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
