This is an automated email from the ASF dual-hosted git repository. mawiesne pushed a commit to branch OPENNLP-1673-Re-use-static-conversion-methods-in-ArrayMath in repository https://gitbox.apache.org/repos/asf/opennlp.git
commit 76ff29d4ad53c506e46c1e3c5e9ca287f33b9852 Author: Martin Wiesner <[email protected]> AuthorDate: Thu Dec 19 20:10:01 2024 +0100 OPENNLP-1673 Re-use static conversion methods in ArrayMath --- .../java/opennlp/tools/sentdetect/SentenceDetectorME.java | 12 +++--------- .../src/main/java/opennlp/tools/tokenize/TokenizerME.java | 7 ++----- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java index 96953506..1908b02f 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java +++ b/opennlp-tools/src/main/java/opennlp/tools/sentdetect/SentenceDetectorME.java @@ -26,6 +26,7 @@ import java.util.Map; import java.util.Set; import opennlp.tools.dictionary.Dictionary; +import opennlp.tools.ml.ArrayMath; import opennlp.tools.ml.EventTrainer; import opennlp.tools.ml.TrainerFactory; import opennlp.tools.ml.model.Event; @@ -223,10 +224,7 @@ public class SentenceDetectorME implements SentenceDetector { } } - int[] starts = new int[positions.size()]; - for (int i = 0; i < starts.length; i++) { - starts[i] = positions.get(i); - } + int[] starts = ArrayMath.toIntArray(positions); // string does not contain sentence end positions if (starts.length == 0) { @@ -303,11 +301,7 @@ public class SentenceDetectorME implements SentenceDetector { * If not applicable, an empty array is returned. */ public double[] getSentenceProbabilities() { - double[] sentProbArray = new double[sentProbs.size()]; - for (int i = 0; i < sentProbArray.length; i++) { - sentProbArray[i] = sentProbs.get(i); - } - return sentProbArray; + return ArrayMath.toDoubleArray(sentProbs); } /** diff --git a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerME.java b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerME.java index ee0d8267..a617108f 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerME.java +++ b/opennlp-tools/src/main/java/opennlp/tools/tokenize/TokenizerME.java @@ -25,6 +25,7 @@ import java.util.Map; import java.util.regex.Pattern; import opennlp.tools.dictionary.Dictionary; +import opennlp.tools.ml.ArrayMath; import opennlp.tools.ml.EventTrainer; import opennlp.tools.ml.TrainerFactory; import opennlp.tools.ml.model.Event; @@ -156,11 +157,7 @@ public class TokenizerME extends AbstractTokenizer { * If not applicable an empty array is returned. */ public double[] getTokenProbabilities() { - double[] tokProbArray = new double[tokProbs.size()]; - for (int i = 0; i < tokProbArray.length; i++) { - tokProbArray[i] = tokProbs.get(i); - } - return tokProbArray; + return ArrayMath.toDoubleArray(tokProbs); } /**
