This is an automated email from the ASF dual-hosted git repository. mawiesne pushed a commit to branch OPENNLP-1732-Remove-use-of-raw-types-for-StopCriteria in repository https://gitbox.apache.org/repos/asf/opennlp.git
commit 1b32428725ca1cae7ee3f52868098cc6db5be22d Author: Martin Wiesner <[email protected]> AuthorDate: Fri May 9 19:53:52 2025 +0200 OPENNLP-1732: Remove use of raw types for StopCriteria --- opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISTrainer.java | 4 ++-- .../src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java | 4 ++-- .../java/opennlp/tools/monitoring/DefaultTrainingProgressMonitor.java | 2 +- .../main/java/opennlp/tools/monitoring/TrainingProgressMonitor.java | 2 +- .../src/main/java/opennlp/tools/util/TrainingConfiguration.java | 2 +- .../opennlp/tools/monitoring/DefaultTrainingProgressMonitorTest.java | 4 ++-- .../opennlp/tools/monitoring/IterDeltaAccuracyUnderToleranceTest.java | 2 +- .../opennlp/tools/monitoring/LogLikelihoodThresholdBreachedTest.java | 2 +- 8 files changed, 11 insertions(+), 11 deletions(-) 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 ae71d942..de2b4ddf 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 @@ -507,7 +507,7 @@ public class GISTrainer extends AbstractEventTrainer { //Get the Training Progress Monitor and the StopCriteria. TrainingProgressMonitor progressMonitor = getTrainingProgressMonitor(trainingConfiguration); - StopCriteria stopCriteria = getStopCriteria(trainingConfiguration); + StopCriteria<Double> stopCriteria = getStopCriteria(trainingConfiguration); logger.info("Performing {} iterations.", iterations); for (int i = 1; i <= iterations; i++) { @@ -737,7 +737,7 @@ public class GISTrainer extends AbstractEventTrainer { * {@link TrainingConfiguration#stopCriteria()} is {@code null}, * then return the default {@link StopCriteria}. */ - private StopCriteria getStopCriteria(TrainingConfiguration trainingConfig) { + private StopCriteria<Double> getStopCriteria(TrainingConfiguration trainingConfig) { return trainingConfig != null && trainingConfig.stopCriteria() != null ? trainingConfig.stopCriteria() : new LogLikelihoodThresholdBreached(trainingParameters); } diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java index 9958e035..3419b169 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronTrainer.java @@ -302,7 +302,7 @@ public class PerceptronTrainer extends AbstractEventTrainer { //Get the Training Progress Monitor and the StopCriteria. TrainingProgressMonitor progressMonitor = getTrainingProgressMonitor(trainingConfiguration); - StopCriteria stopCriteria = getStopCriteria(trainingConfiguration); + StopCriteria<Double> stopCriteria = getStopCriteria(trainingConfiguration); // Keep track of the previous three accuracies. The difference of // the mean of these and the current training set accuracy is used @@ -459,7 +459,7 @@ public class PerceptronTrainer extends AbstractEventTrainer { * {@link TrainingConfiguration#stopCriteria()} is {@code null}, * then return the default {@link StopCriteria}. */ - private StopCriteria getStopCriteria(TrainingConfiguration trainingConfig) { + private StopCriteria<Double> getStopCriteria(TrainingConfiguration trainingConfig) { return trainingConfig != null && trainingConfig.stopCriteria() != null ? trainingConfig.stopCriteria() : new IterDeltaAccuracyUnderTolerance(trainingParameters); } diff --git a/opennlp-tools/src/main/java/opennlp/tools/monitoring/DefaultTrainingProgressMonitor.java b/opennlp-tools/src/main/java/opennlp/tools/monitoring/DefaultTrainingProgressMonitor.java index 2d108251..3b1265bb 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/monitoring/DefaultTrainingProgressMonitor.java +++ b/opennlp-tools/src/main/java/opennlp/tools/monitoring/DefaultTrainingProgressMonitor.java @@ -63,7 +63,7 @@ public class DefaultTrainingProgressMonitor implements TrainingProgressMonitor { * {@inheritDoc} */ @Override - public synchronized void finishedTraining(int iterations, StopCriteria stopCriteria) { + public synchronized void finishedTraining(int iterations, StopCriteria<?> stopCriteria) { if (!Objects.isNull(stopCriteria)) { progress.add(stopCriteria.getMessageIfSatisfied()); } else { diff --git a/opennlp-tools/src/main/java/opennlp/tools/monitoring/TrainingProgressMonitor.java b/opennlp-tools/src/main/java/opennlp/tools/monitoring/TrainingProgressMonitor.java index be35b78a..23504870 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/monitoring/TrainingProgressMonitor.java +++ b/opennlp-tools/src/main/java/opennlp/tools/monitoring/TrainingProgressMonitor.java @@ -43,7 +43,7 @@ public interface TrainingProgressMonitor { * @param iterations Total number of iterations configured for the training. * @param stopCriteria {@link StopCriteria} for the training. */ - void finishedTraining(int iterations, StopCriteria stopCriteria); + void finishedTraining(int iterations, StopCriteria<?> stopCriteria); /** * Checks whether the training has finished. diff --git a/opennlp-tools/src/main/java/opennlp/tools/util/TrainingConfiguration.java b/opennlp-tools/src/main/java/opennlp/tools/util/TrainingConfiguration.java index f3e05cdc..40bf5757 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/util/TrainingConfiguration.java +++ b/opennlp-tools/src/main/java/opennlp/tools/util/TrainingConfiguration.java @@ -26,4 +26,4 @@ import opennlp.tools.monitoring.TrainingProgressMonitor; * @param progMon {@link TrainingProgressMonitor} used to monitor the training progress. * @param stopCriteria {@link StopCriteria} used to abort training when the criteria is met. */ -public record TrainingConfiguration(TrainingProgressMonitor progMon, StopCriteria stopCriteria) {} +public record TrainingConfiguration(TrainingProgressMonitor progMon, StopCriteria<Double> stopCriteria) {} diff --git a/opennlp-tools/src/test/java/opennlp/tools/monitoring/DefaultTrainingProgressMonitorTest.java b/opennlp-tools/src/test/java/opennlp/tools/monitoring/DefaultTrainingProgressMonitorTest.java index 59c68a6a..14fd5bd3 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/monitoring/DefaultTrainingProgressMonitorTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/monitoring/DefaultTrainingProgressMonitorTest.java @@ -76,8 +76,8 @@ class DefaultTrainingProgressMonitorTest { @Test void testFinishedTrainingWithStopCriteria() { - StopCriteria stopCriteria = new IterDeltaAccuracyUnderTolerance(new TrainingParameters(Map.of("Tolerance", - .00002))); + StopCriteria<Double> stopCriteria = new IterDeltaAccuracyUnderTolerance( + new TrainingParameters(Map.of("Tolerance", .00002))); progressMonitor.finishedTraining(150, stopCriteria); progressMonitor.display(true); diff --git a/opennlp-tools/src/test/java/opennlp/tools/monitoring/IterDeltaAccuracyUnderToleranceTest.java b/opennlp-tools/src/test/java/opennlp/tools/monitoring/IterDeltaAccuracyUnderToleranceTest.java index 4ca7c2eb..df931a3d 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/monitoring/IterDeltaAccuracyUnderToleranceTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/monitoring/IterDeltaAccuracyUnderToleranceTest.java @@ -30,7 +30,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class IterDeltaAccuracyUnderToleranceTest { - private StopCriteria stopCriteria; + private StopCriteria<Double> stopCriteria; @BeforeEach public void setup() { diff --git a/opennlp-tools/src/test/java/opennlp/tools/monitoring/LogLikelihoodThresholdBreachedTest.java b/opennlp-tools/src/test/java/opennlp/tools/monitoring/LogLikelihoodThresholdBreachedTest.java index 7786847b..7d7b10d0 100644 --- a/opennlp-tools/src/test/java/opennlp/tools/monitoring/LogLikelihoodThresholdBreachedTest.java +++ b/opennlp-tools/src/test/java/opennlp/tools/monitoring/LogLikelihoodThresholdBreachedTest.java @@ -32,7 +32,7 @@ import static org.junit.jupiter.api.Assertions.assertEquals; class LogLikelihoodThresholdBreachedTest { - private StopCriteria stopCriteria; + private StopCriteria<Double> stopCriteria; @BeforeEach public void setup() {
