diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/MeanSquaredErrorMetric.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/MeanSquaredErrorMetric.java index 0b795bf7422..152e117a5b4 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/MeanSquaredErrorMetric.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/MeanSquaredErrorMetric.java @@ -22,7 +22,6 @@ import org.elasticsearch.client.ml.dataframe.evaluation.EvaluationMetric; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; import org.elasticsearch.common.xcontent.ObjectParser; -import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; @@ -49,7 +48,12 @@ public class MeanSquaredErrorMetric implements EvaluationMetric { public MeanSquaredErrorMetric() {} @Override - public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException { + public String getName() { + return NAME; + } + + @Override + public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); builder.endObject(); return builder; @@ -68,41 +72,36 @@ public class MeanSquaredErrorMetric implements EvaluationMetric { return Objects.hashCode(NAME); } - @Override - public String getName() { - return NAME; - } - public static class Result implements EvaluationMetric.Result { - public static final ParseField ERROR = new ParseField("error"); - private final double error; + public static final ParseField VALUE = new ParseField("value"); + private final double value; public static Result fromXContent(XContentParser parser) { return PARSER.apply(parser, null); } private static final ConstructingObjectParser PARSER = - new ConstructingObjectParser<>("mean_squared_error_result", true, args -> new Result((double) args[0])); + new ConstructingObjectParser<>(NAME + "_result", true, args -> new Result((double) args[0])); static { - PARSER.declareDouble(constructorArg(), ERROR); + PARSER.declareDouble(constructorArg(), VALUE); } - public Result(double error) { - this.error = error; + public Result(double value) { + this.value = value; } @Override - public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException { + public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); - builder.field(ERROR.getPreferredName(), error); + builder.field(VALUE.getPreferredName(), value); builder.endObject(); return builder; } - public double getError() { - return error; + public double getValue() { + return value; } @Override @@ -115,12 +114,12 @@ public class MeanSquaredErrorMetric implements EvaluationMetric { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Result that = (Result) o; - return Objects.equals(that.error, this.error); + return this.value == that.value; } @Override public int hashCode() { - return Objects.hash(error); + return Double.hashCode(value); } } } diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/MeanSquaredLogarithmicErrorMetric.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/MeanSquaredLogarithmicErrorMetric.java index 66a0666c8ec..4593fe08799 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/MeanSquaredLogarithmicErrorMetric.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/MeanSquaredLogarithmicErrorMetric.java @@ -22,7 +22,6 @@ import org.elasticsearch.client.ml.dataframe.evaluation.EvaluationMetric; import org.elasticsearch.common.Nullable; import org.elasticsearch.common.ParseField; import org.elasticsearch.common.xcontent.ConstructingObjectParser; -import org.elasticsearch.common.xcontent.ToXContent; import org.elasticsearch.common.xcontent.XContentBuilder; import org.elasticsearch.common.xcontent.XContentParser; @@ -67,7 +66,7 @@ public class MeanSquaredLogarithmicErrorMetric implements EvaluationMetric { } @Override - public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException { + public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); if (offset != null) { builder.field(OFFSET.getPreferredName(), offset); @@ -89,36 +88,36 @@ public class MeanSquaredLogarithmicErrorMetric implements EvaluationMetric { return Objects.hash(offset); } - public static class Result implements EvaluationMetric.Result { + public static class Result implements EvaluationMetric.Result { - public static final ParseField ERROR = new ParseField("error"); - private final double error; + public static final ParseField VALUE = new ParseField("value"); + private final double value; public static Result fromXContent(XContentParser parser) { return PARSER.apply(parser, null); } private static final ConstructingObjectParser PARSER = - new ConstructingObjectParser<>("mean_squared_error_result", true, args -> new Result((double) args[0])); + new ConstructingObjectParser<>(NAME + "_result", true, args -> new Result((double) args[0])); static { - PARSER.declareDouble(constructorArg(), ERROR); + PARSER.declareDouble(constructorArg(), VALUE); } - public Result(double error) { - this.error = error; + public Result(double value) { + this.value = value; } @Override - public XContentBuilder toXContent(XContentBuilder builder, ToXContent.Params params) throws IOException { + public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); - builder.field(ERROR.getPreferredName(), error); + builder.field(VALUE.getPreferredName(), value); builder.endObject(); return builder; } - public double getError() { - return error; + public double getValue() { + return value; } @Override @@ -131,12 +130,12 @@ public class MeanSquaredLogarithmicErrorMetric implements EvaluationMetric { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Result that = (Result) o; - return Objects.equals(that.error, this.error); + return this.value == that.value; } @Override public int hashCode() { - return Objects.hash(error); + return Double.hashCode(value); } } } diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/PseudoHuberMetric.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/PseudoHuberMetric.java index 9ecd5e604a1..0db2cd44099 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/PseudoHuberMetric.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/PseudoHuberMetric.java @@ -89,7 +89,7 @@ public class PseudoHuberMetric implements EvaluationMetric { return Objects.hash(delta); } - public static class Result implements EvaluationMetric.Result { + public static class Result implements EvaluationMetric.Result { public static final ParseField VALUE = new ParseField("value"); private final double value; @@ -99,7 +99,7 @@ public class PseudoHuberMetric implements EvaluationMetric { } private static final ConstructingObjectParser PARSER = - new ConstructingObjectParser<>("pseudo_huber_result", true, args -> new Result((double) args[0])); + new ConstructingObjectParser<>(NAME + "_result", true, args -> new Result((double) args[0])); static { PARSER.declareDouble(constructorArg(), VALUE); @@ -131,7 +131,7 @@ public class PseudoHuberMetric implements EvaluationMetric { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Result that = (Result) o; - return Objects.equals(that.value, this.value); + return this.value == that.value; } @Override diff --git a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/RSquaredMetric.java b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/RSquaredMetric.java index a38980c3e49..f01fb3c81f6 100644 --- a/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/RSquaredMetric.java +++ b/client/rest-high-level/src/main/java/org/elasticsearch/client/ml/dataframe/evaluation/regression/RSquaredMetric.java @@ -50,6 +50,11 @@ public class RSquaredMetric implements EvaluationMetric { public RSquaredMetric() {} + @Override + public String getName() { + return NAME; + } + @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); @@ -70,11 +75,6 @@ public class RSquaredMetric implements EvaluationMetric { return Objects.hashCode(NAME); } - @Override - public String getName() { - return NAME; - } - public static class Result implements EvaluationMetric.Result { public static final ParseField VALUE = new ParseField("value"); @@ -85,7 +85,7 @@ public class RSquaredMetric implements EvaluationMetric { } private static final ConstructingObjectParser PARSER = - new ConstructingObjectParser<>("r_squared_result", true, args -> new Result((double) args[0])); + new ConstructingObjectParser<>(NAME + "_result", true, args -> new Result((double) args[0])); static { PARSER.declareDouble(constructorArg(), VALUE); @@ -117,12 +117,12 @@ public class RSquaredMetric implements EvaluationMetric { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Result that = (Result) o; - return Objects.equals(that.value, this.value); + return this.value == that.value; } @Override public int hashCode() { - return Objects.hash(value); + return Double.hashCode(value); } } } diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java index a2328e79183..3d21c66e480 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/MachineLearningIT.java @@ -1899,12 +1899,12 @@ public class MachineLearningIT extends ESRestHighLevelClientTestCase { MeanSquaredErrorMetric.Result mseResult = evaluateDataFrameResponse.getMetricByName(MeanSquaredErrorMetric.NAME); assertThat(mseResult.getMetricName(), equalTo(MeanSquaredErrorMetric.NAME)); - assertThat(mseResult.getError(), closeTo(0.061000000, 1e-9)); + assertThat(mseResult.getValue(), closeTo(0.061000000, 1e-9)); MeanSquaredLogarithmicErrorMetric.Result msleResult = evaluateDataFrameResponse.getMetricByName(MeanSquaredLogarithmicErrorMetric.NAME); assertThat(msleResult.getMetricName(), equalTo(MeanSquaredLogarithmicErrorMetric.NAME)); - assertThat(msleResult.getError(), closeTo(0.02759231770210426, 1e-9)); + assertThat(msleResult.getValue(), closeTo(0.02759231770210426, 1e-9)); PseudoHuberMetric.Result pseudoHuberResult = evaluateDataFrameResponse.getMetricByName(PseudoHuberMetric.NAME); assertThat(pseudoHuberResult.getMetricName(), equalTo(PseudoHuberMetric.NAME)); diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MlClientDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MlClientDocumentationIT.java index 687d1590a56..25725f9fc6d 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MlClientDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/MlClientDocumentationIT.java @@ -3582,11 +3582,11 @@ public class MlClientDocumentationIT extends ESRestHighLevelClientTestCase { // tag::evaluate-data-frame-results-regression MeanSquaredErrorMetric.Result meanSquaredErrorResult = response.getMetricByName(MeanSquaredErrorMetric.NAME); // <1> - double meanSquaredError = meanSquaredErrorResult.getError(); // <2> + double meanSquaredError = meanSquaredErrorResult.getValue(); // <2> MeanSquaredLogarithmicErrorMetric.Result meanSquaredLogarithmicErrorResult = response.getMetricByName(MeanSquaredLogarithmicErrorMetric.NAME); // <3> - double meanSquaredLogarithmicError = meanSquaredLogarithmicErrorResult.getError(); // <4> + double meanSquaredLogarithmicError = meanSquaredLogarithmicErrorResult.getValue(); // <4> PseudoHuberMetric.Result pseudoHuberResult = response.getMetricByName(PseudoHuberMetric.NAME); // <5> double pseudoHuber = pseudoHuberResult.getValue(); // <6> diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredError.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredError.java index ddabe057e0c..6f740b0e012 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredError.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredError.java @@ -52,7 +52,7 @@ public class MeanSquaredError implements EvaluationMetric { } private static final ObjectParser PARSER = - new ObjectParser<>("mean_squared_error", true, MeanSquaredError::new); + new ObjectParser<>(NAME.getPreferredName(), true, MeanSquaredError::new); public static MeanSquaredError fromXContent(XContentParser parser) { return PARSER.apply(parser, null); @@ -99,7 +99,6 @@ public class MeanSquaredError implements EvaluationMetric { @Override public void writeTo(StreamOutput out) throws IOException { - } @Override @@ -124,15 +123,15 @@ public class MeanSquaredError implements EvaluationMetric { public static class Result implements EvaluationMetricResult { - private static final String ERROR = "error"; - private final double error; + private static final String VALUE = "value"; + private final double value; - public Result(double error) { - this.error = error; + public Result(double value) { + this.value = value; } public Result(StreamInput in) throws IOException { - this.error = in.readDouble(); + this.value = in.readDouble(); } @Override @@ -145,19 +144,19 @@ public class MeanSquaredError implements EvaluationMetric { return NAME.getPreferredName(); } - public double getError() { - return error; + public double getValue() { + return value; } @Override public void writeTo(StreamOutput out) throws IOException { - out.writeDouble(error); + out.writeDouble(value); } @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); - builder.field(ERROR, error); + builder.field(VALUE, value); builder.endObject(); return builder; } @@ -167,12 +166,12 @@ public class MeanSquaredError implements EvaluationMetric { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Result other = (Result)o; - return error == other.error; + return value == other.value; } @Override public int hashCode() { - return Objects.hashCode(error); + return Double.hashCode(value); } } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredLogarithmicError.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredLogarithmicError.java index 5a0a796c7c7..d6b0d0bae2f 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredLogarithmicError.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredLogarithmicError.java @@ -29,7 +29,6 @@ import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.Locale; -import java.util.Objects; import java.util.Optional; import static org.elasticsearch.common.xcontent.ConstructingObjectParser.optionalConstructorArg; @@ -141,15 +140,15 @@ public class MeanSquaredLogarithmicError implements EvaluationMetric { public static class Result implements EvaluationMetricResult { - private static final String ERROR = "error"; - private final double error; + private static final String VALUE = "value"; + private final double value; - public Result(double error) { - this.error = error; + public Result(double value) { + this.value = value; } public Result(StreamInput in) throws IOException { - this.error = in.readDouble(); + this.value = in.readDouble(); } @Override @@ -162,19 +161,19 @@ public class MeanSquaredLogarithmicError implements EvaluationMetric { return NAME.getPreferredName(); } - public double getError() { - return error; + public double getValue() { + return value; } @Override public void writeTo(StreamOutput out) throws IOException { - out.writeDouble(error); + out.writeDouble(value); } @Override public XContentBuilder toXContent(XContentBuilder builder, Params params) throws IOException { builder.startObject(); - builder.field(ERROR, error); + builder.field(VALUE, value); builder.endObject(); return builder; } @@ -184,12 +183,12 @@ public class MeanSquaredLogarithmicError implements EvaluationMetric { if (this == o) return true; if (o == null || getClass() != o.getClass()) return false; Result other = (Result)o; - return error == other.error; + return value == other.value; } @Override public int hashCode() { - return Objects.hashCode(error); + return Double.hashCode(value); } } } diff --git a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/RSquared.java b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/RSquared.java index 9c7d5a6df41..16a4b358a62 100644 --- a/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/RSquared.java +++ b/x-pack/plugin/core/src/main/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/RSquared.java @@ -52,12 +52,12 @@ public class RSquared implements EvaluationMetric { "return diff * diff;"; private static final String SS_RES = "residual_sum_of_squares"; - private static String buildScript(Object... args) { + private static String buildScript(Object...args) { return new MessageFormat(PAINLESS_TEMPLATE, Locale.ROOT).format(args); } private static final ObjectParser PARSER = - new ObjectParser<>("r_squared", true, RSquared::new); + new ObjectParser<>(NAME.getPreferredName(), true, RSquared::new); public static RSquared fromXContent(XContentParser parser) { return PARSER.apply(parser, null); @@ -114,7 +114,6 @@ public class RSquared implements EvaluationMetric { @Override public void writeTo(StreamOutput out) throws IOException { - } @Override @@ -187,7 +186,7 @@ public class RSquared implements EvaluationMetric { @Override public int hashCode() { - return Objects.hashCode(value); + return Double.hashCode(value); } } } diff --git a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredErrorTests.java b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredErrorTests.java index 5679655c165..a723bc3fbce 100644 --- a/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredErrorTests.java +++ b/x-pack/plugin/core/src/test/java/org/elasticsearch/xpack/core/ml/dataframe/evaluation/regression/MeanSquaredErrorTests.java @@ -50,7 +50,7 @@ public class MeanSquaredErrorTests extends AbstractSerializingTestCase