[DL-Learner SVN] SF.net SVN: dl-learner:[4005] trunk/interfaces/src/main/java/org/dllearner/ cli/Enrichment.java

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

Revision: 4005
          http://sourceforge.net/p/dl-learner/code/4005
Author:   lorenz_b
Date:     2013-06-27 18:31:00 +0000 (Thu, 27 Jun 2013)
Log Message:
-----------
Updated enrichment script.

Modified Paths:
--------------
    trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java

Modified: trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java
===================================================================
--- trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java	2013-06-21 13:36:20 UTC (rev 4004)
+++ trunk/interfaces/src/main/java/org/dllearner/cli/Enrichment.java	2013-06-27 18:31:00 UTC (rev 4005)
@@ -52,13 +52,13 @@
 import java.util.List;
 import java.util.Map;
 import java.util.Map.Entry;
+import java.util.Set;
+import java.util.SortedSet;
 import java.util.concurrent.Callable;
 import java.util.concurrent.ExecutionException;
 import java.util.concurrent.ExecutorService;
 import java.util.concurrent.Executors;
 import java.util.concurrent.Future;
-import java.util.Set;
-import java.util.SortedSet;
 
 import joptsimple.OptionException;
 import joptsimple.OptionParser;
@@ -66,8 +66,6 @@
 import joptsimple.OptionSpec;
 
 import org.aksw.commons.jena_owlapi.Conversion;
-import org.aksw.jena_sparql_api.core.QueryExecutionFactory;
-import org.apache.jena.riot.Lang;
 import org.apache.jena.riot.checker.CheckerLiterals;
 import org.apache.jena.riot.system.ErrorHandlerFactory;
 import org.apache.log4j.ConsoleAppender;
@@ -75,7 +73,7 @@
 import org.apache.log4j.Logger;
 import org.apache.log4j.SimpleLayout;
 import org.coode.owlapi.manchesterowlsyntax.ManchesterOWLSyntaxOntologyFormat;
-import org.coode.owlapi.turtle.TurtleOntologyFormat;
+import org.dllearner.algorithms.DisjointClassesLearner;
 import org.dllearner.algorithms.celoe.CELOE;
 import org.dllearner.algorithms.properties.AsymmetricObjectPropertyAxiomLearner;
 import org.dllearner.algorithms.properties.DataPropertyDomainAxiomLearner;
@@ -158,9 +156,7 @@
 
 import com.clarkparsia.owlapiv3.XSD;
 import com.google.common.collect.Sets;
-import com.hp.hpl.jena.query.Query;
 import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.query.ResultSetFormatter;
 import com.hp.hpl.jena.rdf.model.Literal;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
@@ -306,7 +302,7 @@
 		dataPropertyAlgorithms.add(SubDataPropertyOfAxiomLearner.class);
 		
 		classAlgorithms = new LinkedList<Class<? extends LearningAlgorithm>>();
-//		classAlgorithms.add(DisjointClassesLearner.class);
+		classAlgorithms.add(DisjointClassesLearner.class);
 //		classAlgorithms.add(SimpleSubclassLearner.class);
 		classAlgorithms.add(CELOE.class);		
 		
@@ -359,26 +355,26 @@
 					break;
 				}	
 			}
-//			entities = 0;
-//			Set<ObjectProperty> objectProperties = st.getAllObjectProperties();
-//			filterByNamespaces(objectProperties);
-//			for(ObjectProperty property : objectProperties) {
-//				runObjectPropertyAlgorithms(ks, property);	
-//				entities++;
-//				if(maxEntitiesPerType != -1 && entities > maxEntitiesPerType) {
-//					break;
-//				}				
-//			}
-//			entities = 0;
-//			Set<DatatypeProperty> dataProperties = st.getAllDataProperties();
-//			filterByNamespaces(dataProperties);
-//			for(DatatypeProperty property : dataProperties) {
-//				runDataPropertyAlgorithms(ks, property);
-//				entities++;
-//				if(maxEntitiesPerType != -1 && entities > maxEntitiesPerType) {
-//					break;
-//				}					
-//			}
+			entities = 0;
+			Set<ObjectProperty> objectProperties = st.getAllObjectProperties();
+			filterByNamespaces(objectProperties);
+			for(ObjectProperty property : objectProperties) {
+				runObjectPropertyAlgorithms(ks, property);	
+				entities++;
+				if(maxEntitiesPerType != -1 && entities > maxEntitiesPerType) {
+					break;
+				}				
+			}
+			entities = 0;
+			Set<DatatypeProperty> dataProperties = st.getAllDataProperties();
+			filterByNamespaces(dataProperties);
+			for(DatatypeProperty property : dataProperties) {
+				runDataPropertyAlgorithms(ks, property);
+				entities++;
+				if(maxEntitiesPerType != -1 && entities > maxEntitiesPerType) {
+					break;
+				}					
+			}
 		} else {
 			if(resource instanceof ObjectProperty) {
 				System.out.println(resource + " appears to be an object property. Running appropriate algorithms.\n");

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