You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@opennlp.apache.org by rz...@apache.org on 2023/07/27 06:24:27 UTC
[opennlp] branch main updated: OPENNLP-1507 Remove long-term deprecated interface DetailedFMeasureEvaluatorParams
This is an automated email from the ASF dual-hosted git repository.
rzo1 pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/opennlp.git
The following commit(s) were added to refs/heads/main by this push:
new 5c41f090 OPENNLP-1507 Remove long-term deprecated interface DetailedFMeasureEvaluatorParams
5c41f090 is described below
commit 5c41f090b1db7990024de7647d5739ff82f07990
Author: Martin Wiesner <ma...@hs-heilbronn.de>
AuthorDate: Wed Jul 26 17:17:07 2023 +0200
OPENNLP-1507 Remove long-term deprecated interface DetailedFMeasureEvaluatorParams
---
.../cmdline/chunker/ChunkerCrossValidatorTool.java | 16 ++-------
.../cmdline/chunker/ChunkerEvaluatorTool.java | 14 ++------
.../TokenNameFinderCrossValidatorTool.java | 15 ++-------
.../namefind/TokenNameFinderEvaluatorTool.java | 15 ++-------
.../params/DetailedFMeasureEvaluatorParams.java | 39 ----------------------
5 files changed, 9 insertions(+), 90 deletions(-)
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java
index f5d3fda4..aa31e70e 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerCrossValidatorTool.java
@@ -32,7 +32,6 @@ import opennlp.tools.cmdline.AbstractCrossValidatorTool;
import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.chunker.ChunkerCrossValidatorTool.CVToolParams;
import opennlp.tools.cmdline.params.CVParams;
-import opennlp.tools.cmdline.params.DetailedFMeasureEvaluatorParams;
import opennlp.tools.util.eval.EvaluationMonitor;
import opennlp.tools.util.eval.FMeasure;
import opennlp.tools.util.model.ModelUtil;
@@ -41,7 +40,7 @@ import opennlp.tools.util.model.ModelUtil;
public final class ChunkerCrossValidatorTool
extends AbstractCrossValidatorTool<ChunkSample, CVToolParams> {
- interface CVToolParams extends TrainingParams, CVParams, DetailedFMeasureEvaluatorParams {
+ interface CVToolParams extends TrainingParams, CVParams {
}
private static final Logger logger = LoggerFactory.getLogger(ChunkerCrossValidatorTool.class);
@@ -65,14 +64,9 @@ public final class ChunkerCrossValidatorTool
}
List<EvaluationMonitor<ChunkSample>> listeners = new LinkedList<>();
- ChunkerDetailedFMeasureListener detailedFMeasureListener = null;
if (params.getMisclassified()) {
listeners.add(new ChunkEvaluationErrorListener());
}
- if (params.getDetailedF()) {
- detailedFMeasureListener = new ChunkerDetailedFMeasureListener();
- listeners.add(detailedFMeasureListener);
- }
ChunkerCrossValidator validator;
@@ -96,11 +90,7 @@ public final class ChunkerCrossValidatorTool
}
}
- if (detailedFMeasureListener == null) {
- FMeasure result = validator.getFMeasure();
- logger.info(result.toString());
- } else {
- logger.info(detailedFMeasureListener.toString());
- }
+ FMeasure result = validator.getFMeasure();
+ logger.info(result.toString());
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java
index 5fdcb218..a547fcc1 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/chunker/ChunkerEvaluatorTool.java
@@ -33,7 +33,6 @@ import opennlp.tools.cmdline.AbstractEvaluatorTool;
import opennlp.tools.cmdline.PerformanceMonitor;
import opennlp.tools.cmdline.TerminateToolException;
import opennlp.tools.cmdline.chunker.ChunkerEvaluatorTool.EvalToolParams;
-import opennlp.tools.cmdline.params.DetailedFMeasureEvaluatorParams;
import opennlp.tools.cmdline.params.EvaluatorParams;
import opennlp.tools.util.ObjectStream;
import opennlp.tools.util.eval.EvaluationMonitor;
@@ -48,7 +47,7 @@ import opennlp.tools.util.eval.EvaluationMonitor;
public final class ChunkerEvaluatorTool
extends AbstractEvaluatorTool<ChunkSample, EvalToolParams> {
- interface EvalToolParams extends EvaluatorParams, DetailedFMeasureEvaluatorParams {
+ interface EvalToolParams extends EvaluatorParams {
}
private static final Logger logger = LoggerFactory.getLogger(ChunkerEvaluatorTool.class);
@@ -69,14 +68,9 @@ public final class ChunkerEvaluatorTool
ChunkerModel model = new ChunkerModelLoader().load(params.getModel());
List<EvaluationMonitor<ChunkSample>> listeners = new LinkedList<>();
- ChunkerDetailedFMeasureListener detailedFMeasureListener = null;
if (params.getMisclassified()) {
listeners.add(new ChunkEvaluationErrorListener());
}
- if (params.getDetailedF()) {
- detailedFMeasureListener = new ChunkerDetailedFMeasureListener();
- listeners.add(detailedFMeasureListener);
- }
ChunkerEvaluator evaluator = new ChunkerEvaluator(new ChunkerME(model),
listeners.toArray(new ChunkerEvaluationMonitor[0]));
@@ -107,10 +101,6 @@ public final class ChunkerEvaluatorTool
monitor.stopAndPrintFinalResult();
- if (detailedFMeasureListener == null) {
- logger.info(evaluator.getFMeasure().toString());
- } else {
- logger.info(detailedFMeasureListener.toString());
- }
+ logger.info(evaluator.getFMeasure().toString());
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
index 5f1ec76c..71efe1d6 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderCrossValidatorTool.java
@@ -34,7 +34,6 @@ import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.TerminateToolException;
import opennlp.tools.cmdline.namefind.TokenNameFinderCrossValidatorTool.CVToolParams;
import opennlp.tools.cmdline.params.CVParams;
-import opennlp.tools.cmdline.params.DetailedFMeasureEvaluatorParams;
import opennlp.tools.cmdline.params.FineGrainedEvaluatorParams;
import opennlp.tools.namefind.BilouCodec;
import opennlp.tools.namefind.BioCodec;
@@ -51,8 +50,7 @@ import opennlp.tools.util.eval.EvaluationMonitor;
public final class TokenNameFinderCrossValidatorTool
extends AbstractCrossValidatorTool<NameSample, CVToolParams> {
- interface CVToolParams extends TrainingParams, CVParams,
- DetailedFMeasureEvaluatorParams, FineGrainedEvaluatorParams {
+ interface CVToolParams extends TrainingParams, CVParams, FineGrainedEvaluatorParams {
}
private static final Logger logger = LoggerFactory.getLogger(TokenNameFinderCrossValidatorTool.class);
@@ -96,11 +94,6 @@ public final class TokenNameFinderCrossValidatorTool
if (params.getMisclassified()) {
listeners.add(new NameEvaluationErrorListener());
}
- TokenNameFinderDetailedFMeasureListener detailedFListener = null;
- if (params.getDetailedF()) {
- detailedFListener = new TokenNameFinderDetailedFMeasureListener();
- listeners.add(detailedFListener);
- }
String sequenceCodecImplName = params.getSequenceCodec();
@@ -166,10 +159,6 @@ public final class TokenNameFinderCrossValidatorTool
reportListener.writeReport();
}
- if (detailedFListener == null) {
- logger.info(validator.getFMeasure().toString());
- } else {
- logger.info(detailedFListener.toString());
- }
+ logger.info(validator.getFMeasure().toString());
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
index 889fa34c..abaef70c 100644
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
+++ b/opennlp-tools/src/main/java/opennlp/tools/cmdline/namefind/TokenNameFinderEvaluatorTool.java
@@ -35,7 +35,6 @@ import opennlp.tools.cmdline.CmdLineUtil;
import opennlp.tools.cmdline.PerformanceMonitor;
import opennlp.tools.cmdline.TerminateToolException;
import opennlp.tools.cmdline.namefind.TokenNameFinderEvaluatorTool.EvalToolParams;
-import opennlp.tools.cmdline.params.DetailedFMeasureEvaluatorParams;
import opennlp.tools.cmdline.params.EvaluatorParams;
import opennlp.tools.cmdline.params.FineGrainedEvaluatorParams;
import opennlp.tools.namefind.NameFinderME;
@@ -57,8 +56,7 @@ import opennlp.tools.util.eval.EvaluationMonitor;
public final class TokenNameFinderEvaluatorTool
extends AbstractEvaluatorTool<NameSample, EvalToolParams> {
- interface EvalToolParams extends EvaluatorParams,
- DetailedFMeasureEvaluatorParams, FineGrainedEvaluatorParams {
+ interface EvalToolParams extends EvaluatorParams, FineGrainedEvaluatorParams {
@OptionalParameter
@ParameterDescription(valueName = "types", description = "name types to use for evaluation")
String getNameTypes();
@@ -85,11 +83,6 @@ public final class TokenNameFinderEvaluatorTool
if (params.getMisclassified()) {
listeners.add(new NameEvaluationErrorListener());
}
- TokenNameFinderDetailedFMeasureListener detailedFListener = null;
- if (params.getDetailedF()) {
- detailedFListener = new TokenNameFinderDetailedFMeasureListener();
- listeners.add(detailedFListener);
- }
TokenNameFinderFineGrainedReportListener reportListener = null;
File reportFile = params.getReportOutputFile();
@@ -151,10 +144,6 @@ public final class TokenNameFinderEvaluatorTool
reportListener.writeReport();
}
- if (detailedFListener == null) {
- logger.info(evaluator.getFMeasure().toString());
- } else {
- logger.info(detailedFListener.toString());
- }
+ logger.info(evaluator.getFMeasure().toString());
}
}
diff --git a/opennlp-tools/src/main/java/opennlp/tools/cmdline/params/DetailedFMeasureEvaluatorParams.java b/opennlp-tools/src/main/java/opennlp/tools/cmdline/params/DetailedFMeasureEvaluatorParams.java
deleted file mode 100644
index a915b59c..00000000
--- a/opennlp-tools/src/main/java/opennlp/tools/cmdline/params/DetailedFMeasureEvaluatorParams.java
+++ /dev/null
@@ -1,39 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package opennlp.tools.cmdline.params;
-
-import opennlp.tools.cmdline.ArgumentParser.OptionalParameter;
-import opennlp.tools.cmdline.ArgumentParser.ParameterDescription;
-import opennlp.tools.commons.Internal;
-
-
-/**
- * EvaluatorParams for Chunker.
- * <p>
- * <b>Note:</b> Do not use this class, internal use only!
- */
-@Internal
-public interface DetailedFMeasureEvaluatorParams {
-
- @ParameterDescription(valueName = "true|false",
- description = "if true (default) will print detailed FMeasure results.")
- @OptionalParameter(defaultValue = "true")
- @Deprecated(forRemoval = true) // this will be removed in 1.8.0
- Boolean getDetailedF();
-
-}