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

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

Revision: 3994
          http://sourceforge.net/p/dl-learner/code/3994
Author:   jenslehmann
Date:     2013-06-13 10:28:10 +0000 (Thu, 13 Jun 2013)
Log Message:
-----------
configurable semantics for all quantor in fast instance checker

Modified Paths:
--------------
    trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java

Modified: trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java
===================================================================
--- trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java	2013-06-13 07:46:18 UTC (rev 3993)
+++ trunk/components-core/src/main/java/org/dllearner/reasoning/FastInstanceChecker.java	2013-06-13 10:28:10 UTC (rev 3994)
@@ -137,8 +137,10 @@
             "to return all those which do not have an r-filler not in C. The domain semantics is to use those" +
             "which are in the domain of r and do not have an r-filler not in C. The forallExists semantics is to"+
             "use those which have at least one r-filler and do not have an r-filler not in C.",defaultValue = "standard",propertyEditorClass = StringTrimmerEditor.class)
-    private String forAllSemantics;
+    private ForallSemantics forallSemantics = ForallSemantics.Standard;
 
+    public enum ForallSemantics { Standard, SomeOnly }
+    
 	/**
 	 * Creates an instance of the fast instance checker.
 	 */
@@ -400,7 +402,11 @@
 			}
 			SortedSet<Individual> roleFillers = opPos.get(op).get(individual);
 			if (roleFillers == null) {
-				return true;
+				if(forallSemantics == ForallSemantics.Standard) {
+					return true;	
+				} else {
+					return false;
+				}
 			}
 			for (Individual roleFiller : roleFillers) {
 				if (!hasTypeImpl(child, roleFiller)) {
@@ -1124,11 +1130,13 @@
         this.defaultNegation = defaultNegation;
     }
 
-    public String getForAllSemantics() {
-        return forAllSemantics;
-    }
+	public ForallSemantics getForAllSemantics() {
+		return forallSemantics;
+	}
 
-    public void setForAllSemantics(String forAllSemantics) {
-        this.forAllSemantics = forAllSemantics;
-    }
+	public void setForAllSemantics(ForallSemantics forallSemantics) {
+		this.forallSemantics = forallSemantics;
+	}
+
+
 }

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