Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[3623] trunk
|
From: <jen...@us...> - 2012-03-27 15:09:29
|
Revision: 3623
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3623&view=rev
Author: jenslehmann
Date: 2012-03-27 15:09:17 +0000 (Tue, 27 Mar 2012)
Log Message:
-----------
several changes to be able to use the KnowledgeSource interface instead of being forced to use AbstractKnowledgeSource
Modified Paths:
--------------
trunk/components-core/src/main/java/org/dllearner/core/AbstractReasonerComponent.java
trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java
trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java
trunk/components-core/src/main/java/org/dllearner/reasoning/DIGReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java
trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java
trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java
trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDRDown.java
trunk/components-core/src/main/java/org/dllearner/utilities/examples/ExampleDataCollector.java
trunk/components-core/src/main/java/org/dllearner/utilities/owl/OntologyCloser.java
trunk/components-core/src/test/java/org/dllearner/test/ComponentTest.java
trunk/components-core/src/test/java/org/dllearner/test/junit/ELDownTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/RefinementOperatorTests.java
trunk/components-core/src/test/java/org/dllearner/test/junit/TestOntologies.java
trunk/interfaces/src/main/java/org/dllearner/gui/Config.java
trunk/scripts/src/main/java/org/dllearner/examples/KRKModular.java
trunk/scripts/src/main/java/org/dllearner/scripts/CloseOntology.java
trunk/scripts/src/main/java/org/dllearner/scripts/DumbLPFinder.java
trunk/scripts/src/main/java/org/dllearner/scripts/NewSample.java
trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBibleComparison.java
trunk/scripts/src/main/java/org/dllearner/scripts/WikipediaCategoryCleaner.java
trunk/scripts/src/main/java/org/dllearner/scripts/tiger/TestIterativeLearning.java
trunk/test/newcomponent/AristotlePosNeg.conf
Modified: trunk/components-core/src/main/java/org/dllearner/core/AbstractReasonerComponent.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/AbstractReasonerComponent.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/core/AbstractReasonerComponent.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -120,7 +120,7 @@
/**
* The underlying knowledge sources.
*/
- protected Set<AbstractKnowledgeSource> sources;
+ protected Set<KnowledgeSource> sources;
public AbstractReasonerComponent(){
@@ -132,7 +132,7 @@
* @param sources
* The underlying knowledge sources.
*/
- public AbstractReasonerComponent(Set<AbstractKnowledgeSource> sources) {
+ public AbstractReasonerComponent(Set<KnowledgeSource> sources) {
this.sources = sources;
}
@@ -141,16 +141,16 @@
*
* @return The underlying knowledge sources.
*/
- public Set<AbstractKnowledgeSource> getSources() {
+ public Set<KnowledgeSource> getSources() {
return sources;
}
- public void setSources(Set<AbstractKnowledgeSource> sources){
+ public void setSources(Set<KnowledgeSource> sources){
this.sources = sources;
}
- public void setSources(AbstractKnowledgeSource... sources) {
- this.sources = new HashSet<AbstractKnowledgeSource>(Arrays.asList(sources));
+ public void setSources(KnowledgeSource... sources) {
+ this.sources = new HashSet<KnowledgeSource>(Arrays.asList(sources));
}
/**
@@ -161,7 +161,7 @@
* @param sources
* The new knowledge sources.
*/
- public void changeSources(Set<AbstractKnowledgeSource> sources) {
+ public void changeSources(Set<KnowledgeSource> sources) {
this.sources = sources;
}
Modified: trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/core/AnnComponentManager.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -79,7 +79,7 @@
"org.dllearner.kb.OWLFile",
"org.dllearner.kb.SparqlEndpointKS",
"org.dllearner.kb.sparql.SparqlKnowledgeSource",
- "org.dllearner.kb.sparql.SparqlSimpleExtractor",
+ "org.dllearner.kb.sparql.simple.SparqlSimpleExtractor",
"org.dllearner.learningproblems.PosNegLPStandard",
"org.dllearner.learningproblems.FuzzyPosNegLPStandard",
"org.dllearner.learningproblems.PosOnlyLP",
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SchemaIndexer.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -1,6 +1,6 @@
package org.dllearner.kb.sparql.simple;
-import org.nlp2rdf.ontology.ClassIndexer;
+//import org.nlp2rdf.ontology.ClassIndexer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -9,22 +9,23 @@
public class SchemaIndexer {
private static Logger log = LoggerFactory.getLogger(SchemaIndexer.class);
- private ClassIndexer classIndexer=null;
+// private ClassIndexer classIndexer=null;
public SchemaIndexer(){}
public void init(){
- classIndexer=new ClassIndexer();
+// classIndexer=new ClassIndexer();
OntModel model = ModelFactory.createOntologyModel();
model.read(SchemaIndexer.class.getResourceAsStream("dbpedia_3-3.6.owl"), null);
- classIndexer.index(model);
+// classIndexer.index(model);
}
public OntModel getHierarchyForURI(String classUri){
- if(classIndexer==null){
- this.init();
- }
- return classIndexer.getHierarchyForClassURI(classUri);
+// if(classIndexer==null){
+// this.init();
+// }
+// return classIndexer.getHierarchyForClassURI(classUri);
+ return null;
}
Modified: trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/kb/sparql/simple/SparqlSimpleExtractor.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -27,8 +27,9 @@
private List<String> filters = null;
@ConfigOption(name = "recursionDepth", description = "recursion depth", required = true)
private int recursionDepth = 0;
- @ConfigOption(name = "defaultGraphURI", description = "default graph URI", required = true)
- private String defaultGraphURIs=null;
+
+ @ConfigOption(name = "defaultGraphURI", description = "default graph URI", required = true)
+ private String defaultGraphURI=null;
private OWLOntology owlOntology;
private static Logger log = LoggerFactory.getLogger(SparqlSimpleExtractor.class);
@@ -69,15 +70,15 @@
for (int i = 0; i < recursionDepth - 1; i++) {
queryString=aGenerator.createQuery(instances, model, filters);
log.info("SPARQL: {}", queryString);
- executor.executeQuery(queryString, endpointURL, model,defaultGraphURIs);
+ executor.executeQuery(queryString, endpointURL, model,defaultGraphURI);
}
queryString = aGenerator.createLastQuery(instances, model, filters);
log.info("SPARQL: {}", queryString);
- executor.executeQuery(queryString, endpointURL, model, defaultGraphURIs);
+ executor.executeQuery(queryString, endpointURL, model, defaultGraphURI);
TBoxQueryGenerator tGenerator = new TBoxQueryGenerator();
queryString = tGenerator.createQuery(model, filters, instances);
- executor.executeQuery(queryString, endpointURL, model,defaultGraphURIs);
+ executor.executeQuery(queryString, endpointURL, model,defaultGraphURI);
JenaToOwlapiConverter converter = new JenaToOwlapiConverter();
owlOntology=converter.convert(this.model);
}
@@ -90,6 +91,14 @@
this.endpointURL = endpointURL;
}
+ public String getDefaultGraphURI() {
+ return defaultGraphURI;
+ }
+
+ public void setDefaultGraphURI(String defaultGraphURI) {
+ this.defaultGraphURI = defaultGraphURI;
+ }
+
public Model getModel() {
return model;
}
@@ -141,21 +150,8 @@
this.recursionDepth = recursionDepth;
}
- /**
- * @return the defaultGraphURI
- */
- public String getDefaultGraphURIs() {
- return defaultGraphURIs;
- }
/**
- * @param defaultGraphURI the defaultGraphURI to set
- */
- public void setDefaultGraphURIs(String defaultGraphURI) {
- this.defaultGraphURIs = defaultGraphURI;
- }
-
- /**
* @return
*/
public OWLOntology getOWLOntology() {
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/DIGReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/DIGReasoner.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/DIGReasoner.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -40,6 +40,7 @@
import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.OntologyFormat;
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.ConfigEntry;
@@ -106,7 +107,7 @@
- public DIGReasoner(Set<AbstractKnowledgeSource> sources) {
+ public DIGReasoner(Set<KnowledgeSource> sources) {
super(sources);
try {
reasonerURL = new URL("http://localhost:8081");
@@ -148,8 +149,8 @@
// "xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\" " +
// "xsi:schemaLocation=\"http://dl.kr.org/dig/2003/02/lang\n" +
// "http://dl-web.man.ac.uk/dig/2003/02/dig.xsd\" uri=\""+kbURI+"\">");
- for (AbstractKnowledgeSource source : sources) {
- sb.append(source.toDIG(kbURI));
+ for (KnowledgeSource source : sources) {
+ sb.append(((AbstractKnowledgeSource)source).toDIG(kbURI));
ResponseDocument rd = null;
try {
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -37,6 +37,7 @@
import org.dllearner.core.ComponentAnn;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentManager;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.ReasoningMethodUnsupportedException;
import org.dllearner.core.config.ConfigOption;
import org.dllearner.core.owl.Axiom;
@@ -150,8 +151,8 @@
Map<DatatypeProperty, Map<Individual, SortedSet<Integer>>> id,
Map<DatatypeProperty, TreeSet<Individual>> bdPos,
Map<DatatypeProperty, TreeSet<Individual>> bdNeg,
- AbstractKnowledgeSource... sources) {
- super(new HashSet<AbstractKnowledgeSource>(Arrays.asList(sources)));
+ KnowledgeSource... sources) {
+ super(new HashSet<KnowledgeSource>(Arrays.asList(sources)));
this.individuals = individuals;
this.classInstancesPos = classInstancesPos;
this.opPos = opPos;
@@ -160,7 +161,7 @@
this.bdNeg = bdNeg;
if(rc == null){
- rc = new OWLAPIReasoner(new HashSet<AbstractKnowledgeSource>(Arrays.asList(sources)));
+ rc = new OWLAPIReasoner(new HashSet<KnowledgeSource>(Arrays.asList(sources)));
try {
rc.init();
} catch (ComponentInitException e) {
@@ -202,12 +203,12 @@
}
}
- public FastInstanceChecker(Set<AbstractKnowledgeSource> sources) {
+ public FastInstanceChecker(Set<KnowledgeSource> sources) {
super(sources);
}
- public FastInstanceChecker(AbstractKnowledgeSource... sources) {
- super(new HashSet<AbstractKnowledgeSource>(Arrays.asList(sources)));
+ public FastInstanceChecker(KnowledgeSource... sources) {
+ super(new HashSet<KnowledgeSource>(Arrays.asList(sources)));
}
/**
@@ -270,9 +271,10 @@
logger.debug("dematerialising object properties");
for (ObjectProperty atomicRole : atomicRoles) {
+// System.out.println(atomicRole + " " + rc.getPropertyMembers(atomicRole));
opPos.put(atomicRole, rc.getPropertyMembers(atomicRole));
}
-
+
logger.debug("dematerialising datatype properties");
for (DatatypeProperty dp : booleanDatatypeProperties) {
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/FastRetrievalReasoner.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -28,6 +28,7 @@
import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.ReasoningMethodUnsupportedException;
import org.dllearner.core.options.ConfigEntry;
import org.dllearner.core.options.InvalidConfigOptionValueException;
@@ -56,7 +57,7 @@
AbstractReasonerComponent rc;
- public FastRetrievalReasoner(Set<AbstractKnowledgeSource> sources) {
+ public FastRetrievalReasoner(Set<KnowledgeSource> sources) {
super(sources);
rc = new OWLAPIReasoner(sources);
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/OWLAPIReasoner.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -179,7 +179,7 @@
}
- public OWLAPIReasoner(Set<AbstractKnowledgeSource> sources) {
+ public OWLAPIReasoner(Set<KnowledgeSource> sources) {
super(sources);
}
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/PelletReasoner.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -42,6 +42,7 @@
import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.ReasoningMethodUnsupportedException;
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.ConfigOption;
@@ -177,7 +178,7 @@
private List<OWLOntology> owlAPIOntologies = new LinkedList<OWLOntology>();
private boolean defaultNegation = true;
- public PelletReasoner(Set<AbstractKnowledgeSource> sources) {
+ public PelletReasoner(Set<KnowledgeSource> sources) {
super(sources);
}
@@ -198,7 +199,7 @@
Set<OWLOntology> allImports = new HashSet<OWLOntology>();
prefixes = new TreeMap<String, String>();
- for (AbstractKnowledgeSource source : sources) {
+ for (KnowledgeSource source : sources) {
if (source instanceof OWLOntologyKnowledgeSource) {
ontology = ((OWLOntologyKnowledgeSource) source).createOWLOntology(manager);
@@ -274,7 +275,7 @@
// all other sources are converted to KB and then to an
// OWL API ontology
} else {
- KB kb = source.toKB();
+ KB kb = ((AbstractKnowledgeSource)source).toKB();
// System.out.println(kb.toString(null,null));
IRI ontologyIRI = IRI.create("http://example.com");
@@ -460,7 +461,7 @@
Set<OWLOntology> allImports = new HashSet<OWLOntology>();
prefixes = new TreeMap<String, String>();
- for (AbstractKnowledgeSource source : sources) {
+ for (KnowledgeSource source : sources) {
if (source instanceof OWLOntologyKnowledgeSource) {
ontology = ((OWLOntologyKnowledgeSource) source).createOWLOntology(manager);
@@ -529,7 +530,7 @@
// all other sources are converted to KB and then to an
// OWL API ontology
} else {
- KB kb = source.toKB();
+ KB kb = ((AbstractKnowledgeSource)source).toKB();
// System.out.println(kb.toString(null,null));
IRI ontologyIRI = IRI.create("http://example.com");
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/ProtegeReasoner.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -37,6 +37,7 @@
import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.ReasoningMethodUnsupportedException;
import org.dllearner.core.options.BooleanConfigOption;
import org.dllearner.core.options.ConfigOption;
@@ -163,11 +164,11 @@
private List<OWLOntology> owlAPIOntologies = new LinkedList<OWLOntology>();
private boolean defaultNegation = true;
- public ProtegeReasoner(Set<AbstractKnowledgeSource> sources) {
+ public ProtegeReasoner(Set<KnowledgeSource> sources) {
super(sources);
}
- public ProtegeReasoner(Set<AbstractKnowledgeSource> sources, OWLReasoner reasoner) {
+ public ProtegeReasoner(Set<KnowledgeSource> sources, OWLReasoner reasoner) {
this(sources);
this.reasoner = reasoner;
}
@@ -247,7 +248,7 @@
Set<OWLOntology> allImports = new HashSet<OWLOntology>();
prefixes = new TreeMap<String, String>();
- for (AbstractKnowledgeSource source : sources) {
+ for (KnowledgeSource source : sources) {
if (source instanceof OWLOntologyKnowledgeSource) {
ontology = ((OWLOntologyKnowledgeSource) source).createOWLOntology(manager);
@@ -311,7 +312,7 @@
// all other sources are converted to KB and then to an
// OWL API ontology
} else {
- KB kb = source.toKB();
+ KB kb = ((AbstractKnowledgeSource)source).toKB();
// System.out.println(kb.toString(null,null));
IRI ontologyIRI = IRI.create("http://example.com");
Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/fuzzydll/FuzzyOWLAPIReasoner.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -42,6 +42,7 @@
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentAnn;
import org.dllearner.core.ComponentInitException;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.options.ConfigEntry;
import org.dllearner.core.options.ConfigOption;
import org.dllearner.core.options.InvalidConfigOptionValueException;
@@ -177,7 +178,7 @@
}
- public FuzzyOWLAPIReasoner(Set<AbstractKnowledgeSource> sources) {
+ public FuzzyOWLAPIReasoner(Set<KnowledgeSource> sources) {
super(sources);
}
@@ -244,7 +245,7 @@
Set<OWLOntology> allImports = new HashSet<OWLOntology>();
prefixes = new TreeMap<String,String>();
- for(AbstractKnowledgeSource source : sources) {
+ for(KnowledgeSource source : sources) {
if (source instanceof OWLOntologyKnowledgeSource) {
ontology = ((OWLOntologyKnowledgeSource) source).createOWLOntology(manager);
@@ -278,7 +279,7 @@
// all other sources are converted to KB and then to an
// OWL API ontology
} else {
- KB kb = source.toKB();
+ KB kb = ((AbstractKnowledgeSource)source).toKB();
// System.out.println(kb.toString(null,null));
IRI ontologyURI = IRI.create("http://example.com");
Modified: trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDRDown.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDRDown.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/refinementoperators/RhoDRDown.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -309,7 +309,7 @@
}
}
frequentValues.put(op, frequentInds);
-
+
}
}
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/examples/ExampleDataCollector.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/examples/ExampleDataCollector.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/examples/ExampleDataCollector.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -35,6 +35,7 @@
import org.dllearner.algorithms.ocel.OCEL;
import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.ComponentManager;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.kb.OWLFile;
import org.dllearner.learningproblems.PosNegLPStandard;
import org.dllearner.reasoning.FastInstanceChecker;
@@ -73,7 +74,7 @@
urls.addAll (convert(baseDir, pos));
urls.addAll (convert(baseDir, neg));
- Set<AbstractKnowledgeSource> tmp = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> tmp = new HashSet<KnowledgeSource>();
try {
URL add = new File(baseDir+"tiger.rdf").toURI().toURL();
// add = new File(baseDir+"new.rdf").toURI().toURL();
@@ -94,7 +95,7 @@
// la.getConfigurator().setUseAllConstructor(false);
// la.getConfigurator().setUseExistsConstructor(false);
la.setUseDataHasValueConstructor(true);
- for(AbstractKnowledgeSource ks: tmp){
+ for(KnowledgeSource ks: tmp){
ks.init();
}
rc.init();
Modified: trunk/components-core/src/main/java/org/dllearner/utilities/owl/OntologyCloser.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/utilities/owl/OntologyCloser.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/main/java/org/dllearner/utilities/owl/OntologyCloser.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -27,9 +27,9 @@
import java.util.SortedSet;
import java.util.TreeSet;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
-import org.dllearner.core.AbstractKnowledgeSource;
-import org.dllearner.core.AbstractReasonerComponent;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.owl.ClassAssertionAxiom;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.EquivalentClassesAxiom;
@@ -64,7 +64,7 @@
super();
this.kb = kb;
this.kbFile = new KBFile(this.kb);
- Set<AbstractKnowledgeSource> ks = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> ks = new HashSet<KnowledgeSource>();
ks.add(this.kbFile);
OWLAPIReasoner owlapi = new OWLAPIReasoner();
owlapi.setSources(ks);
@@ -85,7 +85,7 @@
SimpleClock sc = new SimpleClock();
sc.printAndSet();
this.kbFile = new KBFile(this.kb);
- Set<AbstractKnowledgeSource> ks = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> ks = new HashSet<KnowledgeSource>();
ks.add(this.kbFile);
sc.printAndSet("updating reasoner");
Modified: trunk/components-core/src/test/java/org/dllearner/test/ComponentTest.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/ComponentTest.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/test/java/org/dllearner/test/ComponentTest.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -19,20 +19,16 @@
package org.dllearner.test;
-import java.io.File;
import java.net.MalformedURLException;
import java.util.Collections;
import java.util.Set;
import java.util.TreeSet;
import org.dllearner.algorithms.ocel.OCEL;
-import org.dllearner.core.ComponentInitException;
-import org.dllearner.core.ComponentManager;
-import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.AbstractLearningProblem;
-import org.dllearner.core.LearningProblemUnsupportedException;
import org.dllearner.core.AbstractReasonerComponent;
+import org.dllearner.core.ComponentInitException;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.owl.Individual;
import org.dllearner.kb.OWLFile;
import org.dllearner.learningproblems.PosNegLPStandard;
@@ -55,7 +51,7 @@
// create knowledge source
String example = "../examples/family/uncle.owl";
- AbstractKnowledgeSource source = new OWLFile(example);
+ KnowledgeSource source = new OWLFile(example);
// create OWL API reasoning service with standard settings
AbstractReasonerComponent reasoner = new OWLAPIReasoner(Collections.singleton(source));
Modified: trunk/components-core/src/test/java/org/dllearner/test/junit/ELDownTests.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/junit/ELDownTests.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/test/java/org/dllearner/test/junit/ELDownTests.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -35,10 +35,9 @@
import org.apache.log4j.SimpleLayout;
import org.dllearner.algorithms.el.ELDescriptionNode;
import org.dllearner.algorithms.el.ELDescriptionTree;
-import org.dllearner.core.ComponentInitException;
-import org.dllearner.core.ComponentManager;
-import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractReasonerComponent;
+import org.dllearner.core.ComponentInitException;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.core.owl.ObjectProperty;
@@ -298,7 +297,7 @@
logger.addAppender(app);
String ont = "../test/galen2.owl";
- AbstractKnowledgeSource source = new OWLFile(ont);
+ KnowledgeSource source = new OWLFile(ont);
source.init();
AbstractReasonerComponent reasoner = new OWLAPIReasoner(Collections.singleton(source));
reasoner.init();
@@ -333,7 +332,7 @@
public void asTest() throws ComponentInitException, MalformedURLException {
String ont = "../test/galen2.owl";
- AbstractKnowledgeSource source = new OWLFile(ont);
+ KnowledgeSource source = new OWLFile(ont);
source.init();
AbstractReasonerComponent reasoner = new OWLAPIReasoner(Collections.singleton(source));
reasoner.init();
Modified: trunk/components-core/src/test/java/org/dllearner/test/junit/RefinementOperatorTests.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/junit/RefinementOperatorTests.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/test/java/org/dllearner/test/junit/RefinementOperatorTests.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -21,8 +21,6 @@
import static org.junit.Assert.assertTrue;
-import java.io.File;
-import java.net.MalformedURLException;
import java.util.Collections;
import java.util.Set;
import java.util.TreeSet;
@@ -30,16 +28,15 @@
import org.apache.log4j.Level;
import org.apache.log4j.Logger;
import org.dllearner.algorithms.ocel.OCEL;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentManager;
-import org.dllearner.core.AbstractKnowledgeSource;
-import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.LearningProblemUnsupportedException;
-import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.owl.ClassHierarchy;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.NamedClass;
-import org.dllearner.core.owl.Thing;
import org.dllearner.kb.OWLFile;
import org.dllearner.learningproblems.PosNegLPStandard;
import org.dllearner.parser.KBParser;
@@ -71,7 +68,7 @@
public void rhoDRDownTest() {
try {
String file = "../examples/carcinogenesis/carcinogenesis.owl";
- AbstractKnowledgeSource ks = new OWLFile(file);
+ KnowledgeSource ks = new OWLFile(file);
AbstractReasonerComponent reasoner = new OWLAPIReasoner(Collections.singleton(ks));
reasoner.init();
baseURI = reasoner.getBaseURI();
Modified: trunk/components-core/src/test/java/org/dllearner/test/junit/TestOntologies.java
===================================================================
--- trunk/components-core/src/test/java/org/dllearner/test/junit/TestOntologies.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/components-core/src/test/java/org/dllearner/test/junit/TestOntologies.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -19,14 +19,12 @@
package org.dllearner.test.junit;
-import java.io.File;
-import java.net.MalformedURLException;
import java.util.Collections;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentManager;
-import org.dllearner.core.AbstractKnowledgeSource;
-import org.dllearner.core.AbstractReasonerComponent;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.owl.KB;
import org.dllearner.kb.KBFile;
import org.dllearner.kb.OWLFile;
@@ -141,7 +139,7 @@
try {
ComponentManager cm = ComponentManager.getInstance();
- AbstractKnowledgeSource source;
+ KnowledgeSource source;
// parse KB string if one has been specified
if(!kbString.isEmpty() || ont.equals(TestOntology.EMPTY)) {
Modified: trunk/interfaces/src/main/java/org/dllearner/gui/Config.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/gui/Config.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/interfaces/src/main/java/org/dllearner/gui/Config.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -28,14 +28,15 @@
import org.apache.log4j.Logger;
import org.dllearner.cli.Start;
+import org.dllearner.core.AbstractCELA;
import org.dllearner.core.AbstractComponent;
+import org.dllearner.core.AbstractKnowledgeSource;
+import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentManager;
-import org.dllearner.core.AbstractKnowledgeSource;
-import org.dllearner.core.AbstractCELA;
-import org.dllearner.core.AbstractLearningProblem;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.LearningProblemUnsupportedException;
-import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.options.ConfigEntry;
import org.dllearner.core.options.ConfigOption;
import org.dllearner.kb.KBFile;
@@ -44,7 +45,6 @@
import org.dllearner.learningproblems.ClassLearningProblem;
import org.dllearner.learningproblems.PosNegLP;
import org.dllearner.learningproblems.PosOnlyLP;
-import org.dllearner.parser.ParseException;
/**
* Config save all together used variables: ComponentManager, KnowledgeSource,
@@ -215,7 +215,7 @@
*/
public AbstractKnowledgeSource changeKnowledgeSource(Class<? extends AbstractKnowledgeSource> clazz) {
source = cm.knowledgeSource(clazz);
- Set<AbstractKnowledgeSource> sources = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> sources = new HashSet<KnowledgeSource>();
sources.add(source);
reasoner.changeSources(sources);
// logger.debug("knowledge source " + clazz + " changed");
Modified: trunk/scripts/src/main/java/org/dllearner/examples/KRKModular.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/examples/KRKModular.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/scripts/src/main/java/org/dllearner/examples/KRKModular.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -20,6 +20,7 @@
import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentManager;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.owl.ClassAssertionAxiom;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
@@ -249,7 +250,7 @@
ComponentManager cm = ComponentManager.getInstance();
AbstractCELA la = null;
try {
- Set<AbstractKnowledgeSource> sources = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> sources = new HashSet<KnowledgeSource>();
sources.add(new KBFile(kb));
FastInstanceChecker r = new FastInstanceChecker();
r.setSources(sources);
@@ -485,7 +486,7 @@
public void initReasonerFact(){
KBFile kbFile = new KBFile(this.kb);
- Set<AbstractKnowledgeSource> ks = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> ks = new HashSet<KnowledgeSource>();
ks.add(kbFile);
reasoner = new OWLAPIReasoner(ks);
@@ -500,7 +501,7 @@
public void initFIC(){
KBFile kbFile = new KBFile(this.kb);
- Set<AbstractKnowledgeSource> ks = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> ks = new HashSet<KnowledgeSource>();
ks.add(kbFile);
//System.out.println("blabla");
reasoner = new FastInstanceChecker();
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/CloseOntology.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/CloseOntology.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/CloseOntology.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -22,7 +22,7 @@
import java.util.HashSet;
import java.util.Set;
-import org.dllearner.core.AbstractKnowledgeSource;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.kb.OWLFile;
import org.dllearner.reasoning.OWLAPIReasoner;
import org.dllearner.utilities.owl.OntologyCloserOWLAPI;
@@ -60,7 +60,7 @@
// initializing reasoner
OWLFile owlFile = new OWLFile();
owlFile.setURL(inputURI.toURL());
- Set<AbstractKnowledgeSource> ks = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> ks = new HashSet<KnowledgeSource>();
ks.add(owlFile);
OWLAPIReasoner owlapireasoner = new OWLAPIReasoner();
owlapireasoner.setSources(ks);
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/DumbLPFinder.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/DumbLPFinder.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/DumbLPFinder.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -32,9 +32,9 @@
import org.apache.log4j.Logger;
import org.apache.log4j.SimpleLayout;
import org.dllearner.algorithms.ocel.OCEL;
-import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentManager;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.owl.Individual;
import org.dllearner.kb.sparql.SparqlKnowledgeSource;
import org.dllearner.learningproblems.EvaluatedDescriptionPosNeg;
@@ -225,7 +225,7 @@
ks.setPredefinedEndpoint("LOCALJOSEKIBIBLE");
ks.setUseLits(true);
- Set<AbstractKnowledgeSource> tmp = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> tmp = new HashSet<KnowledgeSource>();
tmp.add(ks);
// reasoner
OWLAPIReasoner f = new OWLAPIReasoner(tmp);
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/NewSample.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/NewSample.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/NewSample.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -34,10 +34,10 @@
import org.apache.log4j.Logger;
import org.apache.log4j.SimpleLayout;
import org.dllearner.algorithms.ocel.OCEL;
-import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.ComponentInitException;
import org.dllearner.core.ComponentManager;
import org.dllearner.core.EvaluatedDescription;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.LearningProblemUnsupportedException;
import org.dllearner.kb.OWLFile;
import org.dllearner.learningproblems.EvaluatedDescriptionPosNeg;
@@ -125,7 +125,7 @@
OWLFile ks = new OWLFile();
ks.setUrl(fileURL);
- Set<AbstractKnowledgeSource> tmp = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> tmp = new HashSet<KnowledgeSource>();
tmp.add(ks);
// reasoner
FastInstanceChecker f = new FastInstanceChecker(tmp);
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBibleComparison.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBibleComparison.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/SemanticBibleComparison.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -46,6 +46,7 @@
import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.AbstractReasonerComponent;
import org.dllearner.core.ComponentManager;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
import org.dllearner.gui.Config;
@@ -466,7 +467,7 @@
ks.setRecursionDepth(3);
}
- Set<AbstractKnowledgeSource> tmp = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> tmp = new HashSet<KnowledgeSource>();
tmp.add(ks);
// reasoner
OWLAPIReasoner f = new OWLAPIReasoner(tmp);
@@ -505,7 +506,7 @@
}
OWLFile ks = new OWLFile( fileURL);
- Set<AbstractKnowledgeSource> tmp = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> tmp = new HashSet<KnowledgeSource>();
tmp.add(ks);
AbstractReasonerComponent f = null;
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/WikipediaCategoryCleaner.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/WikipediaCategoryCleaner.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/WikipediaCategoryCleaner.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -37,6 +37,7 @@
import org.dllearner.core.AbstractKnowledgeSource;
import org.dllearner.core.ComponentManager;
import org.dllearner.core.EvaluatedDescription;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.owl.Individual;
import org.dllearner.kb.extraction.ExtractionAlgorithm;
import org.dllearner.kb.extraction.Manager;
@@ -303,7 +304,7 @@
- Set<AbstractKnowledgeSource> tmp = new HashSet<AbstractKnowledgeSource>();
+ Set<KnowledgeSource> tmp = new HashSet<KnowledgeSource>();
tmp.add(ks);
// reasoner
FastInstanceChecker f = new FastInstanceChecker(tmp);
Modified: trunk/scripts/src/main/java/org/dllearner/scripts/tiger/TestIterativeLearning.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/tiger/TestIterativeLearning.java 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/tiger/TestIterativeLearning.java 2012-03-27 15:09:17 UTC (rev 3623)
@@ -26,6 +26,7 @@
import org.dllearner.core.ComponentManager;
import org.dllearner.core.ComponentPool;
import org.dllearner.core.EvaluatedDescription;
+import org.dllearner.core.KnowledgeSource;
import org.dllearner.core.owl.NamedClass;
import org.dllearner.kb.OWLFile;
import org.dllearner.kb.sparql.Cache;
@@ -444,8 +445,8 @@
}
- private static Set<AbstractKnowledgeSource> _getOWL(Examples ex) throws Exception {
- Set<AbstractKnowledgeSource> tmp = new HashSet<AbstractKnowledgeSource>();
+ private static Set<KnowledgeSource> _getOWL(Examples ex) throws Exception {
+ Set <KnowledgeSource> tmp = new HashSet<KnowledgeSource>();
List<URL> urls = new ArrayList<URL>();
urls.add(new File(backgroundXML).toURI().toURL());
urls.addAll(ExampleDataCollector.convert(sentenceXMLFolder, ex.getPosTrain()));
@@ -499,11 +500,11 @@
// }
public static FastInstanceChecker _getFastInstanceChecker(Examples ex) throws Exception {
- Set<AbstractKnowledgeSource> tmp = _getOWL(ex);
+ Set<KnowledgeSource> tmp = _getOWL(ex);
// Set<KnowledgeSource> tmp = _getSPARQL(ex);
FastInstanceChecker rc = new FastInstanceChecker(tmp);
- for (AbstractKnowledgeSource ks : tmp) {
+ for (KnowledgeSource ks : tmp) {
ks.init();
}
rc.init();
Modified: trunk/test/newcomponent/AristotlePosNeg.conf
===================================================================
--- trunk/test/newcomponent/AristotlePosNeg.conf 2012-03-27 12:45:35 UTC (rev 3622)
+++ trunk/test/newcomponent/AristotlePosNeg.conf 2012-03-27 15:09:17 UTC (rev 3623)
@@ -12,7 +12,7 @@
// SPARQL options
sparql.type = "sparqls"
sparql.endpointURL = "http://live.dbpedia.org/sparql"
-sparql.defaultGraphURIs = {"http://dbpedia.org"}
+sparql.defaultGraphURI = "http://dbpedia.org"
sparql.recursionDepth = 1
sparql.instances = {
@@ -47,3 +47,5 @@
// we use the OCEL algorithm
alg.type = "ocel"
alg.reasoner = reasoner
+alg.learningProblem = lp
+
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
