You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by jo...@apache.org on 2012/05/07 10:39:09 UTC

svn commit: r1334920 - in /opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools: lang/english/TreebankNameFinder.java parser/AbstractParserEventStream.java parser/Parse.java

Author: joern
Date: Mon May  7 08:39:08 2012
New Revision: 1334920

URL: http://svn.apache.org/viewvc?rev=1334920&view=rev
Log:
OPENNLP-507 Replaced Parse.toString with Parse.getCoveredText method.

Modified:
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractParserEventStream.java
    opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java

Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java?rev=1334920&r1=1334919&r2=1334920&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/lang/english/TreebankNameFinder.java Mon May  7 08:39:08 2012
@@ -67,7 +67,7 @@ public class TreebankNameFinder {
       Parse[] tagNodes = p.getTagNodes();
       String[] tokens = new String[tagNodes.length];
       for (int ti=0;ti<tagNodes.length;ti++){
-        tokens[ti] = tagNodes[ti].toString();
+        tokens[ti] = tagNodes[ti].getCoveredText();
       }
       //System.err.println(java.util.Arrays.asList(tokens));
       for (int fi = 0, fl = finders.length; fi < fl; fi++) {

Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractParserEventStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractParserEventStream.java?rev=1334920&r1=1334919&r2=1334920&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractParserEventStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractParserEventStream.java Mon May  7 08:39:08 2012
@@ -140,7 +140,7 @@ public abstract class AbstractParserEven
     for (int ci = 0, cl = chunks.length; ci < cl; ci++) {
       Parse c = chunks[ci];
       if (c.isPosTag()) {
-        toks.add(c.toString());
+        toks.add(c.getCoveredText());
         tags.add(c.getType());
         preds.add(Parser.OTHER);
       }
@@ -150,7 +150,7 @@ public abstract class AbstractParserEven
         Parse[] kids = c.getChildren();
         for (int ti=0,tl=kids.length;ti<tl;ti++) {
           Parse tok = kids[ti];
-          toks.add(tok.toString());
+          toks.add(tok.getCoveredText());
           tags.add(tok.getType());
           if (start) {
             preds.add(Parser.START + ctype);
@@ -173,14 +173,14 @@ public abstract class AbstractParserEven
     for (int ci = 0, cl = chunks.length; ci < cl; ci++) {
       Parse c = chunks[ci];
       if (c.isPosTag()) {
-        toks.add(c.toString());
+        toks.add(c.getCoveredText());
         preds.add(c.getType());
       }
       else {
         Parse[] kids = c.getChildren();
         for (int ti=0,tl=kids.length;ti<tl;ti++) {
           Parse tok = kids[ti];
-          toks.add(tok.toString());
+          toks.add(tok.getCoveredText());
           preds.add(tok.getType());
         }
       }

Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java?rev=1334920&r1=1334919&r2=1334920&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/Parse.java Mon May  7 08:39:08 2012
@@ -1048,7 +1048,7 @@ public class Parse implements Cloneable,
       nlevels[levels.length] = ki;
       System.out.println(levelsBuff.toString() + ki + "] "+ kids[ki].getType() +
           " " + kids[ki].hashCode() + " -> " + kids[ki].getParent().hashCode() +
-          " " + kids[ki].getParent().getType() + " " + kids[ki].toString());
+          " " + kids[ki].getParent().getType() + " " + kids[ki].getCoveredText());
       codeTree(kids[ki],nlevels);
     }
   }