honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[ML] expose low and high median functions (elastic/x-pack-elasticsearch#1272) 

Expose low and high median functions implemented downstream in machinelearning-cpp.

Original commit: elastic/x-pack-elasticsearch@3863e9d41c
This commit is contained in:
Hendrik Muhs 2017-05-03 09:46:10 +02:00 committed by GitHub
parent 240bd5bfa7
commit 9d8fea9a32
2 changed files with 16 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
plugin/src/main/java/org/elasticsearch/xpack/ml/job/config/Detector.java
View File

@ -125,6 +125,8 @@ public class Detector extends ToXContentToBytes implements Writeable {
public static final String METRIC = "metric";
public static final String MEAN = "mean";
public static final String MEDIAN = "median";
public static final String LOW_MEDIAN = "low_median";
public static final String HIGH_MEDIAN = "high_median";
public static final String HIGH_MEAN = "high_mean";
public static final String LOW_MEAN = "low_mean";
public static final String AVG = "avg";
@ -176,6 +178,8 @@ public class Detector extends ToXContentToBytes implements Writeable {
HIGH_MEAN, HIGH_AVG,
LOW_MEAN, LOW_AVG,
MEDIAN,
LOW_MEDIAN,
HIGH_MEDIAN,
MIN,
MAX,
SUM,
@ -223,6 +227,8 @@ public class Detector extends ToXContentToBytes implements Writeable {
HIGH_MEAN, HIGH_AVG,
LOW_MEAN, LOW_AVG,
MEDIAN,
LOW_MEDIAN,
HIGH_MEDIAN,
MIN,
MAX,
SUM,

46
plugin/src/test/java/org/elasticsearch/xpack/ml/job/config/DetectorTests.java
View File

@ -418,6 +418,8 @@ public class DetectorTests extends AbstractSerializingTestCase<Detector> {
difference.remove(Detector.LOW_AVG);
difference.remove(Detector.HIGH_AVG);
difference.remove(Detector.MEDIAN);
difference.remove(Detector.LOW_MEDIAN);
difference.remove(Detector.HIGH_MEDIAN);
difference.remove(Detector.MIN);
difference.remove(Detector.MAX);
difference.remove(Detector.SUM);
@ -475,16 +477,9 @@ public class DetectorTests extends AbstractSerializingTestCase<Detector> {
builder.build();
// some functions require a fieldname
for (String f : new String[]{Detector.METRIC, Detector.MEAN, Detector.HIGH_MEAN,
Detector.LOW_MEAN, Detector.AVG, Detector.HIGH_AVG, Detector.LOW_AVG,
Detector.MEDIAN, Detector.MAX, Detector.MIN, Detector.SUM, Detector.LOW_SUM,
Detector.HIGH_SUM, Detector.NON_NULL_SUM, Detector.LOW_NON_NULL_SUM,
Detector.HIGH_NON_NULL_SUM, Detector.POPULATION_VARIANCE,
Detector.LOW_POPULATION_VARIANCE, Detector.HIGH_POPULATION_VARIANCE,
Detector.DISTINCT_COUNT, Detector.DC,
Detector.HIGH_DISTINCT_COUNT, Detector.HIGH_DC, Detector.LOW_DISTINCT_COUNT,
Detector.LOW_DC, Detector.INFO_CONTENT, Detector.LOW_INFO_CONTENT,
Detector.HIGH_INFO_CONTENT, Detector.LAT_LONG}) {
int testedFunctionsCount = 0;
for (String f : Detector.FIELD_NAME_FUNCTIONS) {
testedFunctionsCount++;
builder = new Detector.Builder(f, "f");
builder.setByFieldName("b");
builder.build();
@ -496,34 +491,12 @@ public class DetectorTests extends AbstractSerializingTestCase<Detector> {
Assert.assertEquals(Detector.METRIC, f);
}
}
Assert.assertEquals(Detector.FIELD_NAME_FUNCTIONS.size(), testedFunctionsCount);
// these functions don't work with fieldname
for (String f : new String[]{Detector.COUNT, Detector.HIGH_COUNT,
Detector.LOW_COUNT, Detector.NON_ZERO_COUNT, Detector.NZC,
Detector.RARE, Detector.FREQ_RARE, Detector.TIME_OF_DAY,
Detector.TIME_OF_WEEK}) {
try {
builder = new Detector.Builder(f, "field");
builder.setByFieldName("b");
builder.build();
Assert.fail("IllegalArgumentException not thrown when expected");
} catch (IllegalArgumentException e) {
}
try {
builder = new Detector.Builder(f, "field");
builder.setByFieldName("b");
builder.build(true);
Assert.fail("IllegalArgumentException not thrown when expected");
} catch (IllegalArgumentException e) {
}
}
for (String f : new String[]{Detector.HIGH_COUNT,
Detector.LOW_COUNT, Detector.NON_ZERO_COUNT, Detector.NZC,
Detector.RARE, Detector.FREQ_RARE, Detector.TIME_OF_DAY,
Detector.TIME_OF_WEEK}) {
testedFunctionsCount = 0;
for (String f : Detector.COUNT_WITHOUT_FIELD_FUNCTIONS) {
testedFunctionsCount++;
try {
builder = new Detector.Builder(f, "field");
builder.setByFieldName("b");
@ -539,6 +512,7 @@ public class DetectorTests extends AbstractSerializingTestCase<Detector> {
} catch (IllegalArgumentException e) {
}
}
Assert.assertEquals(Detector.COUNT_WITHOUT_FIELD_FUNCTIONS.size(), testedFunctionsCount);
builder = new Detector.Builder(Detector.FREQ_RARE, "field");
builder.setByFieldName("b");