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

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

Revision: 3728
          http://dl-learner.svn.sourceforge.net/dl-learner/?rev=3728&view=rev
Author:   christinaunger
Date:     2012-06-09 10:46:58 +0000 (Sat, 09 Jun 2012)
Log Message:
-----------
NP/DP conjunction

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

Modified: trunk/components-ext/src/main/resources/tbsl/lexicon/basic_english.lex
===================================================================
--- trunk/components-ext/src/main/resources/tbsl/lexicon/basic_english.lex	2012-06-07 13:57:47 UTC (rev 3727)
+++ trunk/components-ext/src/main/resources/tbsl/lexicon/basic_english.lex	2012-06-09 10:46:58 UTC (rev 3728)
@@ -150,7 +150,7 @@
 
 	and || (S S* CC:'and' S[s]) || <x,l1,t,[l1:[|]],[(l2,y,s,t)],[l1=l2],[]>
 	and || (DP DP* CC:'and' DP[dp]) || <x,l1,<<e,t>,t>,[l1:[|]],[(l2,y,dp,<<e,t>,t>)],[l1=l2],[]>
-	and || (NP NP* CC:'and' NP[np]) || <x,l1,<e,t>,[l1:[|]],[(l2,y,np,<e,t>)],[l1=l2],[]>
+	and || (NP NP* CC:'and' NP[np]) || <x,l1,<e,t>,[l1:[|x=y]],[(l2,y,np,<e,t>)],[l1=l2],[]>
 	and || (VP VP* CC:'and' VP[vp]) || -
 	and || (ADJ ADJ* CC:'and' ADJ[adj]) || -
 	

Modified: trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex
===================================================================
--- trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex	2012-06-07 13:57:47 UTC (rev 3727)
+++ trunk/components-ext/src/main/resources/tbsl/lexicon/english.lex	2012-06-09 10:46:58 UTC (rev 3728)
@@ -140,7 +140,7 @@
 
 	and || (S S* CC:'and' S[s]) || <x,l1,t,[l1:[|]],[(l2,y,s,t)],[l1=l2],[]>
 	and || (DP DP* CC:'and' DP[dp]) || <x,l1,<<e,t>,t>,[l1:[|]],[(l2,y,dp,<<e,t>,t>)],[l1=l2],[]>
-	and || (NP NP* CC:'and' NP[np]) || <x,l1,<e,t>,[l1:[|]],[(l2,y,np,<e,t>)],[l1=l2],[]>
+	and || (NP NP* CC:'and' NP[np]) || <x,l1,<e,t>,[l1:[|x=y]],[(l2,y,np,<e,t>)],[l1=l2],[]>
 	and || (VP VP* CC:'and' VP[vp]) || -
 	and || (ADJ ADJ* CC:'and' ADJ[adj]) || -
 	

Modified: trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TestFrontend.java
===================================================================
--- trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TestFrontend.java	2012-06-07 13:57:47 UTC (rev 3727)
+++ trunk/components-ext/src/test/java/org/dllearner/algorithm/tbsl/TestFrontend.java	2012-06-09 10:46:58 UTC (rev 3728)
@@ -12,7 +12,7 @@
 public class TestFrontend {
 
     static String[] GRAMMAR_FILES = {"src/main/resources/lexicon/english.lex"};
-    static boolean BASIC_MODE = true; // true for BASIC mode, false for LEIPZIG mode
+    static boolean BASIC_MODE = false; // true for BASIC mode, false for LEIPZIG mode
     
     public static void main(String[] args) {
 

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