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

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

Revision: 3408
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3408&view=rev
Author:   christinaunger
Date:     2011-11-16 15:02:41 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
changed TemplateSerializationTest to Hashtable<Template,String>-serialization

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java
    trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex
    trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TemplateSerializationTest.java

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-11-16 12:55:46 UTC (rev 3407)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/Templator.java	2011-11-16 15:02:41 UTC (rev 3408)
@@ -10,6 +10,7 @@
 import net.didion.jwnl.data.POS;
 
 import org.apache.log4j.Logger;
+
 import org.dllearner.algorithm.tbsl.converter.DRS2SPARQL_Converter;
 import org.dllearner.algorithm.tbsl.converter.DUDE2UDRS_Converter;
 import org.dllearner.algorithm.tbsl.ltag.parser.LTAGLexicon;

Modified: trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex
===================================================================
--- trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex	2011-11-16 12:55:46 UTC (rev 3407)
+++ trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex	2011-11-16 15:02:41 UTC (rev 3408)
@@ -121,7 +121,8 @@
 	when     || (S WH:'when' S[s])  || <x, l1, t, [ l1:[ ?x | SLOT_p(y,x) ] ], [(l2,y,s,t)], [l2=l1], [ SLOT_p/PROPERTY/date ]> 
 	when     || (DP WH:'when')      || <y, l1, <<e,t>,t>, [ l1:[ ?x | SLOT_p(y,x) ] ], [], [], [ SLOT_p/PROPERTY/date ]> 
 	where    || (S WH:'where' S[s]) || <x, l1, t, [ l1:[ ?x | SLOT_p(y,x) ] ], [(l2,y,s,t)], [l2=l1], [ SLOT_p/PROPERTY/place ]>
-	where    || (DP WH:'where')     || <y, l1, <<e,t>,t>, [ l1:[ ?x | SLOT_p(y,x) ] ], [], [], [ SLOT_p/PROPERTY/date ]> 
+	where    || (DP WH:'where')     || <y, l1, <<e,t>,t>, [ l1:[ ?x | SLOT_p(y,x) ] ], [], [], [ SLOT_p/PROPERTY/place ]> 
+	where in || (DP WH:'where' (PP P:'in' DP[dp])) || <y, l1, <<e,t>,t>, [ l1:[ ?x | SLOT_p(y,x), SLOT_in(x,z) ] ], [(l2,z,dp,<<e,t>,t>)], [l2=l1], [ SLOT_p/PROPERTY/place ]> 
 	
 	
 // NEGATION 

Modified: trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TemplateSerializationTest.java
===================================================================
--- trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TemplateSerializationTest.java	2011-11-16 12:55:46 UTC (rev 3407)
+++ trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TemplateSerializationTest.java	2011-11-16 15:02:41 UTC (rev 3408)
@@ -5,6 +5,7 @@
 import java.io.FileOutputStream;
 import java.io.ObjectInputStream;
 import java.io.ObjectOutputStream;
+import java.util.Hashtable;
 import java.util.Set;
 
 import org.dllearner.algorithm.tbsl.sparql.Template;
@@ -16,24 +17,34 @@
 	 * @param args
 	 */
 	public static void main(String[] args) throws Exception{
+		
 		Templator templateGenerator = new Templator();
 		templateGenerator.setUNTAGGED_INPUT(true);
 		
+		Hashtable<Template,String> testcorpus = new Hashtable<Template,String>();
+		
 		//generate templates
-		Set<Template> templates = templateGenerator.buildTemplates("Give me all soccer clubs in Premier League.");
+		String q = "Give me all soccer clubs in Premier League.";
+		Set<Template> templates = templateGenerator.buildTemplates(q);
 		for(Template t : templates){
 			System.out.println(t);
+			testcorpus.put(t,q);
 		}
 		
 		//serialize
 		ObjectOutputStream oos = new ObjectOutputStream(new FileOutputStream(new File("templates.out")));
-		oos.writeObject(templates);
+//		oos.writeObject(templates);
+		oos.writeObject(testcorpus);
 		
 		//deserialize
 		ObjectInputStream ois = new ObjectInputStream(new FileInputStream(new File("templates.out")));
-		templates = (Set<Template>) ois.readObject();
+//		templates = (Set<Template>) ois.readObject();
+		testcorpus = (Hashtable<Template,String>) ois.readObject();
 		
-		for(Template t : templates){
+//		for(Template t : templates){
+//			System.out.println(t);
+//		}
+		for (Template t : testcorpus.keySet()) {
 			System.out.println(t);
 		}
 	}

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