[DL-Learner SVN] SF.net SVN: dl-learner:[3049] trunk/components-core/src/main/java/org/ dllearner

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

Revision: 3049
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3049&view=rev
Author:   lorenz_b
Date:     2011-08-16 08:08:04 +0000 (Tue, 16 Aug 2011)

Log Message:
-----------
Continued subclass learner.
Added URI to Thing class.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/SimpleSubclassLearner.java
    trunk/components-core/src/main/java/org/dllearner/core/owl/Thing.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/SimpleSubclassLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/SimpleSubclassLearner.java	2011-08-15 22:15:14 UTC (rev 3048)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/SimpleSubclassLearner.java	2011-08-16 08:08:04 UTC (rev 3049)
@@ -44,6 +44,7 @@
 import org.dllearner.core.owl.NamedClass;
 import org.dllearner.core.owl.ObjectProperty;
 import org.dllearner.core.owl.ObjectPropertyDomainAxiom;
+import org.dllearner.core.owl.Thing;
 import org.dllearner.kb.SparqlEndpointKS;
 import org.dllearner.kb.sparql.SparqlEndpoint;
 import org.dllearner.kb.sparql.SparqlQuery;
@@ -87,8 +88,11 @@
 
 	@Override
 	public List<Description> getCurrentlyBestDescriptions(int nrOfDescriptions) {
-		// TODO Auto-generated method stub
-		return null;
+		List<Description> bestDescriptions = new ArrayList<Description>();
+		for(EvaluatedDescription evDesc : getCurrentlyBestEvaluatedDescriptions(nrOfDescriptions)){
+			bestDescriptions.add(evDesc.getDescription());
+		}
+		return bestDescriptions;
 	}
 
 	@Override
@@ -105,6 +109,13 @@
 		fetchedRows = 0;
 		currentlyBestEvaluatedDescriptions = new ArrayList<EvaluatedDescription>();
 		
+		//get existing super classes
+		SortedSet<Description> existingSuperClasses = reasoner.getSuperClasses(classToDescribe);
+		if(!existingSuperClasses.isEmpty()){
+			logger.info("Existing super classes: " + existingSuperClasses);
+		}
+		
+		
 		Map<Individual, SortedSet<NamedClass>> ind2Types = new HashMap<Individual, SortedSet<NamedClass>>();
 		int limit = 1000;
 		while(!terminationCriteriaSatisfied()){
@@ -114,7 +125,7 @@
 		}
 
 		
-		logger.info("...finished in {}ms.", (System.currentTimeMillis()-startTime));
+		logger.info("...finished in {}ms. (Got {} rows)", (System.currentTimeMillis()-startTime), fetchedRows);
 	}
 
 	@Override
@@ -185,10 +196,14 @@
 		
 		EvaluatedDescription evalDesc;
 		for(Entry<NamedClass, Integer> entry : sortByValues(result)){
-			evalDesc = new EvaluatedDescription(entry.getKey(),
-					new AxiomScore(entry.getValue() / (double)individual2Types.keySet().size()));
-			currentlyBestEvaluatedDescriptions.add(evalDesc);
+			if(!entry.getKey().getURI().equals(Thing.instance.getURI())){//omit owl:Thing
+				evalDesc = new EvaluatedDescription(entry.getKey(),
+						new AxiomScore(entry.getValue() / (double)individual2Types.keySet().size()));
+				currentlyBestEvaluatedDescriptions.add(evalDesc);
+			}
+			
 		}
+		
 	}
 	
 	private SortedSet<Entry<NamedClass, Integer>> sortByValues(Map<NamedClass, Integer> map){

Modified: trunk/components-core/src/main/java/org/dllearner/core/owl/Thing.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/core/owl/Thing.java	2011-08-15 22:15:14 UTC (rev 3048)
+++ trunk/components-core/src/main/java/org/dllearner/core/owl/Thing.java	2011-08-16 08:08:04 UTC (rev 3049)
@@ -19,6 +19,7 @@
  */
 package org.dllearner.core.owl;
 
+import java.net.URI;
 import java.util.Map;
 
 /**
@@ -42,6 +43,8 @@
 	private static final long serialVersionUID = -880276915058868775L;
 	public static final Thing instance = new Thing();
 	
+	private static final URI uri = URI.create("http://www.w3.org/2002/07/owl#Thing");
+	
     public String toString(String baseURI, Map<String,String> prefixes) {
         return "TOP";
     }
@@ -57,7 +60,11 @@
 		//return "owl:Thing";
 		return "Thing";
 		
-	}	    
+	}	  
+	
+	public URI getURI(){
+		return uri;
+	}
     
 	public int getLength() {
 		return 1;


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