Menu
▾
▴
[DL-Learner SVN] SF.net SVN: dl-learner:[1179] trunk/src/dl-learner/org/dllearner
|
From: <ku...@us...> - 2008-09-08 17:59:52
|
Revision: 1179
http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1179&view=rev
Author: kurzum
Date: 2008-09-08 17:59:49 +0000 (Mon, 08 Sep 2008)
Log Message:
-----------
more small changes
Modified Paths:
--------------
trunk/src/dl-learner/org/dllearner/examples/KRKModular.java
trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java
trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java
trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
trunk/src/dl-learner/org/dllearner/scripts/DumbLPFinder.java
trunk/src/dl-learner/org/dllearner/utilities/owl/ReasoningServiceFactory.java
Modified: trunk/src/dl-learner/org/dllearner/examples/KRKModular.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/examples/KRKModular.java 2008-09-08 17:26:27 UTC (rev 1178)
+++ trunk/src/dl-learner/org/dllearner/examples/KRKModular.java 2008-09-08 17:59:49 UTC (rev 1179)
@@ -23,6 +23,7 @@
import org.dllearner.core.LearningProblem;
import org.dllearner.core.ReasonerComponent;
import org.dllearner.core.ReasoningService;
+import org.dllearner.core.configurators.ComponentFactory;
import org.dllearner.core.owl.ClassAssertionAxiom;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
@@ -485,8 +486,10 @@
KBFile kbFile = new KBFile(this.kb);
Set<KnowledgeSource> ks = new HashSet<KnowledgeSource>();
ks.add(kbFile);
- reasoner = new OWLAPIReasoner(ks);
- ((OWLAPIReasoner)reasoner).setReasonerType("fact");
+
+ reasoner = ComponentFactory.getOWLAPIReasoner(ks);
+
+ ((OWLAPIReasoner)reasoner).getConfigurator().setReasonerType("fact");
try{
reasoner.init();
}catch (Exception e) {e.printStackTrace();}
Modified: trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java 2008-09-08 17:26:27 UTC (rev 1178)
+++ trunk/src/dl-learner/org/dllearner/learningproblems/PosNegDefinitionLP.java 2008-09-08 17:59:49 UTC (rev 1179)
@@ -27,6 +27,7 @@
import org.dllearner.core.ReasoningService;
import org.dllearner.core.Score;
import org.dllearner.core.config.ConfigOption;
+import org.dllearner.core.configurators.PosNegDefinitionLPConfigurator;
import org.dllearner.core.owl.Description;
import org.dllearner.core.owl.Individual;
import org.dllearner.utilities.Helper;
@@ -46,15 +47,22 @@
*/
public class PosNegDefinitionLP extends PosNegLP implements DefinitionLP {
+ private PosNegDefinitionLPConfigurator configurator;
+ public PosNegDefinitionLPConfigurator getConfigurator() {
+ return configurator;
+ }
+
public PosNegDefinitionLP(ReasoningService reasoningService) {
super(reasoningService);
+ this.configurator = new PosNegDefinitionLPConfigurator(this);
}
public PosNegDefinitionLP(ReasoningService reasoningService, SortedSet<Individual> positiveExamples, SortedSet<Individual> negativeExamples) {
super(reasoningService);
this.positiveExamples = positiveExamples;
this.negativeExamples = negativeExamples;
+ this.configurator = new PosNegDefinitionLPConfigurator(this);
}
/*
Modified: trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java 2008-09-08 17:26:27 UTC (rev 1178)
+++ trunk/src/dl-learner/org/dllearner/reasoning/FastInstanceChecker.java 2008-09-08 17:59:49 UTC (rev 1179)
@@ -626,9 +626,9 @@
rc.releaseKB();
}
- public void setReasonerType(String type){
+ /*public void setReasonerType(String type){
configurator.setReasonerType(type);
- }
+ }*/
@Override
Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-09-08 17:26:27 UTC (rev 1178)
+++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java 2008-09-08 17:59:49 UTC (rev 1179)
@@ -945,9 +945,9 @@
return owlAPIOntologies;
}
- public void setReasonerType(String type){
+ /*public void setReasonerType(String type){
configurator.setReasonerType(type);
- }
+ }*/
@Override
public boolean hasDatatypeSupport() {
Modified: trunk/src/dl-learner/org/dllearner/scripts/DumbLPFinder.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/DumbLPFinder.java 2008-09-08 17:26:27 UTC (rev 1178)
+++ trunk/src/dl-learner/org/dllearner/scripts/DumbLPFinder.java 2008-09-08 17:59:49 UTC (rev 1179)
@@ -85,6 +85,7 @@
allIndividuals.addAll( reasoningService.getIndividuals());
reasoningService = null;
+ ComponentManager.getInstance().freeAllComponents();
int count = 1;
while(count<10000){
Modified: trunk/src/dl-learner/org/dllearner/utilities/owl/ReasoningServiceFactory.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/utilities/owl/ReasoningServiceFactory.java 2008-09-08 17:26:27 UTC (rev 1178)
+++ trunk/src/dl-learner/org/dllearner/utilities/owl/ReasoningServiceFactory.java 2008-09-08 17:59:49 UTC (rev 1179)
@@ -81,11 +81,11 @@
break;
case OWLAPIREASONERFACT:
rc = cm.reasoner(OWLAPIReasoner.class, ks);
- ((OWLAPIReasoner)rc).setReasonerType("fact");
+ ((OWLAPIReasoner)rc).getConfigurator().setReasonerType("fact");
break;
case OWLAPIREASONERPELLET:
rc = cm.reasoner(OWLAPIReasoner.class, ks);
- ((OWLAPIReasoner)rc).setReasonerType("pellet");
+ ((OWLAPIReasoner)rc).getConfigurator().setReasonerType("pellet");
break;
default:
rc = cm.reasoner(FastInstanceChecker.class, ks);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
