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 2016/12/26 13:34:33 UTC
[39/50] [abbrv] opennlp git commit: Replace manual array copy
Replace manual array copy
See issue OPENNLP-871
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo
Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/dd2aaccc
Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/dd2aaccc
Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/dd2aaccc
Branch: refs/heads/889
Commit: dd2aaccc0737eace57a949f2d7d7291bddb81ee9
Parents: 06c27b3
Author: Joern Kottmann <jo...@apache.org>
Authored: Wed Dec 21 17:12:52 2016 +0100
Committer: Joern Kottmann <jo...@apache.org>
Committed: Wed Dec 21 17:12:52 2016 +0100
----------------------------------------------------------------------
.../src/main/java/opennlp/tools/ml/maxent/GISTrainer.java | 4 +---
.../main/java/opennlp/tools/ml/model/AbstractModelReader.java | 4 +---
.../main/java/opennlp/tools/parser/AbstractBottomUpParser.java | 4 +---
.../java/opennlp/tools/parser/chunking/ParserEventStream.java | 4 +---
4 files changed, 4 insertions(+), 12 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/opennlp/blob/dd2aaccc/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
index 9919bb0..05a5424 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java
@@ -361,9 +361,7 @@ class GISTrainer {
}
else {
outcomePattern = new int[numActiveOutcomes];
- for (int aoi=0;aoi<numActiveOutcomes;aoi++) {
- outcomePattern[aoi] = activeOutcomes[aoi];
- }
+ System.arraycopy(activeOutcomes, 0, outcomePattern, 0, numActiveOutcomes);
}
}
params[pi] = new MutableContext(outcomePattern,new double[numActiveOutcomes]);
http://git-wip-us.apache.org/repos/asf/opennlp/blob/dd2aaccc/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelReader.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelReader.java b/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelReader.java
index 6a4b642..6c26214 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelReader.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/ml/model/AbstractModelReader.java
@@ -135,9 +135,7 @@ public abstract class AbstractModelReader {
for (int i=0; i<outcomePatterns.length; i++) {
//construct outcome pattern
int[] outcomePattern = new int[outcomePatterns[i].length-1];
- for (int k=1; k<outcomePatterns[i].length; k++) {
- outcomePattern[k-1] = outcomePatterns[i][k];
- }
+ System.arraycopy(outcomePatterns[i], 1, outcomePattern, 0, outcomePatterns[i].length - 1);
//System.err.println("outcomePattern "+i+" of "+outcomePatterns.length+" with "+outcomePatterns[i].length+" outcomes ");
//populate parameters for each context which uses this outcome pattern.
for (int j=0; j<outcomePatterns[i][0]; j++) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/dd2aaccc/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java b/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
index 10c3f0e..ff4bea8 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/AbstractBottomUpParser.java
@@ -576,9 +576,7 @@ public abstract class AbstractBottomUpParser implements Parser {
if (ci+2 < chunks.length) window[wi++] = chunks[ci+2].getHead().getCoveredText();
if (wi < 5) {
String[] subWindow = new String[wi];
- for (int swi=0;swi<wi;swi++) {
- subWindow[swi]=window[swi];
- }
+ System.arraycopy(window, 0, subWindow, 0, wi);
window = subWindow;
}
if (window.length >=3) {
http://git-wip-us.apache.org/repos/asf/opennlp/blob/dd2aaccc/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java
----------------------------------------------------------------------
diff --git a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java
index afaed99..8ded9ec 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/parser/chunking/ParserEventStream.java
@@ -93,9 +93,7 @@ public class ParserEventStream extends AbstractParserEventStream {
if (!type.equals(AbstractBottomUpParser.TOP_NODE)) {
reducedChunks = new Parse[chunks.length-(reduceEnd-reduceStart+1)+1]; //total - num_removed + 1 (for new node)
//insert nodes before reduction
- for (int ri = 0; ri< reduceStart; ri++) {
- reducedChunks[ri]=chunks[ri];
- }
+ System.arraycopy(chunks, 0, reducedChunks, 0, reduceStart);
//insert reduced node
reducedChunks[reduceStart]=parent;
//propagate punctuation sets