[DL-Learner SVN] SF.net SVN: dl-learner:[2876] trunk/components-ext/src/main/java/org/ dllearner/algorithm/tbsl

[<chr...@us...>]

Revision: 2876
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=2876&view=rev
Author:   christinaunger
Date:     2011-06-15 07:04:54 +0000 (Wed, 15 Jun 2011)

Log Message:
-----------
[tbsl] fixed 'has'

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java	2011-06-14 20:10:31 UTC (rev 2875)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/converter/DRS2SPARQL_Converter.java	2011-06-15 07:04:54 UTC (rev 2876)
@@ -358,14 +358,12 @@
         Set<Simple_DRS_Condition> equalEqualsConditions = new HashSet<Simple_DRS_Condition>();
         for (Simple_DRS_Condition c : drs.getAllSimpleConditions()) {
         	if(c.getPredicate().equals("equal") && c.getArguments().get(0).getValue().equals(c.getArguments().get(1).getValue())) {
-        		System.out.println("Found " + c); // DEBUG
         		equalEqualsConditions.add(c);
         	}
         }
         for (Simple_DRS_Condition c : equalEqualsConditions) {
         	drs.removeCondition(c);
         }
-        System.out.println("DRS: " + drs);
     }
 
     private boolean isUri(String arg) {

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java	2011-06-14 20:10:31 UTC (rev 2875)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/SlotBuilder.java	2011-06-15 07:04:54 UTC (rev 2876)
@@ -168,16 +168,23 @@
 			/* VERBS */
 			else if (equalsOneOf(pos,verb)) {
 				
-				String slot    = "SLOT_" + token + "/PROPERTY/" + token; 
-				String symslot = "SLOT_" + token + "/SYMPROPERTY/" + token; 
-				List<String> preds = wordnet.getAttributes(token);
-				for (Iterator<String> i = preds.iterator(); i.hasNext();) {
-					slot += i.next();
-					symslot += i.next();
-					if (i.hasNext()) {
-						slot += "^";
-						symslot += "^";
-					}
+				String slot; String symslot;
+				if (token.equals("has") || token.equals("have") || token.equals("had")) {
+					slot    = "SLOT_" + token + "/PROPERTY/";
+					symslot = "SLOT_" + token + "/SYMPROPERTY/";
+				} 
+				else {
+					slot    = "SLOT_" + token + "/PROPERTY/" + token; 
+					symslot = "SLOT_" + token + "/SYMPROPERTY/" + token; 
+					List<String> preds = wordnet.getAttributes(token);
+					for (Iterator<String> i = preds.iterator(); i.hasNext();) {
+						slot += i.next();
+						symslot += i.next();
+						if (i.hasNext()) {
+							slot += "^";
+							symslot += "^";
+						}
+					} 
 				}
 				if (pos.equals("PASSIVE")) {
 					String[] passEntry1 = {token,

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java	2011-06-14 20:10:31 UTC (rev 2875)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java	2011-06-15 07:04:54 UTC (rev 2876)
@@ -99,13 +99,13 @@
                 	d2s.redundantEqualRenaming(drs);
                 	
                 	if (!containsModuloRenaming(drses,drs)) {
-                    	// DEBUG
-                		System.out.println(dude);
-                		System.out.println(drs);
-                		for (Slot sl : slots) {
-                			System.out.println(sl.toString());
-                		}
-                		//
+//                    	// DEBUG
+//                		System.out.println(dude);
+//                		System.out.println(drs);
+//                		for (Slot sl : slots) {
+//                			System.out.println(sl.toString());
+//                		}
+//                		//
                 		drses.add(drs);
                 		
                 		try {


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