You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stanbol.apache.org by co...@apache.org on 2011/03/25 15:12:05 UTC
svn commit: r1085385 - in /incubator/stanbol/trunk/kres/reasoners/base: ./
src/main/java/org/apache/stanbol/reasoners/base/api/
src/main/java/org/apache/stanbol/reasoners/base/commands/
src/main/java/org/apache/stanbol/reasoners/base/impl/ src/test/jav...
Author: concelvio
Date: Fri Mar 25 14:12:04 2011
New Revision: 1085385
URL: http://svn.apache.org/viewvc?rev=1085385&view=rev
Log:
STANBOL-39:
- changed parent version in pom.xml to ${stanbol-version}
- removed kres-version from pom.xml
- changed name KReSReasoner.java to Reasoner.java
- changed name KReSCreateReasoner.java to CreateReasoner.java
- changed name KReSRunReasoner.java to RunReasoner.java
- changed name KReSRunRules.java to RunRules.java
- changed name KReSReasonerImpl.java to ReasonerImpl.java
- changed name KReSRunReasonerTest.java to RunReasonerTest.java
- changed name KReSRunRulesTest.java to RunRulesTest.java
Added:
incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/Reasoner.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/KReSReasoner.java
incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/CreateReasoner.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSCreateReasoner.java
incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunReasoner.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSRunReasoner.java
incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSRunRules.java
incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ReasonerImpl.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/KReSReasonerImpl.java
incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/RunReasonerTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/KReSRunReasonerTest.java
incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/RunRulesTest.java
- copied, changed from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/KReSRunRulesTest.java
Removed:
incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/KReSReasoner.java
incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSCreateReasoner.java
incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSRunReasoner.java
incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSRunRules.java
incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/KReSReasonerImpl.java
incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/KReSRunReasonerTest.java
incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/KReSRunRulesTest.java
Modified:
incubator/stanbol/trunk/kres/reasoners/base/pom.xml
Modified: incubator/stanbol/trunk/kres/reasoners/base/pom.xml
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/pom.xml?rev=1085385&r1=1085384&r2=1085385&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/pom.xml (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/pom.xml Fri Mar 25 14:12:04 2011
@@ -22,7 +22,7 @@
<parent>
<groupId>org.apache.stanbol</groupId>
<artifactId>stanbol-parent</artifactId>
- <version>0.9-SNAPSHOT</version>
+ <version>${stanbol-version}</version>
<relativePath>../../../parent</relativePath>
</parent>
@@ -39,10 +39,6 @@
<inceptionYear>2010</inceptionYear>
- <properties>
- <kres-version>0.7</kres-version>
- </properties>
-
<build>
<plugins>
<plugin>
@@ -110,18 +106,7 @@
<dependency> <groupId>log4j</groupId> <artifactId>log4j</artifactId>
<version>1.2.13</version> <scope>provided</scope> </dependency>
-->
- <!--
- <dependency> <groupId>com.hp.hpl.jena</groupId>
- <artifactId>iri</artifactId> <version>0.8</version>
- <scope>provided</scope> </dependency> <dependency>
- <groupId>com.hp.hpl.jena</groupId> <artifactId>jena</artifactId>
- <version>2.6.2</version> <scope>provided</scope> </dependency>
- <dependency> <groupId>com.hp.hpl.jena</groupId>
- <artifactId>tdb</artifactId> <version>0.8.5</version>
- <scope>provided</scope> </dependency> <dependency>
- <groupId>com.hp.hpl.jena</groupId> <artifactId>arq</artifactId>
- <version>2.8.3</version> <scope>provided</scope> </dependency>
- -->
+
<dependency>
<groupId>javax.servlet</groupId>
<artifactId>servlet-api</artifactId>
@@ -177,12 +162,6 @@
</exclusion>
</exclusions>
</dependency>
- <!--
- <dependency> <groupId>eu.iksproject</groupId>
- <artifactId>eu.iksproject.kres.shared.dependency.owlapi</artifactId>
- <version>${kres-version}</version> <type>bundle</type>
- <scope>provided</scope> </dependency>
- -->
<!-- Diagnostics deps -->
<dependency>
Copied: incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/Reasoner.java (from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/KReSReasoner.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/Reasoner.java?p2=incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/Reasoner.java&p1=incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/KReSReasoner.java&r1=1085259&r2=1085385&rev=1085385&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/KReSReasoner.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/api/Reasoner.java Fri Mar 25 14:12:04 2011
@@ -11,7 +11,7 @@ import org.semanticweb.owlapi.reasoner.O
* @author andrea.nuzzolese
*
*/
-public interface KReSReasoner {
+public interface Reasoner {
/**
* Gets the reasoner.
Copied: incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/CreateReasoner.java (from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSCreateReasoner.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/CreateReasoner.java?p2=incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/CreateReasoner.java&p1=incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSCreateReasoner.java&r1=1085259&r2=1085385&rev=1085385&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSCreateReasoner.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/CreateReasoner.java Fri Mar 25 14:12:04 2011
@@ -19,7 +19,7 @@ import org.semanticweb.owlapi.reasoner.S
* This class create an OWLReasoner. The used reasoner is HermiT but alternatively can be used an online reasoner.
*
*/
-public class KReSCreateReasoner {
+public class CreateReasoner {
private OWLReasoner reasoner;
@@ -28,7 +28,7 @@ public class KReSCreateReasoner {
*
* @param owl {An OWLOntology object where to perform the inferences.}
*/
- public KReSCreateReasoner(OWLOntology owl){
+ public CreateReasoner(OWLOntology owl){
//ConsoleProgressMonitor progressMonitor = new ConsoleProgressMonitor();
OWLReasonerConfiguration config = new SimpleConfiguration();
ReasonerFactory risfactory = new ReasonerFactory();
@@ -41,7 +41,7 @@ public class KReSCreateReasoner {
* @param owl {An OWLOntology object where to perform the inferences.}
* @param owlrc {An OWLReasonerConfiguration object contains particular configuration to set the resaoner.}
*/
- public KReSCreateReasoner(OWLOntology owl,OWLReasonerConfiguration owlrc){
+ public CreateReasoner(OWLOntology owl,OWLReasonerConfiguration owlrc){
ReasonerFactory risfactory = new ReasonerFactory();
this.reasoner = risfactory.createReasoner(owl,owlrc);
}
@@ -53,7 +53,7 @@ public class KReSCreateReasoner {
* @param owl {An OWLOntology object where to perform the inferences.}
* @param reasonerurl {The url of the reasoner server end-point.}
*/
- public KReSCreateReasoner(OWLOntology owl,URL reasonerurl){
+ public CreateReasoner(OWLOntology owl,URL reasonerurl){
OWLlinkReasonerConfiguration reasonerConfiguration = new OWLlinkReasonerConfiguration(reasonerurl);
OWLlinkHTTPXMLReasonerFactory factory = new OWLlinkHTTPXMLReasonerFactory();
this.reasoner = factory.createNonBufferingReasoner(owl, reasonerConfiguration);
Copied: incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunReasoner.java (from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSRunReasoner.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunReasoner.java?p2=incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunReasoner.java&p1=incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSRunReasoner.java&r1=1085259&r2=1085385&rev=1085385&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSRunReasoner.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunReasoner.java Fri Mar 25 14:12:04 2011
@@ -28,7 +28,7 @@ import org.semanticweb.owlapi.util.Infer
*
* @author elvio
*/
-public class KReSRunReasoner {
+public class RunReasoner {
private OWLOntology owlmodel;
private OWLReasoner loadreasoner;
@@ -39,7 +39,7 @@ public class KReSRunReasoner {
*
* @param reasoner {The OWLReasoner object containing the ontology to be inferred.}
*/
- public KReSRunReasoner(OWLReasoner reasoner){
+ public RunReasoner(OWLReasoner reasoner){
this.owlmodel = reasoner.getRootOntology();
this.owlmanager = owlmodel.getOWLOntologyManager();
Copied: incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java (from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSRunRules.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java?p2=incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java&p1=incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSRunRules.java&r1=1085259&r2=1085385&rev=1085385&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/KReSRunRules.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/commands/RunRules.java Fri Mar 25 14:12:04 2011
@@ -35,7 +35,7 @@ import org.apache.stanbol.owlapi.trasfor
*
* @author elvio
*/
-public final class KReSRunRules {
+public final class RunRules {
private OWLOntology targetontology;
@@ -93,7 +93,7 @@ public final class KReSRunRules {
if(additions.size()>0)
manager.applyChanges(additions);
} catch (OWLOntologyCreationException ex) {
- Logger.getLogger(KReSRunRules.class.getName()).log(Level.SEVERE, null, ex);
+ Logger.getLogger(RunRules.class.getName()).log(Level.SEVERE, null, ex);
}
}
@@ -104,7 +104,7 @@ public final class KReSRunRules {
* @param SWRLruleOntology {The OWLOntology contains the SWRL rules.}
* @param targetOntology {The OWLOntology model where to perform the SWRL rule reasoner.}
*/
- public KReSRunRules(OWLOntology SWRLruleOntology, OWLOntology targetOntology){
+ public RunRules(OWLOntology SWRLruleOntology, OWLOntology targetOntology){
cloneOntology(targetOntology);
this.targetontology = targetOntology;
@@ -117,7 +117,7 @@ public final class KReSRunRules {
owlmanager.applyChanges(additions);
//Create the reasoner
- this.reasoner = (new KReSCreateReasoner(originalowl)).getReasoner();
+ this.reasoner = (new CreateReasoner(originalowl)).getReasoner();
//Prepare the reasoner
this.reasoner.prepareReasoner();
@@ -131,7 +131,7 @@ public final class KReSRunRules {
* @param targetOntology {The OWLOntology model where to perform the SWRL rule reasoner.}
* @param reasonerurl {The url of reasoner server end-point.}
*/
- public KReSRunRules(OWLOntology SWRLruleOntology, OWLOntology targetOntology, URL reasonerurl){
+ public RunRules(OWLOntology SWRLruleOntology, OWLOntology targetOntology, URL reasonerurl){
cloneOntology(targetOntology);
this.targetontology = targetOntology;
@@ -144,7 +144,7 @@ public final class KReSRunRules {
owlmanager.applyChanges(additions);
//Create the reasoner
- this.reasoner = (new KReSCreateReasoner(originalowl,reasonerurl)).getReasoner();
+ this.reasoner = (new CreateReasoner(originalowl,reasonerurl)).getReasoner();
//Prepare the reasoner
this.reasoner.prepareReasoner();
@@ -156,7 +156,7 @@ public final class KReSRunRules {
* @param SWRLruleOntology {The Jena Model contains the SWRL rules.}
* @param targetOntology {The OWLOntology model where to perform the SWRL rule reasoner.}
*/
- public KReSRunRules(Model SWRLruleOntology, OWLOntology targetOntology){
+ public RunRules(Model SWRLruleOntology, OWLOntology targetOntology){
JenaToOwlConvert j2o = new JenaToOwlConvert();
OntModel jenamodel = ModelFactory.createOntologyModel();
@@ -173,7 +173,7 @@ public final class KReSRunRules {
owlmanager.applyChanges(additions);
//Create the reasoner
- this.reasoner = (new KReSCreateReasoner(originalowl)).getReasoner();
+ this.reasoner = (new CreateReasoner(originalowl)).getReasoner();
//Prepare the reasoner
this.reasoner.prepareReasoner();
@@ -187,7 +187,7 @@ public final class KReSRunRules {
* @param targetOntology {The OWLOntology model where to perform the SWRL rule reasoner.}
* @param reasonerurl {The url of the the reasoner server end-point.}
*/
- public KReSRunRules(Model SWRLruleOntology, OWLOntology targetOntology, URL reasonerurl){
+ public RunRules(Model SWRLruleOntology, OWLOntology targetOntology, URL reasonerurl){
JenaToOwlConvert j2o = new JenaToOwlConvert();
OntModel jenamodel = ModelFactory.createOntologyModel();
jenamodel.add(SWRLruleOntology);
@@ -204,7 +204,7 @@ public final class KReSRunRules {
owlmanager.applyChanges(additions);
//Create the reasoner
- this.reasoner = (new KReSCreateReasoner(originalowl,reasonerurl)).getReasoner();
+ this.reasoner = (new CreateReasoner(originalowl,reasonerurl)).getReasoner();
//Prepare the reasoner
this.reasoner.prepareReasoner();
Copied: incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ReasonerImpl.java (from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/KReSReasonerImpl.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ReasonerImpl.java?p2=incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ReasonerImpl.java&p1=incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/KReSReasonerImpl.java&r1=1085259&r2=1085385&rev=1085385&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/KReSReasonerImpl.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/src/main/java/org/apache/stanbol/reasoners/base/impl/ReasonerImpl.java Fri Mar 25 14:12:04 2011
@@ -6,10 +6,10 @@ import org.apache.felix.scr.annotations.
import org.apache.felix.scr.annotations.Component;
import org.apache.felix.scr.annotations.Deactivate;
import org.apache.felix.scr.annotations.Service;
-import org.apache.stanbol.reasoners.base.api.KReSReasoner;
-import org.apache.stanbol.reasoners.base.commands.KReSCreateReasoner;
-import org.apache.stanbol.reasoners.base.commands.KReSRunReasoner;
-import org.apache.stanbol.reasoners.base.commands.KReSRunRules;
+import org.apache.stanbol.reasoners.base.api.Reasoner;
+import org.apache.stanbol.reasoners.base.commands.CreateReasoner;
+import org.apache.stanbol.reasoners.base.commands.RunReasoner;
+import org.apache.stanbol.reasoners.base.commands.RunRules;
import org.osgi.service.component.ComponentContext;
import org.semanticweb.owlapi.model.OWLOntology;
import org.semanticweb.owlapi.reasoner.OWLReasoner;
@@ -17,8 +17,8 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@Component(immediate = true, metatype = true)
-@Service(KReSReasoner.class)
-public class KReSReasonerImpl implements KReSReasoner {
+@Service(Reasoner.class)
+public class ReasonerImpl implements Reasoner {
private final Logger log = LoggerFactory.getLogger(getClass());
@@ -28,11 +28,11 @@ public class KReSReasonerImpl implements
* <p>
* DO NOT USE to manually create instances - the KReSRuleStore instances do
* need to be configured! YOU NEED TO USE
- * {@link #KReSReasonerImpl(Dictionary)} or its overloads, to parse the
+ * {@link #ReasonerImpl(Dictionary)} or its overloads, to parse the
* configuration and then initialise the rule store if running outside a
* OSGI environment.
*/
- public KReSReasonerImpl() {
+ public ReasonerImpl() {
}
/**
@@ -40,7 +40,7 @@ public class KReSReasonerImpl implements
* default constructor.
*
*/
- public KReSReasonerImpl(Dictionary<String, Object> configuration) {
+ public ReasonerImpl(Dictionary<String, Object> configuration) {
// Always call activate(Dictionary) in the constructor as a golden rule.
activate(configuration);
}
@@ -48,7 +48,7 @@ public class KReSReasonerImpl implements
@SuppressWarnings("unchecked")
@Activate
protected void activate(ComponentContext context) {
- log.info("in " + KReSReasonerImpl.class + " activate with context "
+ log.info("in " + ReasonerImpl.class + " activate with context "
+ context);
if (context == null) {
throw new IllegalStateException("No valid" + ComponentContext.class
@@ -63,35 +63,35 @@ public class KReSReasonerImpl implements
/*
* (non-Javadoc)
- * @see eu.iksproject.kres.api.reasoners.KReSReasoner#consistencyCheck(org.semanticweb.owlapi.reasoner.OWLReasoner)
+ * @see eu.iksproject.kres.api.reasoners.Reasoner#consistencyCheck(org.semanticweb.owlapi.reasoner.OWLReasoner)
*/
public boolean consistencyCheck(OWLReasoner owlReasoner){
- KReSRunReasoner kReSRunReasoner = new KReSRunReasoner(owlReasoner);
+ RunReasoner kReSRunReasoner = new RunReasoner(owlReasoner);
return kReSRunReasoner.isConsistent();
}
@Deactivate
protected void deactivate(ComponentContext context) {
- log.info("in " + KReSReasonerImpl.class + " deactivate with context "
+ log.info("in " + ReasonerImpl.class + " deactivate with context "
+ context);
}
/*
* (non-Javadoc)
- * @see eu.iksproject.kres.api.reasoners.KReSReasoner#getReasoner(org.semanticweb.owlapi.model.OWLOntology)
+ * @see eu.iksproject.kres.api.reasoners.Reasoner#getReasoner(org.semanticweb.owlapi.model.OWLOntology)
*/
public OWLReasoner getReasoner(OWLOntology ontology) {
- KReSCreateReasoner kReSCreateReasoner = new KReSCreateReasoner(ontology);
+ CreateReasoner kReSCreateReasoner = new CreateReasoner(ontology);
return kReSCreateReasoner.getReasoner();
}
/*
* (non-Javadoc)
- * @see eu.iksproject.kres.api.reasoners.KReSReasoner#runRules(org.semanticweb.owlapi.model.OWLOntology, org.semanticweb.owlapi.model.OWLOntology)
+ * @see eu.iksproject.kres.api.reasoners.Reasoner#runRules(org.semanticweb.owlapi.model.OWLOntology, org.semanticweb.owlapi.model.OWLOntology)
*/
@Override
public OWLOntology runRules(OWLOntology ontology, OWLOntology ruleOntology){
- KReSRunRules kReSRunRules = new KReSRunRules(ruleOntology, ontology);
+ RunRules kReSRunRules = new RunRules(ruleOntology, ontology);
return kReSRunRules.runRulesReasoner();
}
Copied: incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/RunReasonerTest.java (from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/KReSRunReasonerTest.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/RunReasonerTest.java?p2=incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/RunReasonerTest.java&p1=incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/KReSRunReasonerTest.java&r1=1085259&r2=1085385&rev=1085385&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/KReSRunReasonerTest.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/RunReasonerTest.java Fri Mar 25 14:12:04 2011
@@ -11,8 +11,8 @@ import java.io.File;
import java.util.Iterator;
import java.util.Set;
-import org.apache.stanbol.reasoners.base.commands.KReSCreateReasoner;
-import org.apache.stanbol.reasoners.base.commands.KReSRunReasoner;
+import org.apache.stanbol.reasoners.base.commands.CreateReasoner;
+import org.apache.stanbol.reasoners.base.commands.RunReasoner;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -31,12 +31,12 @@ import org.semanticweb.owlapi.util.Infer
*
* @author elvio
*/
-public class KReSRunReasonerTest {
+public class RunReasonerTest {
public OWLOntologyManager owlmanager;
public OWLOntology owl;
- public KReSRunReasonerTest() throws OWLOntologyCreationException {
+ public RunReasonerTest() throws OWLOntologyCreationException {
this.owlmanager = OWLManager.createOWLOntologyManager();
this.owl = owlmanager.loadOntologyFromOntologyDocument(new File("./src/main/resources/TestFile/ProvaParent.owl"));
}
@@ -60,19 +60,19 @@ public class KReSRunReasonerTest {
/**
- * Test of runClassifyInference method, of class KReSRunReasoner.
+ * Test of runClassifyInference method, of class RunReasoner.
*/
@Test
public void testRunClassifyInference_arg0() throws OWLOntologyCreationException {
OWLOntology inf = OWLManager.createOWLOntologyManager().createOntology(owl.getOntologyID());
- KReSCreateReasoner reasoner = new KReSCreateReasoner(owl);
- KReSRunReasoner instance = new KReSRunReasoner(reasoner.getReasoner());
+ CreateReasoner reasoner = new CreateReasoner(owl);
+ RunReasoner instance = new RunReasoner(reasoner.getReasoner());
inf = instance.runClassifyInference(inf);
- KReSCreateReasoner reasonerforcheck = new KReSCreateReasoner(inf);
- KReSRunReasoner run = new KReSRunReasoner(reasonerforcheck.getReasoner());
+ CreateReasoner reasonerforcheck = new CreateReasoner(inf);
+ RunReasoner run = new RunReasoner(reasonerforcheck.getReasoner());
System.out.println(":::::::::::::::: consistency check "+run.isConsistent());
int ax = inf.getAxiomCount();
@@ -87,19 +87,19 @@ public class KReSRunReasonerTest {
}
/**
- * Test of runClassifyInference method, of class KReSRunReasoner.
+ * Test of runClassifyInference method, of class RunReasoner.
*/
@Test
public void testRunClassifyInference() throws OWLOntologyCreationException {
int contin = owl.getAxiomCount();
- KReSCreateReasoner reasoner = new KReSCreateReasoner(owl);
- KReSRunReasoner instance = new KReSRunReasoner(reasoner.getReasoner());
+ CreateReasoner reasoner = new CreateReasoner(owl);
+ RunReasoner instance = new RunReasoner(reasoner.getReasoner());
owl = instance.runClassifyInference(owl);
- KReSCreateReasoner reasonerforcheck = new KReSCreateReasoner(owl);
- KReSRunReasoner run = new KReSRunReasoner(reasonerforcheck.getReasoner());
+ CreateReasoner reasonerforcheck = new CreateReasoner(owl);
+ RunReasoner run = new RunReasoner(reasonerforcheck.getReasoner());
System.out.println(":::::::::::::::: consistency check "+run.isConsistent());
int ax = owl.getAxiomCount();
@@ -114,14 +114,14 @@ public class KReSRunReasonerTest {
}
/**
- * Test of isConsistence method, of class KReSRunReasoner.
+ * Test of isConsistence method, of class RunReasoner.
*/
@Test
public void testIsConsistence() {
OWLReasoner expris = (new ReasonerFactory()).createReasoner(owl);
expris.prepareReasoner();
- KReSCreateReasoner reasoner = new KReSCreateReasoner(owl);
- KReSRunReasoner instance = new KReSRunReasoner(reasoner.getReasoner());
+ CreateReasoner reasoner = new CreateReasoner(owl);
+ RunReasoner instance = new RunReasoner(reasoner.getReasoner());
boolean expResult = expris.isConsistent();
boolean result = instance.isConsistent();
if(result){
@@ -133,16 +133,16 @@ public class KReSRunReasonerTest {
}
/**
- * Test of runGeneralInference method, of class KReSRunReasoner.
+ * Test of runGeneralInference method, of class RunReasoner.
*/
@Test
public void testRunGeneralInference_0args(){
- KReSCreateReasoner reasoner = new KReSCreateReasoner(owl);
- KReSRunReasoner instance = new KReSRunReasoner(reasoner.getReasoner());
+ CreateReasoner reasoner = new CreateReasoner(owl);
+ RunReasoner instance = new RunReasoner(reasoner.getReasoner());
OWLOntology result = instance.runGeneralInference();
- KReSCreateReasoner reasonerforcheck = new KReSCreateReasoner(result);
- KReSRunReasoner run = new KReSRunReasoner(reasonerforcheck.getReasoner());
+ CreateReasoner reasonerforcheck = new CreateReasoner(result);
+ RunReasoner run = new RunReasoner(reasonerforcheck.getReasoner());
System.out.println(":::::::::::::::: consistency check "+run.isConsistent());
OWLReasoner expris = (new ReasonerFactory()).createReasoner(owl);
@@ -170,17 +170,17 @@ public class KReSRunReasonerTest {
}
/**
- * Test of runGeneralInference method, of class KReSRunReasoner.
+ * Test of runGeneralInference method, of class RunReasoner.
*/
@Test
public void testRunGeneralInference_OWLOntology() throws OWLOntologyCreationException {
OWLOntology newmodel = OWLManager.createOWLOntologyManager().createOntology(owl.getOntologyID());
- KReSCreateReasoner reasoner = new KReSCreateReasoner(owl);
- KReSRunReasoner instance = new KReSRunReasoner(reasoner.getReasoner());
+ CreateReasoner reasoner = new CreateReasoner(owl);
+ RunReasoner instance = new RunReasoner(reasoner.getReasoner());
OWLOntology result = instance.runGeneralInference(newmodel);
- KReSCreateReasoner reasonerforcheck = new KReSCreateReasoner(result);
- KReSRunReasoner run = new KReSRunReasoner(reasonerforcheck.getReasoner());
+ CreateReasoner reasonerforcheck = new CreateReasoner(result);
+ RunReasoner run = new RunReasoner(reasonerforcheck.getReasoner());
System.out.println(":::::::::::::::: consistency check "+run.isConsistent());
OWLReasoner expris = (new ReasonerFactory()).createReasoner(owl);
Copied: incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/RunRulesTest.java (from r1085259, incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/KReSRunRulesTest.java)
URL: http://svn.apache.org/viewvc/incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/RunRulesTest.java?p2=incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/RunRulesTest.java&p1=incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/KReSRunRulesTest.java&r1=1085259&r2=1085385&rev=1085385&view=diff
==============================================================================
--- incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/KReSRunRulesTest.java (original)
+++ incubator/stanbol/trunk/kres/reasoners/base/src/test/java/org/apache/stanbol/reasoners/base/RunRulesTest.java Fri Mar 25 14:12:04 2011
@@ -11,9 +11,9 @@ import java.io.File;
import java.io.IOException;
import java.util.Iterator;
-import org.apache.stanbol.reasoners.base.commands.KReSCreateReasoner;
-import org.apache.stanbol.reasoners.base.commands.KReSRunReasoner;
-import org.apache.stanbol.reasoners.base.commands.KReSRunRules;
+import org.apache.stanbol.reasoners.base.commands.CreateReasoner;
+import org.apache.stanbol.reasoners.base.commands.RunReasoner;
+import org.apache.stanbol.reasoners.base.commands.RunRules;
import org.junit.After;
import org.junit.AfterClass;
import org.junit.Before;
@@ -32,7 +32,7 @@ import com.hp.hpl.jena.rdf.model.ModelFa
*
* @author elvio
*/
-public class KReSRunRulesTest {
+public class RunRulesTest {
public OWLOntologyManager owlmanagertarget;
public OWLOntologyManager owlnamagerswrlt;
@@ -40,7 +40,7 @@ public class KReSRunRulesTest {
public OWLOntology owlswrl;
public OntModel jenaswrl;
- public KReSRunRulesTest() throws OWLOntologyCreationException, IOException {
+ public RunRulesTest() throws OWLOntologyCreationException, IOException {
this.owltarget = OWLManager.createOWLOntologyManager().loadOntologyFromOntologyDocument(new File("./src/main/resources/TestFile/ProvaParent.owl"));
this.owlswrl = OWLManager.createOWLOntologyManager().loadOntologyFromOntologyDocument(new File("./src/main/resources/TestFile/OnlyRuledProvaParent.owl"));
this.owlmanagertarget = owltarget.getOWLOntologyManager();
@@ -66,18 +66,18 @@ public class KReSRunRulesTest {
}
/**
- * Test of runRulesReasoner method, of class KReSRunRules.
+ * Test of runRulesReasoner method, of class RunRules.
*/
@Test
public void testRunRulesReasoner_OWLOntology_1() throws OWLOntologyCreationException{
OWLOntology newmodel = OWLManager.createOWLOntologyManager().createOntology(owltarget.getOntologyID());
- KReSRunRules instance = new KReSRunRules(owlswrl,owltarget);
+ RunRules instance = new RunRules(owlswrl,owltarget);
newmodel = instance.runRulesReasoner(newmodel);
- KReSCreateReasoner reasonerforcheck = new KReSCreateReasoner(newmodel);
- KReSRunReasoner run = new KReSRunReasoner(reasonerforcheck.getReasoner());
+ CreateReasoner reasonerforcheck = new CreateReasoner(newmodel);
+ RunReasoner run = new RunReasoner(reasonerforcheck.getReasoner());
System.out.println(":::::::::::::::: consistency check "+run.isConsistent());
Iterator<OWLAxiom> axiom = newmodel.getAxioms().iterator();
@@ -108,16 +108,16 @@ public class KReSRunRulesTest {
}
/**
- * Test of runRulesReasoner method, of class KReSRunRules.
+ * Test of runRulesReasoner method, of class RunRules.
*/
@Test
public void testRunRulesReasoner_0args_1(){
- KReSRunRules instance = new KReSRunRules(owlswrl,owltarget);
+ RunRules instance = new RunRules(owlswrl,owltarget);
OWLOntology newmodel = instance.runRulesReasoner();
- KReSCreateReasoner reasonerforcheck = new KReSCreateReasoner(newmodel);
- KReSRunReasoner run = new KReSRunReasoner(reasonerforcheck.getReasoner());
+ CreateReasoner reasonerforcheck = new CreateReasoner(newmodel);
+ RunReasoner run = new RunReasoner(reasonerforcheck.getReasoner());
System.out.println(":::::::::::::::: consistency check "+run.isConsistent());
Iterator<OWLAxiom> axiom = newmodel.getAxioms().iterator();
@@ -137,18 +137,18 @@ public class KReSRunRulesTest {
}
/**
- * Test of runRulesReasoner method, of class KReSRunRules.
+ * Test of runRulesReasoner method, of class RunRules.
*/
@Test
public void testRunRulesReasoner_OWLOntology_2() throws OWLOntologyCreationException {
OWLOntology newmodel = OWLManager.createOWLOntologyManager().createOntology(owltarget.getOntologyID());
- KReSRunRules instance = new KReSRunRules(jenaswrl.getBaseModel(),owltarget);
+ RunRules instance = new RunRules(jenaswrl.getBaseModel(),owltarget);
newmodel = instance.runRulesReasoner(newmodel);
- KReSCreateReasoner reasonerforcheck = new KReSCreateReasoner(newmodel);
- KReSRunReasoner run = new KReSRunReasoner(reasonerforcheck.getReasoner());
+ CreateReasoner reasonerforcheck = new CreateReasoner(newmodel);
+ RunReasoner run = new RunReasoner(reasonerforcheck.getReasoner());
System.out.println(":::::::::::::::: consistency check "+run.isConsistent());
Iterator<OWLAxiom> axiom = newmodel.getAxioms().iterator();
@@ -179,16 +179,16 @@ public class KReSRunRulesTest {
}
/**
- * Test of runRulesReasoner method, of class KReSRunRules.
+ * Test of runRulesReasoner method, of class RunRules.
*/
@Test
public void testRunRulesReasoner_0args_2(){
- KReSRunRules instance = new KReSRunRules(jenaswrl,owltarget);
+ RunRules instance = new RunRules(jenaswrl,owltarget);
OWLOntology newmodel = instance.runRulesReasoner();
- KReSCreateReasoner reasonerforcheck = new KReSCreateReasoner(newmodel);
- KReSRunReasoner run = new KReSRunReasoner(reasonerforcheck.getReasoner());
+ CreateReasoner reasonerforcheck = new CreateReasoner(newmodel);
+ RunReasoner run = new RunReasoner(reasonerforcheck.getReasoner());
System.out.println(":::::::::::::::: consistency check "+run.isConsistent());
Iterator<OWLAxiom> axiom = newmodel.getAxioms().iterator();