[DL-Learner SVN] SF.net SVN: dl-learner:[3298] trunk/components-ext/src

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

Revision: 3298
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3298&view=rev
Author:   christinaunger
Date:     2011-10-11 08:51:56 +0000 (Tue, 11 Oct 2011)
Log Message:
-----------
[tbsl] BasicTemplator update (added getConditions() method to BasicQueryTemplate and changed path built for NPREPs)

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/nlp/WordNet.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/BasicQueryTemplate.java
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicSlotBuilder.java
    trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/WordNetTest.java

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/nlp/WordNet.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/nlp/WordNet.java	2011-10-07 07:41:19 UTC (rev 3297)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/nlp/WordNet.java	2011-10-11 08:51:56 UTC (rev 3298)
@@ -17,7 +17,7 @@
 
 public class WordNet {
 	
-	private Dictionary dict;	
+	public Dictionary dict;	
 	
 	public WordNet() {
 		try {

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/BasicQueryTemplate.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/BasicQueryTemplate.java	2011-10-07 07:41:19 UTC (rev 3297)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sparql/BasicQueryTemplate.java	2011-10-11 08:51:56 UTC (rev 3298)
@@ -125,6 +125,10 @@
 	public Set<SPARQL_Filter> getFilters(){
 		return filter;
 	}
+	
+	public Set<Path> getConditions() {
+		return conditions;
+	}
 
 	public void setPrefixes(Set<SPARQL_Prefix> prefixes)
 	{

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicSlotBuilder.java
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicSlotBuilder.java	2011-10-07 07:41:19 UTC (rev 3297)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicSlotBuilder.java	2011-10-11 08:51:56 UTC (rev 3298)
@@ -89,13 +89,13 @@
 				else if (pos.equals("NPREP")) {
 					String[] dpEntry1 = {token,
 							"(DP (NP " + treetoken + " DP[pobj]))",
-							"<x,l1,<<e,t>,t>,[ l1:[ x | SLOT_" + tokenfluent + "(x), of(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>"}; 
+							"<x,l1,<<e,t>,t>,[ l1:[ x | SLOT_" + tokenfluent + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>"}; 
 					String[] dpEntry2 = {token,
 							"(DP DET[det] (NP " + treetoken + " DP[pobj]))",
-							"<x,l1,<<e,t>,t>,[ l1:[ | SLOT_" + tokenfluent + "(x), of(x,y) ] ],[(l2,y,pobj,<<e,t>,t>),(l3,x,det,e)],[l2=l1,l3=l1],[" + slot + "]>"};
+							"<x,l1,<<e,t>,t>,[ l1:[ | SLOT_" + tokenfluent + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>),(l3,x,det,e)],[l2=l1,l3=l1],[" + slot + "]>"};
 					String[] npEntry = {token,
 							"(NP " + treetoken + " DP[pobj])",
-							"<x,l1,<e,t>,[ l1:[ | SLOT_" + tokenfluent + "(x), of(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>"};
+							"<x,l1,<e,t>,[ l1:[ | SLOT_" + tokenfluent + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[" + slot + "]>"};
 					result.add(dpEntry1);
 					result.add(dpEntry2);
 					result.add(npEntry);

Modified: trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/WordNetTest.java
===================================================================
--- trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/WordNetTest.java	2011-10-07 07:41:19 UTC (rev 3297)
+++ trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/WordNetTest.java	2011-10-11 08:51:56 UTC (rev 3298)
@@ -1,11 +1,13 @@
 package org.dllearner.algorithm.tbsl;
 
-import net.didion.jwnl.JWNL;
+import java.util.Iterator;
+
 import net.didion.jwnl.JWNLException;
 import net.didion.jwnl.data.POS;
+import net.didion.jwnl.data.PointerUtils;
 import net.didion.jwnl.data.Synset;
+import net.didion.jwnl.data.list.PointerTargetNode;
 import net.didion.jwnl.data.list.PointerTargetNodeList;
-import net.didion.jwnl.dictionary.Dictionary;
 
 import org.dllearner.algorithm.tbsl.nlp.WordNet;
 
@@ -21,6 +23,17 @@
 		
 		System.out.println(wordnet.getBestSynonyms(POS.NOUN,"mayor"));
 
+		PointerTargetNodeList relatedList;
+		for (Synset syn : wordnet.dict.getIndexWord(POS.NOUN,"mayor").getSenses()) {
+			relatedList = PointerUtils.getInstance().getSynonyms(syn);
+			Iterator<PointerTargetNode> i = relatedList.iterator();
+			while (i.hasNext()) {
+			  PointerTargetNode related = i.next();
+			  Synset s = related.getSynset();
+			  System.out.println("-- " + s);
+			}
+		}
+		
 	}
 
 }

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