[DL-Learner SVN] SF.net SVN: dl-learner:[3800] trunk/components-core

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

Revision: 3800
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3800&view=rev
Author:   lorenz_b
Date:     2012-07-20 12:43:03 +0000 (Fri, 20 Jul 2012)
Log Message:
-----------
Updated ELK dependency. Fixed problem in SPARQL reasoner.

Modified Paths:
--------------
    trunk/components-core/pom.xml
    trunk/components-core/src/main/java/org/dllearner/algorithms/properties/ObjectPropertyDomainAxiomLearner.java
    trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java

Modified: trunk/components-core/pom.xml
===================================================================
--- trunk/components-core/pom.xml	2012-07-19 08:12:17 UTC (rev 3799)
+++ trunk/components-core/pom.xml	2012-07-20 12:43:03 UTC (rev 3800)
@@ -230,7 +230,7 @@
         <dependency>
         	<groupId>org.semanticweb.elk</groupId>
         	<artifactId>elk-owlapi</artifactId>
-        	<version>0.2.0</version>
+        	<version>0.3.0</version>
         </dependency>
            <dependency>
         	<groupId>de.tudresden.inf.lat.cel</groupId>

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/properties/ObjectPropertyDomainAxiomLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/properties/ObjectPropertyDomainAxiomLearner.java	2012-07-19 08:12:17 UTC (rev 3799)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/properties/ObjectPropertyDomainAxiomLearner.java	2012-07-20 12:43:03 UTC (rev 3800)
@@ -190,7 +190,7 @@
 		
 		ObjectPropertyDomainAxiomLearner l = new ObjectPropertyDomainAxiomLearner(ks);
 		l.setReasoner(reasoner);
-		l.setPropertyToDescribe(new ObjectProperty("http://dbpedia.org/ontology/creator"));
+		l.setPropertyToDescribe(new ObjectProperty("http://dbpedia.org/ontology/grammyAward"));
 		l.setMaxExecutionTimeInSeconds(40);
 		l.addFilterNamespace("http://dbpedia.org/ontology/");
 //		l.setReturnOnlyNewAxioms(true);

Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java	2012-07-19 08:12:17 UTC (rev 3799)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/SPARQLReasoner.java	2012-07-20 12:43:03 UTC (rev 3800)
@@ -108,15 +108,20 @@
 		if(useCache){
 			cache = new ExtractionDBCache("cache");
 		}
+		classPopularityMap = new HashMap<NamedClass, Integer>();
 	}
 	
 	public SPARQLReasoner(SparqlEndpointKS ks, ExtractionDBCache cache) {
 		this.ks = ks;
 		this.cache = cache;
+		
+		classPopularityMap = new HashMap<NamedClass, Integer>();
 	}
 	
 	public SPARQLReasoner(OntModel model) {
 		this.model = model;
+		
+		classPopularityMap = new HashMap<NamedClass, Integer>();
 	}
 	
 	public void precomputePopularity(){
@@ -127,7 +132,6 @@
 	
 	public void precomputeClassPopularity(){
 		logger.info("Precomputing class popularity ...");
-		classPopularityMap = new HashMap<NamedClass, Integer>();
 		
 		Set<NamedClass> classes = new SPARQLTasks(ks.getEndpoint()).getAllClasses();
 		String queryTemplate = "SELECT (COUNT(*) AS ?cnt) WHERE {?s a <%s>}";
@@ -197,7 +201,7 @@
 	}
 	
 	public int getPopularity(NamedClass nc){
-		if(classPopularityMap.containsKey(nc)){
+		if(classPopularityMap != null && classPopularityMap.containsKey(nc)){
 			return classPopularityMap.get(nc);
 		} else {
 			System.out.println("Cache miss: " + nc);

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