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

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

Revision: 3942
          http://sourceforge.net/p/dl-learner/code/3942
Author:   lorenz_b
Date:     2013-05-04 06:14:53 +0000 (Sat, 04 May 2013)
Log Message:
-----------
Some modifications in pattern detection script.

Modified Paths:
--------------
    trunk/components-core/pom.xml
    trunk/components-core/src/main/java/org/dllearner/algorithms/pattern/OWLAxiomPatternFinder.java
    trunk/scripts/src/main/java/org/dllearner/scripts/OntologyMatching.java

Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml	2013-05-04 05:50:47 UTC (rev 3941)
+++ trunk/components-core/pom.xml	2013-05-04 06:14:53 UTC (rev 3942)
@@ -124,7 +124,7 @@
 		<dependency>
 			<groupId>net.sourceforge.owlapi</groupId>
 			<artifactId>owlapi-distribution</artifactId>
-			<version>3.4</version>
+			<type>pom</type>
 		</dependency>
 		<dependency>
 			<groupId>net.sourceforge.owlapi</groupId>

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/pattern/OWLAxiomPatternFinder.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/pattern/OWLAxiomPatternFinder.java	2013-05-04 05:50:47 UTC (rev 3941)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/pattern/OWLAxiomPatternFinder.java	2013-05-04 06:14:53 UTC (rev 3942)
@@ -36,7 +36,6 @@
 import org.semanticweb.owlapi.model.OWLAxiom;
 import org.semanticweb.owlapi.model.OWLDataFactory;
 import org.semanticweb.owlapi.model.OWLFunctionalDataPropertyAxiom;
-import org.semanticweb.owlapi.model.OWLLogicalAxiom;
 import org.semanticweb.owlapi.model.OWLOntology;
 import org.semanticweb.owlapi.model.OWLOntologyAlreadyExistsException;
 import org.semanticweb.owlapi.model.OWLOntologyCreationException;
@@ -46,7 +45,6 @@
 
 import com.google.common.collect.HashMultiset;
 import com.google.common.collect.Multiset;
-import com.google.common.collect.Multisets;
 
 
 public class OWLAxiomPatternFinder {
@@ -363,19 +361,22 @@
 		Multiset<OWLAxiom> allAxiomPatterns = HashMultiset.create();
 		int i = 1;
 		for (OntologyRepositoryEntry entry : entries) {
-			System.out.print(i + ": ");
+			System.out.print(i++ + ": ");
 			URI uri = entry.getPhysicalURI();
 //			if(uri.toString().startsWith("http://rest.bioontology.org/bioportal/ontologies/download/42764")){
 			if (!ontologyProcessed(uri)) {
-				System.out.println("Loading \"" + entry.getOntologyShortName() + "\" from "+ uri);
+				System.out.print("Loading \"" + entry.getOntologyShortName() + "\" from "+ uri);
 				try {
 					manager = OWLManager.createOWLOntologyManager();
 					OWLOntology ontology = manager.loadOntology(IRI.create(uri));
 					Multiset<OWLAxiom> axiomPatterns = HashMultiset.create();
 					Set<OWLAxiom> logicalAxioms = new HashSet<OWLAxiom>();
 					for (AxiomType<?> type : AxiomType.AXIOM_TYPES) {
-						logicalAxioms.addAll(ontology.getAxioms(type, true));
+						if(type.isLogical()){
+							logicalAxioms.addAll(ontology.getAxioms(type, true));
+						}
 					}
+					System.out.println(" (" + logicalAxioms.size() + " axioms)");
 					for (OWLAxiom axiom : logicalAxioms) {
 						OWLAxiom renamedAxiom = renamer.rename(axiom);
 						axiomPatterns.add(renamedAxiom);

Modified: trunk/scripts/src/main/java/org/dllearner/scripts/OntologyMatching.java
===================================================================
--- trunk/scripts/src/main/java/org/dllearner/scripts/OntologyMatching.java	2013-05-04 05:50:47 UTC (rev 3941)
+++ trunk/scripts/src/main/java/org/dllearner/scripts/OntologyMatching.java	2013-05-04 06:14:53 UTC (rev 3942)
@@ -315,7 +315,7 @@
 	        logger.info("Done.");
 	        
 	        if(performCrossValidation){
-	        	org.dllearner.cli.CrossValidation cv = new org.dllearner.cli.CrossValidation(la, lp, rc, 5, false);
+//	        	org.dllearner.cli.CrossValidation cv = new org.dllearner.cli.CrossValidation(la, lp, rc, 5, false);
 			} else {
 				//apply the learning algorithm
 		        logger.info("Running learning algorithm...");

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