[DL-Learner SVN] SF.net SVN: dl-learner:[1984] trunk/src/dl-learner/org/dllearner/tools/ore

[<lor...@us...>]

Revision: 1984
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=1984&view=rev
Author:   lorenz_b
Date:     2010-01-05 11:17:30 +0000 (Tue, 05 Jan 2010)

Log Message:
-----------
Fixed bug caused by forgetting to keep track of imports.

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/tools/ore/ExplanationManager.java
    trunk/src/dl-learner/org/dllearner/tools/ore/explanation/CachedExplanationGenerator.java
    trunk/src/dl-learner/org/dllearner/tools/ore/explanation/PelletExplanationGenerator.java
    trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/InconsistencyExplanationPanelDescriptor.java

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ExplanationManager.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ExplanationManager.java	2010-01-04 11:01:47 UTC (rev 1983)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ExplanationManager.java	2010-01-05 11:17:30 UTC (rev 1984)
@@ -61,7 +61,8 @@
 		OREManager.getInstance().addListener(this);
 		this.reasoner = oreMan.getReasoner().getReasoner();
 		this.manager = reasoner.getManager();
-		this.ontology = reasoner.getLoadedOntologies().iterator().next();
+		this.ontology = oreMan.getReasoner().getOWLAPIOntologies();
+		System.out.println(ontology);
 		
 		dataFactory = manager.getOWLDataFactory();
 		
@@ -74,7 +75,7 @@
 
 		listeners = new ArrayList<ExplanationManagerListener>();
 		
-		gen = new CachedExplanationGenerator(ontology, reasoner);
+		gen = new CachedExplanationGenerator(reasoner.getLoadedOntologies());
 
 	}
 	
@@ -304,9 +305,9 @@
 
 	@Override
 	public void activeOntologyChanged() {
+		reasoner = OREManager.getInstance().getReasoner().getReasoner();
 		ontology = OREManager.getInstance().getReasoner().getOWLAPIOntologies();
-		reasoner = OREManager.getInstance().getReasoner().getReasoner();
-		gen = new CachedExplanationGenerator(ontology, reasoner);
+		gen = new CachedExplanationGenerator(reasoner.getLoadedOntologies());
 		orderingMap.clear();
 		usageChecker = new AxiomUsageChecker(ontology);
 	}

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/CachedExplanationGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/CachedExplanationGenerator.java	2010-01-04 11:01:47 UTC (rev 1983)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/CachedExplanationGenerator.java	2010-01-05 11:17:30 UTC (rev 1984)
@@ -15,7 +15,6 @@
 import org.dllearner.tools.ore.TaskManager;
 import org.dllearner.tools.ore.explanation.laconic.LaconicExplanationGenerator;
 import org.mindswap.pellet.owlapi.PelletReasonerFactory;
-import org.mindswap.pellet.owlapi.Reasoner;
 import org.semanticweb.owl.apibinding.OWLManager;
 import org.semanticweb.owl.model.OWLAxiom;
 import org.semanticweb.owl.model.OWLOntology;
@@ -46,11 +45,11 @@
 	
 	private ExplanationType explanationType = ExplanationType.REGULAR;
 	
-	private OWLOntology ontology;
+	private Set<OWLOntology> ontologies;
 	private OWLOntologyManager manager;
 
-	public CachedExplanationGenerator(OWLOntology ontology, Reasoner reasoner){
-		this.ontology = ontology;
+	public CachedExplanationGenerator(Set<OWLOntology> ontologies){
+		this.ontologies = ontologies;
 		this.manager = OWLManager.createOWLOntologyManager();
 		
 		axiom2Module = new HashMap<OWLAxiom, OWLOntology>();
@@ -199,7 +198,7 @@
 		if(explanations == null || lastRequestedSize.intValue() != -1 && lastRequestedSize.intValue() < limit){
 			OWLOntology module = axiom2Module.get(entailment);
 			if(module == null){
-				module = OntologyUtils.getOntologyFromAxioms(ModularityUtils.extractModule(Collections.singleton(ontology), entailment.getSignature(), ModuleType.TOP_OF_BOT));
+				module = OntologyUtils.getOntologyFromAxioms(ModularityUtils.extractModule(ontologies, entailment.getSignature(), ModuleType.TOP_OF_BOT));
 			}
 			axiom2Module.put(entailment, module);
 			laconicExpGen = new LaconicExplanationGenerator(manager, new PelletReasonerFactory(), Collections.singleton(module));
@@ -239,7 +238,7 @@
 		if(explanations == null || lastRequestedSize.intValue() != -1 && lastRequestedSize.intValue() < limit){
 			OWLOntology module = axiom2Module.get(entailment);
 			if(module == null){
-				module = OntologyUtils.getOntologyFromAxioms(ModularityUtils.extractModule(Collections.singleton(ontology), entailment.getSignature(), ModuleType.TOP_OF_BOT));
+				module = OntologyUtils.getOntologyFromAxioms(ModularityUtils.extractModule(ontologies, entailment.getSignature(), ModuleType.TOP_OF_BOT));
 			}
 			axiom2Module.put(entailment, module);
 			regularExpGen = new PelletExplanationGenerator(manager, Collections.singleton(module));

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/explanation/PelletExplanationGenerator.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/explanation/PelletExplanationGenerator.java	2010-01-04 11:01:47 UTC (rev 1983)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/explanation/PelletExplanationGenerator.java	2010-01-05 11:17:30 UTC (rev 1984)
@@ -55,7 +55,7 @@
 		// If there is no existing reasoner create a new one and load the ontologies 
 		if( reasoner == null ) {
 			reasoner = new Reasoner( manager );
-			reasoner.loadOntologies( ontologies );
+			reasoner.loadOntologies( manager.getImportsClosure(ontologies.iterator().next()));
 		}
 
 		// Create a single explanation generator
@@ -69,7 +69,7 @@
 		// Set the necessary fields		
 		expGen.setReasonerFactory( new PelletReasonerFactory() );
 		expGen.setReasoner( reasoner );
-		expGen.setOntologies( ontologies );
+		expGen.setOntologies( manager.getImportsClosure(ontologies.iterator().next()) );
 		
 		// Create the converter that will translate axioms into class expressions
 		converter = new SatisfiabilityConverter( manager.getOWLDataFactory() );

Modified: trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/InconsistencyExplanationPanelDescriptor.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/InconsistencyExplanationPanelDescriptor.java	2010-01-04 11:01:47 UTC (rev 1983)
+++ trunk/src/dl-learner/org/dllearner/tools/ore/ui/wizard/descriptors/InconsistencyExplanationPanelDescriptor.java	2010-01-05 11:17:30 UTC (rev 1984)
@@ -64,6 +64,7 @@
     }
     
     private void setNextButtonEnabled2ConsistentOntology(){
+    	reasoner.refresh();
     	if(reasoner.isConsistent()){
     		getWizard().setNextFinishButtonEnabled(true);
     	} else {


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.