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

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

Revision: 3516
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3516&view=rev
Author:   lorenz_b
Date:     2011-12-28 11:21:46 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Some small changes to avoid problems with anonymous classes when running on local model.

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java

Modified: trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java	2011-12-28 11:00:47 UTC (rev 3515)
+++ trunk/components-core/src/main/java/org/dllearner/algorithms/DisjointClassesLearner.java	2011-12-28 11:21:46 UTC (rev 3516)
@@ -60,6 +60,7 @@
 import com.hp.hpl.jena.query.ResultSet;
 import com.hp.hpl.jena.rdf.model.Model;
 import com.hp.hpl.jena.rdf.model.ModelFactory;
+import com.hp.hpl.jena.rdf.model.Resource;
 
 /**
  * Learns disjoint classes using SPARQL queries.
@@ -143,7 +144,7 @@
 					subClasses.add(new NamedClass(sub.getURI()));
 				}
 			}
-			for(OntClass sup : cls.listSuperClasses().toSet()){System.out.println(cls.listSuperClasses().toSet());
+			for(OntClass sup : cls.listSuperClasses().toSet()){
 				if(!sup.isAnon()){
 					subClasses.add(new NamedClass(sup.getURI()));
 				}
@@ -151,7 +152,7 @@
 		}
 		
 		if(ks.supportsSPARQL_1_1()){
-			runSPARQL1_0_Mode();
+			runSPARQL1_1_Mode();
 		} else {
 			runSPARQL1_0_Mode();
 		}
@@ -226,9 +227,11 @@
 			ResultSet rs = executeSelectQuery(query);
 			QuerySolution qs;
 			repeat = false;
+			Resource res;
 			while(rs.hasNext()){
-				qs = rs.next();System.out.println(qs);
-				if(qs.getResource("type") != null){
+				qs = rs.next();
+				res = qs.getResource("type");
+				if(res != null && !res.isAnon()){
 					cls = new NamedClass(qs.getResource("type").getURI());
 					int newCnt = qs.getLiteral("count").getInt();
 					oldCnt = result.get(cls);
@@ -302,10 +305,9 @@
 //				Integer all = class2Count.get(classToDescribe);
 				class2Count.remove(classToDescribe);
 				
-				
 		//get complete disjoint classes
 		Set<NamedClass> completeDisjointclasses = new TreeSet<NamedClass>(allClasses);
-		completeDisjointclasses.removeAll(class2Count.keySet());System.out.println(completeDisjointclasses);
+		completeDisjointclasses.removeAll(class2Count.keySet());
 		
 		// we remove the asserted subclasses here
 		completeDisjointclasses.removeAll(subClasses);

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