Fix LexicalizedParserITest for UD

Author: sebschu

itest/src/edu/stanford/nlp/parser/lexparser/LexicalizedParserITest.java

@@ -163,8 +163,8 @@ public void testParseString() {
     compareOutput(results, false,
                   "My/PRP$ dog/NN likes/VBZ to/TO eat/VB yoghurt/NN ./.",
                   "(ROOT (S (NP (PRP$ My) (NN dog)) (VP (VBZ likes) (S (VP (TO to) (VP (VB eat) (NP (NN yoghurt)))))) (. .)))",
-                  "poss(dog-2, My-1) nsubj(likes-3, dog-2) root(ROOT-0, likes-3) aux(eat-5, to-4) xcomp(likes-3, eat-5) dobj(eat-5, yoghurt-6)",
-                  "poss(dog-2, My-1) nsubj(likes-3, dog-2) nsubj(eat-5, dog-2) root(ROOT-0, likes-3) aux(eat-5, to-4) xcomp(likes-3, eat-5) dobj(eat-5, yoghurt-6)");
+                  "nmod:poss(dog-2, My-1) nsubj(likes-3, dog-2) root(ROOT-0, likes-3) mark(eat-5, to-4) xcomp(likes-3, eat-5) dobj(eat-5, yoghurt-6)",
+                  "nmod:poss(dog-2, My-1) nsubj(likes-3, dog-2) nsubj(eat-5, dog-2) root(ROOT-0, likes-3) mark(eat-5, to-4) xcomp(likes-3, eat-5) dobj(eat-5, yoghurt-6)");
   }
 
   /**

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

@@ -529,6 +529,7 @@ private List<TypedDependency> getDeps(Predicate<TypedDependency> puncTypedDepFil
         }
       }
     }
+    
     if (rootDep != null) {
       TypedDependency rootTypedDep = new TypedDependency(ROOT, new IndexedWord(dependencyRoot.label()), new IndexedWord(rootDep.label()));
       if (puncTypedDepFilter.test(rootTypedDep)) {
@@ -641,7 +642,7 @@ public boolean test(TypedDependency d) {
       IndexedWord l = d.dep();
       if (l == null) return false;
 
-      return npf.test(l.word()) && tf.test(l.tag());
+      return npf.test(l.value()) && tf.test(l.tag());
     }
 
     // Automatically generated by Eclipse