[DL-Learner SVN] SF.net SVN: dl-learner:[2087] trunk/src/dl-learner/org/dllearner

[<jen...@us...>]

Revision: 2087
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2087&view=rev
Author:   jenslehmann
Date:     2010-03-04 10:46:32 +0000 (Thu, 04 Mar 2010)

Log Message:
-----------
fixed further Pellet 2 problems related to top/bottom object/data property

Modified Paths:
--------------
    trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
    trunk/src/dl-learner/org/dllearner/scripts/evaluation/OntologyChecker.java
    trunk/src/dl-learner/org/dllearner/test/junit/RefinementOperatorTests.java

Modified: trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java	2010-03-03 22:14:34 UTC (rev 2086)
+++ trunk/src/dl-learner/org/dllearner/reasoning/OWLAPIReasoner.java	2010-03-04 10:46:32 UTC (rev 2087)
@@ -395,6 +395,9 @@
 			individuals.add(new Individual(owlIndividual.getURI().toString()));
 		}		
 		
+		// remove top and bottom properties (for backwards compatibility)
+//		atomicRoles.remove(new ObjectProperty("http://www.w3.org/2002/07/owl#bottomObjectProperty"));
+//		atomicRoles.remove(new ObjectProperty("http://www.w3.org/2002/07/owl#topObjectProperty"));
 	}
 
 	/* (non-Javadoc)
@@ -569,6 +572,8 @@
 			e.printStackTrace();
 			throw new Error("OWL API classification error.");
 		}		
+		// removed for backwards compatibility
+//		properties.remove(factory.getOWLBottomObjectProperty(URI.create("bottomObjectProperty")));
 		return getFirstObjectProperties(properties);		
 	}
 	
@@ -898,6 +903,9 @@
 			OWLObjectProperty property = innerSet.iterator().next();
 			roles.add(new ObjectProperty(property.getURI().toString()));
 		}
+		// TODO: after switching to OWL API 3, remove top/bottom directly in getSuper/SubProperties
+		roles.remove(new ObjectProperty("http://www.w3.org/2002/07/owl#topObjectProperty"));
+		roles.remove(new ObjectProperty("http://www.w3.org/2002/07/owl#bottomObjectProperty"));
 		return roles;		
 	}	
 	
@@ -907,6 +915,9 @@
 			OWLDataProperty property = innerSet.iterator().next();
 			roles.add(new DatatypeProperty(property.getURI().toString()));
 		}
+		// TODO: after switching to OWL API 3, remove top/bottom directly in getSuper/SubProperties
+		roles.remove(new DatatypeProperty("http://www.w3.org/2002/07/owl#topDataProperty"));
+		roles.remove(new DatatypeProperty("http://www.w3.org/2002/07/owl#bottomDataProperty"));		
 		return roles;		
 	}		
 	

Modified: trunk/src/dl-learner/org/dllearner/scripts/evaluation/OntologyChecker.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/scripts/evaluation/OntologyChecker.java	2010-03-03 22:14:34 UTC (rev 2086)
+++ trunk/src/dl-learner/org/dllearner/scripts/evaluation/OntologyChecker.java	2010-03-04 10:46:32 UTC (rev 2087)
@@ -53,6 +53,8 @@
 	private static int minInstanceCount = 5;
 	private static boolean displayClasses = true;
 	private static boolean displayInstances = true;
+	// set to Integer.MAX_VALUE for displaying all instances
+	private static int maxInstances = 10;
 
 	public static void main(String[] args) throws ComponentInitException, MalformedURLException {
 		Map<String, Integer> ontologyRelClassCountMap = new HashMap<String, Integer>();
@@ -101,8 +103,14 @@
 									classCount++;
 									tmp.append("  " + cl.getURI() + "\n");
 									if(displayInstances) {
+										int indCount = 0;
 										for(OWLIndividual ind : inds) {
 											tmp.append("    " + ind.toString() + "\n");
+											indCount++;
+											if(indCount >= maxInstances) {
+												tmp.append("    ... " + inds.size() + " more\n");
+												break;
+											}
 										}	
 									}
 								}

Modified: trunk/src/dl-learner/org/dllearner/test/junit/RefinementOperatorTests.java
===================================================================
--- trunk/src/dl-learner/org/dllearner/test/junit/RefinementOperatorTests.java	2010-03-03 22:14:34 UTC (rev 2086)
+++ trunk/src/dl-learner/org/dllearner/test/junit/RefinementOperatorTests.java	2010-03-04 10:46:32 UTC (rev 2087)
@@ -240,7 +240,7 @@
 		//		(male AND EXISTS hasChild.TOP) 
 //		System.out.println(rs);
 //		System.out.println("most general properties: " + rs.getMostGeneralProperties());
-//		System.out.println(rs.getObjectPropertyHierarchy());
+		System.out.println(rs.getObjectPropertyHierarchy());
 		assertTrue(refinements.size()==8);		
 	}
 	


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