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

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

Revision: 3700
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3700&view=rev
Author:   christinaunger
Date:     2012-05-10 07:08:30 +0000 (Thu, 10 May 2012)
Log Message:
-----------
[tbsl.exploration] repaired empty-property-template

Modified Paths:
--------------
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj
    trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicSlotBuilder.java

Modified: trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj
===================================================================
--- trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj	2012-05-09 15:34:39 UTC (rev 3699)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/sem/dudes/reader/DUDE_Parser.jj	2012-05-10 07:08:30 UTC (rev 3700)
@@ -502,7 +502,7 @@
 //TOKEN: {<DR: (["?","!"])?(["a"-"z","A"-"Z","0"-"9","."])+>}
 
 TOKEN: {<A: (["a"-"z","A"-"Z","0"-"9"])+>}
-TOKEN: {<B: (["a"-"z","A"-"Z","_",".","#","0"-"9"])+":"(["a"-"z","A"-"Z","_",".","#","0"-"9"])+>}
+TOKEN: {<B: (["a"-"z","A"-"Z","_",".","#","0"-"9"])+":"(["a"-"z","A"-"Z","_",".","#","0"-"9"])+>} // oder eher: SLOT_([...])+
 TOKEN: {<C: ["?","!"](["a"-"z","A"-"Z","0"-"9"])+>}
 
 Token dr() : { Token t; }{ (t=<A> | t=<C>) { return t; } }

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	2012-05-09 15:34:39 UTC (rev 3699)
+++ trunk/components-ext/src/main/java/org/dllearner/algorithm/tbsl/templator/BasicSlotBuilder.java	2012-05-10 07:08:30 UTC (rev 3700)
@@ -337,11 +337,11 @@
 				slot = "SLOT_" + token + "/PROPERTY/";
 				String[] npAdjunct = {token,
 						"(NP NP* (PP P:'" + token.toLowerCase() + "' DP[pobj]))",
-						"<x,l1,<e,t>,[ l1:[ | SLOT_" + token + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],["+slot+"]>" +
+						"<x,l1,<e,t>,[ l1:[ | SLOT_" + token + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],["+slot+"]>" +
 								" ;; <x,l1,<e,t>,[ l1:[ | empty(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[]>"};
 				String[] vpAdjunct = {token,
 						"(VP VP* (PP P:'" + token.toLowerCase() + "' DP[pobj]))",
-						"<x,l1,t,[ l1:[ | SLOT_" + token + "(p), p(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],["+slot+"]>" +
+						"<x,l1,t,[ l1:[ | SLOT_" + token + "(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],["+slot+"]>" +
 								" ;; <x,l1,t,[ l1:[ | empty(x,y) ] ],[(l2,y,pobj,<<e,t>,t>)],[l2=l1],[]>"};
 				result.add(npAdjunct);
 				result.add(vpAdjunct);

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