OPENNLP-1074: Reduce visibility of eval methods
Project: http://git-wip-us.apache.org/repos/asf/opennlp/repo Commit: http://git-wip-us.apache.org/repos/asf/opennlp/commit/226612f4 Tree: http://git-wip-us.apache.org/repos/asf/opennlp/tree/226612f4 Diff: http://git-wip-us.apache.org/repos/asf/opennlp/diff/226612f4 Branch: refs/heads/LangDetect Commit: 226612f48bb40eb55ef5814ab9ee995fe9b30f71 Parents: b581c20 Author: Jörn Kottmann <[email protected]> Authored: Mon May 22 16:05:33 2017 +0200 Committer: Jörn Kottmann <[email protected]> Committed: Mon May 22 16:05:33 2017 +0200 ---------------------------------------------------------------------- opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java | 3 +-- .../main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java | 3 +-- .../main/java/opennlp/tools/ml/naivebayes/NaiveBayesModel.java | 3 +-- .../main/java/opennlp/tools/ml/perceptron/PerceptronModel.java | 3 +-- 4 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/opennlp/blob/226612f4/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java index b8b830e..81b2690 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/GISModel.java @@ -152,8 +152,7 @@ public final class GISModel extends AbstractModel { * string representation of the outcomes can be obtained from the * method getOutcome(int i). */ - @Deprecated // visibility will be reduced in 1.8.1 - public static double[] eval(int[] context, float[] values, double[] prior, + static double[] eval(int[] context, float[] values, double[] prior, EvalParameters model) { Context[] params = model.getParams(); int[] numfeats = new int[model.getNumOutcomes()]; http://git-wip-us.apache.org/repos/asf/opennlp/blob/226612f4/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java index f02ee75..d73d6cc 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/maxent/quasinewton/QNModel.java @@ -103,8 +103,7 @@ public class QNModel extends AbstractModel { * Model parameters * @return Normalized probabilities for the outcomes given the context. */ - @Deprecated // visibility will be reduced in 1.8.1 - public static double[] eval(int[] context, float[] values, double[] probs, + static double[] eval(int[] context, float[] values, double[] probs, int nOutcomes, int nPredLabels, double[] parameters) { for (int i = 0; i < context.length; i++) { http://git-wip-us.apache.org/repos/asf/opennlp/blob/226612f4/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/NaiveBayesModel.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/NaiveBayesModel.java b/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/NaiveBayesModel.java index 0a28704..98c2735 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/NaiveBayesModel.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/naivebayes/NaiveBayesModel.java @@ -88,8 +88,7 @@ public class NaiveBayesModel extends AbstractModel { return eval(context, null, prior, model, true); } - @Deprecated // visibility will be reduced in 1.8.1 - public static double[] eval(int[] context, float[] values, double[] prior, + static double[] eval(int[] context, float[] values, double[] prior, EvalParameters model, boolean normalize) { Probabilities<Integer> probabilities = new LogProbabilities<>(); Context[] params = model.getParams(); http://git-wip-us.apache.org/repos/asf/opennlp/blob/226612f4/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModel.java ---------------------------------------------------------------------- diff --git a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModel.java b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModel.java index d66b553..39c4891 100644 --- a/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModel.java +++ b/opennlp-tools/src/main/java/opennlp/tools/ml/perceptron/PerceptronModel.java @@ -66,8 +66,7 @@ public class PerceptronModel extends AbstractModel { return eval(context,null,prior,model,true); } - @Deprecated // visibility will be reduced in 1.8.1 - public static double[] eval(int[] context, float[] values, double[] prior, EvalParameters model, + static double[] eval(int[] context, float[] values, double[] prior, EvalParameters model, boolean normalize) { Context[] params = model.getParams(); double[] activeParameters;
