Fixes Yoda speak dependencies

actually, there's only one in PTB - Also excluded will be investments ...

Author: AngledLuffa

src/edu/stanford/nlp/trees/CoordinationTransformer.java

@@ -164,7 +164,10 @@ public Tree transformTree(Tree t) {
     if (VERBOSE) {
       debugLine("After rearrangeNowThat:           ", t);
     }
-
+    t = mergeYodaVerbs(t);
+    if (VERBOSE) {
+      debugLine("After mergeYodaVerbs:             ", t);
+    }
     return t;
   }
 
@@ -182,6 +185,19 @@ private static Tree rearrangeNowThat(Tree t) {
   }
 
 
+  private static final TregexPattern mergeYodaVerbsTregex =
+    TregexPattern.compile("VP=home < VBN=vbn $+ (VP=willbe <... {(__=will < will|have|has) ; (VP < (__=be << be|been))})");
+
+  private static final TsurgeonPattern mergeYodaVerbsTsurgeon =
+    Tsurgeon.parseOperation("[createSubtree VP vbn] [move will >-1 home] [move be >-1 home] [prune willbe]");
+
+  private static Tree mergeYodaVerbs(Tree t) {
+    if (t == null) {
+      return t;
+    }
+    return Tsurgeon.processPattern(mergeYodaVerbsTregex, mergeYodaVerbsTsurgeon, t);
+  }
+
   private static final TregexPattern changeSbarToPPTregex =
     TregexPattern.compile("NP < (NP $++ (SBAR=sbar < (IN < /^(?i:after|before|until|since|during)$/ $++ S)))");
 

test/src/edu/stanford/nlp/trees/EnglishGrammaticalStructureTest.java

@@ -285,7 +285,7 @@ public void testBasicRelations() {
                 "aux(excluded-7, will-5)\n" +
                 "auxpass(excluded-7, be-6)\n" + "root(ROOT-0, excluded-7)\n",
         "advmod(excluded-2, Also-1)\n" + "root(ROOT-0, excluded-2)\n" +
-                "aux(be-4, will-3)\n" +     // should really be aux(excluded-2, will-3) but impossible at present without reconstructing topicalized VP semantic head
+                "aux(excluded-2, will-3)\n" +
                 "auxpass(excluded-2, be-4)\n" +
                 "nsubjpass(excluded-2, investments-5)\n" +
                 "prep(investments-5, in-6)\n" +

test/src/edu/stanford/nlp/trees/UniversalEnglishGrammaticalStructureTest.java

@@ -580,7 +580,7 @@ public static Collection<Object[]> testCases() {
           "( (SINV (ADVP (RB Also)) (VP (VBN excluded)) (VP (MD will) (VP (VB be))) (NP (NP (NNS investments)) (PP (IN in) (NP (NNP South) (NNP Africa)))) (. .)))",
           "advmod(excluded-2, Also-1)\n" +
            "root(ROOT-0, excluded-2)\n" +
-           "aux(be-4, will-3)\n" + // should really be aux(excluded-2, will-3) but impossible at present without reconstructing topicalized VP semantic head
+           "aux(excluded-2, will-3)\n" +
            "aux:pass(excluded-2, be-4)\n" +
            "nsubj:pass(excluded-2, investments-5)\n" +
            "case(Africa-8, in-6)\n" +