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:35:12 UTC
svn commit: r1334918 - in
/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser:
AbstractContextGenerator.java ChunkSampleStream.java PosSampleStream.java
Author: joern
Date: Mon May 7 08:35:12 2012
New Revision: 1334918
URL: http://svn.apache.org/viewvc?rev=1334918&view=rev
Log:
OPENNLP-507 Replaced Parse.toString with Parse.getCoveredText method.
Modified:
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractContextGenerator.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ChunkSampleStream.java
opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/PosSampleStream.java
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractContextGenerator.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractContextGenerator.java?rev=1334918&r1=1334917&r2=1334918&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractContextGenerator.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractContextGenerator.java Mon May 7 08:35:12 2012
@@ -44,7 +44,7 @@ public abstract class AbstractContextGen
protected String punct(Parse punct, int i) {
StringBuilder feat = new StringBuilder(5);
feat.append(i).append("=");
- feat.append(punct.toString());
+ feat.append(punct.getCoveredText());
return feat.toString();
}
@@ -68,7 +68,7 @@ public abstract class AbstractContextGen
if (useLabel && i < 0) {
feat.append(p.getLabel()).append("|");
}
- feat.append(p.getType()).append("|").append(p.getHead().toString());
+ feat.append(p.getType()).append("|").append(p.getHead().getCoveredText());
}
else {
feat.append(EOS);
@@ -303,7 +303,7 @@ public abstract class AbstractContextGen
for (Iterator<Parse> pi=punctuation.iterator();pi.hasNext();) {
Parse punct = pi.next();
if (node != null) {
- feat.append(node.getHead().toString()).append("|").append(type).append("|").append(node.getType()).append("|").append(punct.getType());
+ feat.append(node.getHead().getCoveredText()).append("|").append(type).append("|").append(node.getType()).append("|").append(punct.getType());
}
else {
feat.append(type).append("|").append(EOS).append("|").append(punct.getType());
@@ -328,7 +328,7 @@ public abstract class AbstractContextGen
}
else {
if (node != null) {
- feat.append(node.getHead().toString()).append("|").append(type).append("|").append(node.getType());
+ feat.append(node.getHead().getCoveredText()).append("|").append(type).append("|").append(node.getType());
}
else {
feat.append(type).append("|").append(EOS);
@@ -357,7 +357,7 @@ public abstract class AbstractContextGen
*/
protected void checkcons(Parse child, String i, String type, List<String> features) {
StringBuilder feat = new StringBuilder(20);
- feat.append("c").append(i).append("=").append(child.getType()).append("|").append(child.getHead().toString()).append("|").append(type);
+ feat.append("c").append(i).append("=").append(child.getType()).append("|").append(child.getHead().getCoveredText()).append("|").append(type);
features.add(feat.toString());
feat.setLength(0);
feat.append("c").append(i).append("*=").append(child.getType()).append("|").append(type);
@@ -366,13 +366,13 @@ public abstract class AbstractContextGen
protected void checkcons(Parse p1, Parse p2, String type, List<String> features) {
StringBuilder feat = new StringBuilder(20);
- feat.append("cil=").append(type).append(",").append(p1.getType()).append("|").append(p1.getHead().toString()).append(",").append(p2.getType()).append("|").append(p2.getHead().toString());
+ feat.append("cil=").append(type).append(",").append(p1.getType()).append("|").append(p1.getHead().getCoveredText()).append(",").append(p2.getType()).append("|").append(p2.getHead().getCoveredText());
features.add(feat.toString());
feat.setLength(0);
- feat.append("ci*l=").append(type).append(",").append(p1.getType()).append(",").append(p2.getType()).append("|").append(p2.getHead().toString());
+ feat.append("ci*l=").append(type).append(",").append(p1.getType()).append(",").append(p2.getType()).append("|").append(p2.getHead().getCoveredText());
features.add(feat.toString());
feat.setLength(0);
- feat.append("cil*=").append(type).append(",").append(p1.getType()).append("|").append(p1.getHead().toString()).append(",").append(p2.getType());
+ feat.append("cil*=").append(type).append(",").append(p1.getType()).append("|").append(p1.getHead().getCoveredText()).append(",").append(p2.getType());
features.add(feat.toString());
feat.setLength(0);
feat.append("ci*l*=").append(type).append(",").append(p1.getType()).append(",").append(p2.getType());
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ChunkSampleStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ChunkSampleStream.java?rev=1334918&r1=1334917&r2=1334918&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ChunkSampleStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/ChunkSampleStream.java Mon May 7 08:35:12 2012
@@ -74,7 +74,7 @@ public class ChunkSampleStream extends F
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);
}
@@ -84,7 +84,7 @@ public class ChunkSampleStream extends F
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);
Modified: opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/PosSampleStream.java
URL: http://svn.apache.org/viewvc/opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/PosSampleStream.java?rev=1334918&r1=1334917&r2=1334918&view=diff
==============================================================================
--- opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/PosSampleStream.java (original)
+++ opennlp/trunk/opennlp-tools/src/main/java/opennlp/tools/parser/PosSampleStream.java Mon May 7 08:35:12 2012
@@ -42,7 +42,7 @@ public class PosSampleStream extends Fil
for (int ti=0; ti < nodes.length; ti++) {
Parse tok = nodes[ti];
- toks[ti] = tok.toString();
+ toks[ti] = tok.getCoveredText();
preds[ti] = tok.getType();
}