[DL-Learner SVN] SF.net SVN: dl-learner:[3943] trunk

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

Revision: 3943
          http://sourceforge.net/p/dl-learner/code/3943
Author:   lorenz_b
Date:     2013-05-04 09:36:21 +0000 (Sat, 04 May 2013)
Log Message:
-----------
Ignore illegal axioms?

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/pattern/OWLAxiomRenamer.java
    trunk/scripts/src/main/java/org/dllearner/scripts/OWLAxiomPatternDetectionEvaluation.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/pattern/OWLAxiomRenamer.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/pattern/OWLAxiomRenamer.java	2013-05-04 06:14:53 UTC (rev 3942)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/pattern/OWLAxiomRenamer.java	2013-05-04 09:36:21 UTC (rev 3943)
@@ -8,6 +8,7 @@
 import java.util.Set;
 import java.util.TreeSet;
 
+import org.semanticweb.owlapi.model.IRI;
 import org.semanticweb.owlapi.model.OWLAnnotationAssertionAxiom;
 import org.semanticweb.owlapi.model.OWLAnnotationPropertyDomainAxiom;
 import org.semanticweb.owlapi.model.OWLAnnotationPropertyRangeAxiom;
@@ -66,6 +67,8 @@
 	private OWLClassExpressionRenamer expressionRenamer;
 	private OWLAxiom renamedAxiom;
 	
+	private boolean normalizeABoxAxioms = true;
+	
 	public OWLAxiomRenamer(OWLDataFactory df) {
 		this.df = df;
 	}
@@ -163,8 +166,13 @@
 	@Override
 	public void visit(OWLDifferentIndividualsAxiom axiom) {
 		Set<OWLIndividual> renamedIndividuals = new HashSet<OWLIndividual>();
-		for(OWLIndividual ind : axiom.getIndividuals()){
-			renamedIndividuals.add(expressionRenamer.rename(ind));
+		if(normalizeABoxAxioms){
+			renamedIndividuals.add(df.getOWLNamedIndividual(IRI.create("http://dl-learner.org/pattern/a")));
+			renamedIndividuals.add(df.getOWLNamedIndividual(IRI.create("http://dl-learner.org/pattern/b")));
+		} else {
+			for(OWLIndividual ind : axiom.getIndividuals()){
+				renamedIndividuals.add(expressionRenamer.rename(ind));
+			}
 		}
 		renamedAxiom = df.getOWLDifferentIndividualsAxiom(renamedIndividuals);
 	}
@@ -333,8 +341,13 @@
 	@Override
 	public void visit(OWLSameIndividualAxiom axiom) {
 		Set<OWLIndividual> renamedIndividuals = new HashSet<OWLIndividual>();
-		for(OWLIndividual ind : axiom.getIndividuals()){
-			renamedIndividuals.add(expressionRenamer.rename(ind));
+		if(normalizeABoxAxioms){
+			renamedIndividuals.add(df.getOWLNamedIndividual(IRI.create("http://dl-learner.org/pattern/a")));
+			renamedIndividuals.add(df.getOWLNamedIndividual(IRI.create("http://dl-learner.org/pattern/b")));
+		} else {
+			for(OWLIndividual ind : axiom.getIndividuals()){
+				renamedIndividuals.add(expressionRenamer.rename(ind));
+			}
 		}
 		renamedAxiom = df.getOWLSameIndividualAxiom(renamedIndividuals);
 	}

Modified: trunk/scripts/src/main/java/org/dllearner/scripts/OWLAxiomPatternDetectionEvaluation.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/OWLAxiomPatternDetectionEvaluation.java	2013-05-04 06:14:53 UTC (rev 3942)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/OWLAxiomPatternDetectionEvaluation.java	2013-05-04 09:36:21 UTC (rev 3943)
@@ -72,7 +72,7 @@
 	
 	public void run(Collection<OntologyRepository> repositories){
 		//analyze repositories
-		analyze(repositories);
+//		analyze(repositories);
 		
 		//create statistics for the repositories
 		makeRepositoryStatistics(repositories);
@@ -245,8 +245,9 @@
 			OWLAxiom axiom = entry.getKey();
 			Integer frequency = entry.getValue();
 			
-			latexTable += axiomRenderer.render(axiom) + " & " + frequency + "\\\\\n";
-			
+			if(axiom != null){
+				latexTable += axiomRenderer.render(axiom) + " & " + frequency + "\\\\\n";
+			}
 		}
 		latexTable += "\\bottomrule\\end{tabular}\n";
 		latexTable += "\\caption{" + title + "}\n";
@@ -403,7 +404,7 @@
 	
 	private OWLAxiom asOWLAxiom(String functionalSyntaxAxiomString){
 		try {
-			StringDocumentSource s = new StringDocumentSource("Ontology(<http://www.pattern.org>" + functionalSyntaxAxiomString + ")");
+			StringDocumentSource s = new StringDocumentSource("Ontology(<http://www.pattern.org> " + functionalSyntaxAxiomString + ")");
 			OWLFunctionalSyntaxOWLParser p = new OWLFunctionalSyntaxOWLParser();
 			OWLOntology newOntology = OWLManager.createOWLOntologyManager().createOntology();
 			p.parse(s, newOntology);
@@ -415,7 +416,7 @@
 		} catch (OWLOntologyCreationException e) {
 			e.printStackTrace();
 		} catch (OWLParserException e) {
-			e.printStackTrace();
+			System.err.println("Parsing failed for axiom " + functionalSyntaxAxiomString);
 		} catch (IOException e) {
 			e.printStackTrace();
 		}

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